generic.SlackBuild v0.7.4

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1102 370017ae-e619-0410-ac65-c121f96126d4

3 files changed, 32 insertions, 25 deletions

diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild
index 8618b237..abd71176 100755
--- a/app/crypt/gnupg2/gnupg2.SlackBuild
+++ b/app/crypt/gnupg2/gnupg2.SlackBuild
@@ -149,8 +149,8 @@ fi
 
 # Install documentation
 DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* THANKS TODO \
-     VERSION doc/DETAILS doc/HACKING doc/KEYSERVER doc/OpenPGP doc/TRANSLATE \
-     doc/examples doc/*.png"
+      VERSION doc/DETAILS doc/HACKING doc/KEYSERVER doc/OpenPGP doc/TRANSLATE \
+      doc/examples doc/*.png"
 mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
 cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
 ( cd "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
diff --git a/dev/libs/libgcrypt/libgcrypt.SlackBuild b/dev/libs/libgcrypt/libgcrypt.SlackBuild
index 98a4f9f7..c530b3c4 100755
--- a/dev/libs/libgcrypt/libgcrypt.SlackBuild
+++ b/dev/libs/libgcrypt/libgcrypt.SlackBuild
@@ -6,8 +6,6 @@
 # Author: Luis ( luis at riseup d0t net )
 #
 
-CWD=`pwd`
-
 # Look for slackbuildrc
 if [ -f ~/.slackbuildrc ]; then
   source ~/.slackbuildrc
@@ -16,17 +14,19 @@ elif [ -f /etc/slackbuildrc ]; then
 fi
 
 # Set variables
+CWD="$(pwd)"
 SRC_NAME="libgcrypt"
 PKG_NAME="libgcrypt"
 ARCH=${ARCH:=i486}
-VERSION=${VERSION:=1.2.4}
+SRC_VERSION=${VERSION:=1.2.4}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1ls}
-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:=/usr}
-PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION"
+PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR="$PREFIX/lib"
@@ -54,12 +54,20 @@ ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
 rm -rf "$PKG_SRC" 2> /dev/null
 rm -rf "$PKG" 2> /dev/null
 
-# Create directories, if necessary
+# Create directories if necessary
 mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
 mkdir -p "$PKG" || exit $ERROR_MKDIR
 mkdir -p "$REPOS" || exit $ERROR_MKDIR
 
-# Import (minimized) signing key from
+# Dowload source if necessary
+SRC="$SRC_NAME-$SRC_VERSION.tar.bz2"
+URL="ftp://ftp.gnupg.org/gcrypt/libgcrypt/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! bzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
+  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+fi
+
+# Import minimized signing key from
 # http://www.gnupg.org/(en)/signature_key.html
 gpg --import << EOKEY || exit $ERROR_GPG
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -76,30 +84,29 @@ z05PRKjChvxrWzhe/Yn6BAmPF+6YxQo2W98rzq0THS5wKJjXmHw=
 -----END PGP PUBLIC KEY BLOCK-----
 EOKEY
 
-# Dowload source and its signature, if necessary
-SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="ftp://ftp.gnupg.org/gcrypt/libgcrypt/$SRC"
-
-if [ ! -s "$SRC_DIR/$SRC" ] || ! bzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
-  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
-fi
+# Dowload source's signature if necessary and check it
 if [ ! -s "$SRC_DIR/$SRC.sig" ]; then
   wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" || exit $ERROR_WGET
 fi
 
-# Check source's signature
 gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 
-# Untar, configure, compile and install
+# Untar
 cd "$SRC_DIR"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
 cd "$PKG_SRC"
+
+# Configure
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix="$PREFIX" --libdir="$LIBDIR" --infodir="$PREFIX/info" \
   --enable-m-guard --enable-noexecstack || exit $ERROR_CONF
+
+# Compile
 make || exit $ERROR_MAKE
+
+# Install
 make install DESTDIR="$PKG" || exit $ERROR_INSTALL
 
 # Strip binaries
@@ -120,8 +127,8 @@ fi
 
 # Install documentation
 DOCS="AUTHORS BUGS COPYING* ChangeLog INSTALL NEWS README* THANKS TODO VERSION"
-mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" || exit $ERROR_MKDIR
-cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION"
+mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
 
 # Add package description (slack-desc)
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -149,9 +156,9 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
-# Delete source and build directories, if requested
+# Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ]; then
   rm -rf "$PKG_SRC" "$PKG"
 fi
diff --git a/others/generic/generic.SlackBuild b/others/generic/generic.SlackBuild
index c0cb0cac..e6d234ac 100755
--- a/others/generic/generic.SlackBuild
+++ b/others/generic/generic.SlackBuild
@@ -1,7 +1,7 @@
 ###################################################
 ## Generic template for SlackBuilds
 ##
-## Version 0.7.3 - Luis ( luis at riseup d0t net)
+## Version 0.7.4 - Luis ( luis at riseup d0t net)
 ##
 ###################################################
 #!/bin/bash
@@ -92,8 +92,8 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA
 cd "$PKG_SRC"
 
 # Patch source
-patches="[[PATCH FILES]] $PACKAGE.diff $PACKAGE-$VERSION.diff
-         $PACKAGE-$VERSION-$ARCH.diff $PACKAGE-$ARCH.diff"
+patches="[[PATCH FILES]] $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
+         $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
 for patch in $patches; do
   if [ -f "$CWD/$patch" ]; then
     patch -Np[[NUMBER OF PREFIX SLASHES TO STRIP]] < "$CWD/$patch" || exit $ERROR_PATCH