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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 780aa3e4505e49806509c1ec992e232a9b3a9d81..63c6da07a2f7596f8735556c72c3c3d174bdd4bc 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -5,6 +5,9 @@ simplepkg changelog
 ========
     - generic.mkSlackBuild:
      - change PKG_SRC="$PWD...{ print $8 }'`" to  ...{ print $NF }'`"
+     - change section name get_svn_source to svn_source
+    - createpkg:
+     - add LANG=en_US in SlackBuild command line
 
 0.6pre26
 ========

diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 5c8a8dbb7ab12f1976086aaebfc7b38c7c57a7c8..19fd8dd6f909e08011c69b06ea49eabb0d228881 100644 (file)
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -115,6 +115,22 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! [[DECOMPRESSOR]] [[DECOMPRESSOR TEST FLAG]] "$S
 fi
 </download_source>
 
+<svn_source> off
+# Get svn source code
+[ "`find "$SRC_DIR/" -name .svn`" != "" ] && SVN_ACTION="update" || SVN_ACTION="checkout"
+cd "$SRC_DIR"
+svn $SVN_ACTION [[DOWNLOAD FOLDER URL]] $PKG_SRC || exit $ERROR_VCS
+SND_DIR="`ls -l | awk '/^d/ { print $NF }'`"
+cd $SND_DIR
+PKG_VERSION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`_svn"
+
+# Copy svn source
+cd "$PKG_WORK"
+cp -a $SRC_DIR/* .
+PKG_SRC="$PWD/$SND_DIR"
+cd "$PKG_SRC"
+</svn_source>
+
 <md5sum_download_and_check_0> off
 MD5SUM_SRC="$(md5sum "$SRC_DIR/$SRC" | cut -d " " -f 1)"
 MD5SUM_URL="[[MD5SUM CODE]]"
@@ -188,15 +204,6 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 </untar_source>
 
-<get_svn_source> off
-# Get svn source code
-cd "$PKG_WORK"
-svn checkout [[DOWNLOAD FOLDER URL]] $PKG_SRC || exit $ERROR_VCS
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
-cd "$PKG_SRC"
-[ -e autogen.sh ] && . ./autogen.sh
-</get_svn_source>
-
 <patch_source> off
 # Patch source
 patches="[[PATCH FILES]]

diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild
index 848ef50bd5c446955db5d03848a163c2b173de79..d030ea4468b81f67c1098dfaee6b9aeee1f31648 100644 (file)
--- a/trunk/mkbuild/model.mkbuild
+++ b/trunk/mkbuild/model.mkbuild
@@ -128,11 +128,11 @@
  on: start_structure
 off: create_build_user_and_group
  on: download_source
+off: svn_source
 off: md5sum_download_and_check_0
 off: md5sum_download_and_check_1
 off: gpg_signature_check
  on: untar_source
-off: get_svn_source
 off: patch_source
  on: configure
  on: make_package

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 5d28d17c0fd438f911187955a56560ea495b5b96..557e3f6b65e8c031c593cab0421d046be028c028 100644 (file)
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -33,7 +33,7 @@ function usage {
 
     # Help message
     echo -e "${red}NAME${normal}
-        createpkg - create Slackware packages
+        createpkg - create Slackware packages from SlackBuilds in Sarava repository
 
 ${red}SYNOPSIS
         createpkg${normal} [${green}OPTIONS${normal}] [${green}program${normal}]
@@ -81,8 +81,8 @@ ${red}COPYRIGHT${normal}
         Copyright © 2006 Free Software Foundation, Inc.
         This is free software. You may redistribute copies of it under the
         terms of the GNU General Public License
-        <${yellow}http://www.gnu.org/licenses/gpl.html${normal}>. There is NO WARRANTY, to the
-        extent permitted by law." | more
+        <${yellow}http://www.gnu.org/licenses/gpl.html${normal}>. There is NO WARRANTY,
+        to the extent permitted by law." | more
 }
 
 function build_all_slackbuild {

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index 053d5fe13c38b913bb280596d9f6882e94e9e642..07c56e834c1e5b3fe824f3691386af3293d97807 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -38,7 +38,7 @@ ${red}SYNOPSIS
 ${red}DESCRIPTION${normal}
         [${green}mkbuild_file${normal}] input file with build rules and variables
 
-        Input OPTIONS:
+        Input ${green}OPTIONS${normal}:
             ${red}-a${normal}, ${red}--author${normal} ${green}<author_name>${normal}
                 author name
             ${red}-ai${normal}, ${red}--author_initials${normal} ${green}<initials>${normal}
@@ -375,7 +375,7 @@ function activate_sections {
     for i in $LIST_OFF; do
       set_status $i "off" $SLACKBUILD_TEMP
     done
-    [ $SVN_MOD -eq $on ] && set_status get_svn_source "on" $SLACKBUILD_TEMP
+    [ $SVN_MOD -eq $on ] && set_status svn_source "on" $SLACKBUILD_TEMP
   fi
 
 }