mkbuild-0.9.6: correções...

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@391 04377dda-e619-0410-9926-eae83683ac58

3 files changed, 54 insertions, 8 deletions

diff --git a/branches/0.6/mkbuild/sample-Pyrex.mkbuild b/branches/0.6/mkbuild/sample-Pyrex-large.mkbuild
index 0686d69..0686d69 100644
--- a/branches/0.6/mkbuild/sample-Pyrex.mkbuild
+++ b/branches/0.6/mkbuild/sample-Pyrex-large.mkbuild
diff --git a/branches/0.6/mkbuild/sample-Pyrex-small.mkbuild b/branches/0.6/mkbuild/sample-Pyrex-small.mkbuild
new file mode 100644
index 0000000..953f67b
--- /dev/null
+++ b/branches/0.6/mkbuild/sample-Pyrex-small.mkbuild
@@ -0,0 +1,43 @@
+#--------------------
+# Personal variables
+#--------------------
+# Author name
+[[SLACKBUILD AUTHOR]]="Adalberto Simão Nader"
+
+#
+# Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
+[[DOWNLOAD FOLDER URL]]="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-0.9.5.1a.tar.gz"
+
+#
+# Default enable sections:
+#      head, set_variables, slkflags, start_structure, untar_source,
+#      make_package, install_package, build_package
+# Warning: don't remove '#>>' and "#<<" tags.
+#>> Start SlackBuild Sections:
+ on: slackbuildrc
+ on: slkflags
+ on: error_codes
+ on: download_source
+ on: configure
+ on: strip_binaries
+ on: install_documentation
+ on: slackdesc
+ on: clean_builds
+#<< End SlackBuild Sections
+
+#------------------
+# Sections changes
+#------------------
+#>slackdesc
+pyrex: Pyrex by Slack.Sarava
+pyrex:
+pyrex: Pyrex is a language specially designed for writing Python extension
+pyrex: modules. Its designed to bridge the gap between the nice, high-level,
+pyrex: easy-to-use world of Python and the messy, low-level world of C.
+pyrex:
+pyrex:
+pyrex:
+pyrex:
+pyrex:
+pyrex:
+#<slackdesc
diff --git a/branches/0.6/src/mkbuild b/branches/0.6/src/mkbuild
index 2413008..be5a801 100755
--- a/branches/0.6/src/mkbuild
+++ b/branches/0.6/src/mkbuild
@@ -9,8 +9,8 @@
 # SlackBuilds são scripts utilizados no Slackware para gerar
 # pacotes tgz.
 #
-# Version 0.9.5
-PROG_VERSION=0.9.5
+# Version 0.9.6
+PROG_VERSION=0.9.6
 
 #--------------------------------------------------------------------
 # Functions
@@ -61,7 +61,8 @@ DESCRIPTION
 
 EXAMPLES
         mkbuild --prefix /usr/local pyrex.mkbuild
-            build pyrex.SlackBuild with prefix /usr/local and pyrex.mkbuild variables and options definitions.
+            build pyrex.SlackBuild with prefix /usr/local and pyrex.mkbuild
+            variables and options definitions.
 
 AUTHOR
         Written by Rduson R. Alves
@@ -401,7 +402,7 @@ function make_slack_required {
     [ -e slack-required ] && mv slack-required slack-required.old
     [ -z "$SLACK_REQUIRED" ] && return 0
 
-    echo -e "# Dependency list to broffice\n#\n# dependency [condition] [version]]" > slack-required
+    echo -e "# Dependency list to $SRC_NAME\n#\n# dependency [condition] [version]]" > slack-required
 
     echo $SLACK_REQUIRED | sed 's/:/\n/g' | while read i; do
         REQ=`echo $i | awk '{ print $1 }'`
@@ -520,7 +521,8 @@ AUTHOR=${AUTHOR:="`get_variable "SLACKBUILD AUTHOR"`"}
 [ -z "$AUTHOR" ] && mkbuild_error $ERROR_CONSTRUCTION "SLACKBUILD AUTHOR"
 
 AUTHOR_INITIALS=${AUTHOR_INITIALS:="`get_variable "SLACKBUILD AUTHOR INITIALS"`"}
-[ -z $AUTHOR_INITIALS ] && mkbuild_error $ERROR_CONSTRUCTION "SLACKBUILD AUTHOR INITIALS"
+[ -z $AUTHOR_INITIALS ] && AUTHOR_INITIALS=`echo $AUTHOR | sed 's/ /\n/g' | sed 's/^\([A-Z]\).*/\1/' | sed ':i; $!N;  s/\n//; ti' | tr [A-Z] [a-z]`
+[ -z $AUTHOR_INITIALS ] &&  mkbuild_error $ERROR_CONSTRUCTION "SLACKBUILD AUTHOR INITIALS"
 
 URL=${URL:="`get_variable "DOWNLOAD FOLDER URL"`"}
 EXTENSION=${EXTENSION:="`echo $URL | rev | cut -c1-3 | rev | tr -d '.'`"}
@@ -544,7 +546,7 @@ PKG_NAME=${PKG_NAME:="`get_variable "PACKAGE NAME"`"}
 
 # Version
 VERSION=${VERSION:="`get_variable "VERSION"`"}
-[ -z $VERSION ] && VERSION=`echo $SRC_NAME | sed -r 's/(.*)-(.*)\.(.*\..*)$/\2/'`
+[ -z $VERSION ] && VERSION=`echo $SOURCE_NAME | sed -r 's/(.*)-(.*)\.(.*\..*)$/\2/'`
 [ -z $VERSION ] && mkbuild_error $ERROR_CONSTRUCTION "VERSION"
 
 # Construction source name string
@@ -596,11 +598,10 @@ NUMJOBS=${NUMJOBS:="`get_variable "NUMBER OF JOBS"`"}
 
 # Make slack-required file.
 SLACK_REQUIRED=${SLACK_REQUIRED:="`get_variable "SLACK REQUIRED"`"}
-[ -z "$SLACK_REQUIRED" ] && make_slack_required
 
 # SlackBuild model
 MODEL=${MODEL:="`get_variable "SLACKBUILD MODEL"`"}
-[ -z $MODEL ] && MODEL="generic.mkSlackbuild"
+[ -z $MODEL ] && MODEL="generic.mkSlackBuild"
 
 #
 # Start build SlackBuild
@@ -626,6 +627,8 @@ make_slack_required
 if [ -e slack-required ]; then
     DEPENDENCY_LIST="`cat slack-required | awk '{print $1}' | grep '^[a-z]' | tr '\012' ' '`"
     edit_file "REQUIRES" "$DEPENDENCY_LIST" $SLACKBUILD
+else
+    edit_file "REQUIRES" "Nil" $SLACKBUILD
 fi
 
 # Others changes