mkslackbuild: versão 0.9.6 e correções ao modelo generic.mkSlackBuild.new

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

diff --git a/trunk/conf/generic.mkSlackBuild.new b/trunk/conf/generic.mkSlackBuild.new
index f874433fdf57c5d6609b916780fb635b5bd84514..e1998b0dd062b23f48cc39a70710dac29432049a 100644 (file)
--- a/trunk/conf/generic.mkSlackBuild.new
+++ b/trunk/conf/generic.mkSlackBuild.new
@@ -32,12 +32,12 @@ ARCH=${ARCH:=[[ARCH]]}
 SRC_VERSION=${VERSION:=[[VERSION]]}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1[[SLACKBUILD AUTHOR INITIALS]]}
-SRC_DIR=${SRC_DIR:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=[[PREFIX]]}
-PKG_SRC="$SRC_DIR/$SRC_NAME-$SRC_VERSION"
+PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
 </set_variables>
 
 <slkflags> all

diff --git a/trunk/utils/mkslackbuild b/trunk/utils/mkslackbuild
index e23bdbae1de3f74ff1d575de95598389a85c3c74..825b3a7debb7fa56ffa2150cc083bf0e818e85bb 100755 (executable)
--- a/trunk/utils/mkslackbuild
+++ b/trunk/utils/mkslackbuild
@@ -9,7 +9,7 @@
 # Slackbuilds são scripts utilizados no Slackware para gerar
 # pacotes tgz.
 #
-# Version 0.9.5
+# Version 0.9.6
 #
 #--------------------------------------------------------------------
 # Functions
@@ -308,14 +308,14 @@ function view_docs()
 {
     local MENU=""
     local SELECT=""
+    local ANS2=0
 
     for i in $DOC_FILES; do
         MENU="$MENU \"$i\" \"\" "
     done
 
-    ANS2=0
     while [ $ANS2 -eq 0 ]; do
-        SELECT=`eval "dialog --stdout --backtitle \"mkSlackBuild $PROG_VERSION [$MK_PKGNAME]\" --title \" Documentations files \" --menu \"Select doc-file below:\" 20 45 13 $MENU"`
+        SELECT=`eval "dialog --stdout --backtitle \"mkSlackBuild $PROG_VERSION [$MK_PKGNAME]\" --cancel-label \"Continue\" --title \" Documentations files \" --menu \"Select doc-file below:\" 20 45 13 $MENU"`
         ANS2=$?
         [ $ANS2 -eq 0 ] && view_file "File: $SELECT" $MK_TMPSRC/$SELECT
     done
@@ -650,7 +650,7 @@ function edit_menu()
             EDITMENU="$EDITMENU ${SECTION_NAME[i]} ${SECTION_FLAG[i]}"
         done
 
-       SELECT=`eval "dialog --stdout --backtitle \"mkSlackBuild $PROG_VERSION [$MK_PKGNAME]\" --cancel-label \"Main Menu\" --menu \"Select one section to edit\" 20 40 13 $EDITMENU"`
+       SELECT=`eval "dialog --stdout --backtitle \"mkSlackBuild $PROG_VERSION [$MK_PKGNAME]\" --ok-label \"Edit\" --cancel-label \"Main Menu\" --menu \"Select one section to edit\" 20 40 13 $EDITMENU"`
         ANSE=$?
         if [ $ANSE -ne 1 ]; then
             STATUS=`mk_status $SELECT`
@@ -727,7 +727,7 @@ function exec_script()
 # turn off debug
 set +x
 # Start variables
-PROG_VERSION=0.9.5
+PROG_VERSION=0.9.6
 LANG=us
 BASEDIR=`pwd`
 AUX_TMP=`mktemp -p  /tmp/ aux_tmp.XXXXXX`
@@ -787,7 +787,7 @@ while [ $ANS0 -ne 0 ]; do
         "2" "Open MkSlackBuild" \
         "3" "Save MkSlackBuild" \
         "4" "Make Slackbuild" \
-        "5" "Edit Script Sections" \
+        "5" "Edit SlackBuild Sections" \
         "6" "Edit Dependency List" \
         "7" "Test SlackBuild Script" \
         "8" "View Doc-Files" \