2 files changed, 27 insertions, 19 deletions
diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 72f8917..6e9e222 100644
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -50,7 +50,7 @@ TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=[[PREFIX]]}
-PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
+PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="[[OTHER CONFIGURE ARGS]]"}
 NUMJOBS=${NUMJOBS:="[[NUMBER OF JOBS]]"}
 </set_variables>
@@ -90,6 +90,8 @@ rm -rf "$PKG" 2> /dev/null
 mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
 mkdir -p "$PKG" || exit $ERROR_MKDIR
 mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
+
 </start_structure>
 
 <download_source> off
@@ -138,8 +140,9 @@ gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 
 <untar_source> off
 # Untar
-cd "$TMP"
+cd "$PKG_WORK"
 [[UNPACKER]] [[UNPACKER FLAGS]] "$SRC_DIR/$SRC" || exit $ERROR_TAR
+PKG_SRC=`ls -l | awk '/^d/ { print $8 }'`
 cd "$PKG_SRC"
 </untar_source>
 
diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild
index c6953db..1e7fa69 100644
--- a/trunk/mkbuild/model.mkbuild
+++ b/trunk/mkbuild/model.mkbuild
@@ -2,17 +2,17 @@
 # Personal variables
 #--------------------
 # Author name
-[[SLACKBUILD AUTHOR]]="Your name"
+[[SLACKBUILD AUTHOR]]="[[YOUR NAME]]"
 
 # Initials author name
-[[SLACKBUILD AUTHOR INITIALS]]="initials"
+[[SLACKBUILD AUTHOR INITIALS]]="[[YOUR SIGNATURE]]"
 
 #------------------------
 # Construction Variables
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/[[NAME]]/"
+[[DOWNLOAD FOLDER URL]]="[[DEFAULT URL]]/[[PACKAGE NAME]]/"
 
 # Source base name. if different from package name. Null ("") to default value.
 # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
@@ -23,9 +23,9 @@
 [[PACKAGE NAME]]=""
 
 #
-# Source Name construction string
-# Default value is: $SRC_NAME-$VERSION.tar.$EXTENSION
-[[SOURCE NAME CONSTRUCTION STRING]]="$SRC_NAME-$VERSION.tar.$EXTENSION"
+# Package default ARCH
+# Default set is i486
+[[ARCH]]=""
 
 #
 # Package version.  Null ("") to auto-set.
@@ -38,6 +38,11 @@
 [[EXTENSION]]=""
 
 #
+# Source Name construction string
+# Default value is: $SRC_NAME-$VERSION.tar.$EXTENSION
+[[SOURCE NAME CONSTRUCTION STRING]]="$SRC_NAME-$VERSION.tar.$EXTENSION"
+
+#
 # Unpacker programa ("") to auto-set. Default "tar"
 # Unpacke Flags ("") to auto-set. Default flags to tar "--no-same-owner --no-same-permissions -xvf"
 [[UNPACKER]]=""
@@ -131,15 +136,15 @@ off: postinstall_script
 # Sections changes
 #------------------
 #>slackdesc
-[[NAME]]: [[NAME]] by Slack.Sarava
-[[NAME]]:
-[[NAME]]:
-[[NAME]]:
-[[NAME]]:
-[[NAME]]:
-[[NAME]]:
-[[NAME]]:
-[[NAME]]:
-[[NAME]]:
-[[NAME]]:
+[[PACKAGE NAME]]: [[PACKAGE NAME]] by Slack.Sarava
+[[PACKAGE NAME]]:
+[[PACKAGE NAME]]:
+[[PACKAGE NAME]]:
+[[PACKAGE NAME]]:
+[[PACKAGE NAME]]:
+[[PACKAGE NAME]]:
+[[PACKAGE NAME]]:
+[[PACKAGE NAME]]:
+[[PACKAGE NAME]]:
+[[PACKAGE NAME]]:
 #<slackdesc