From b4e5a59cf012666c6e14080b37281fa0a8b2d27d Mon Sep 17 00:00:00 2001
From: luis <luis@370017ae-e619-0410-ac65-c121f96126d4>
Date: Thu, 12 Apr 2007 02:46:10 +0000
Subject: Syncing with generic.SlackBuild v0.8.2

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1164 370017ae-e619-0410-ac65-c121f96126d4
---
 app/crypt/gnupg2/gnupg2.SlackBuild   | 14 +++++++-------
 app/crypt/pgpdump/pgpdump.SlackBuild | 10 ++++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'app')

diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild
index dbfaaeba..255e6474 100755
--- a/app/crypt/gnupg2/gnupg2.SlackBuild
+++ b/app/crypt/gnupg2/gnupg2.SlackBuild
@@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
 PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
+CONF_OPTIONS=${CONF_OPTIONS:=--infodir=$PREFIX/info --mandir=$PREFIX/man --enable-static-rnd=linux --enable-noexecstack}
+NUMJOBS=${NUMJOBS:=-j4}
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR="$PREFIX/lib"
@@ -100,12 +102,10 @@ cd "$PKG_SRC"
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
-  --prefix="$PREFIX" --libdir="$LIBDIR" \
-  --infodir="$PREFIX/info" --mandir="$PREFIX/man" \
-  --enable-static-rnd=linux --enable-noexecstack || exit $ERROR_CONF
+  --prefix="$PREFIX" --libdir="$LIBDIR" "$CONF_OPTIONS" || exit $ERROR_CONF
 
 # Compile
-make || exit $ERROR_MAKE
+make "$NUMJOBS" || exit $ERROR_MAKE
 
 # Install
 make install DESTDIR="$PKG" || exit $ERROR_INSTALL
@@ -151,9 +151,9 @@ fi
 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"
-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"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+( cd "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
   ln -sf "$PREFIX/share/$PKG_NAME/FAQ" .
   ln -sf "$PREFIX/share/$PKG_NAME/faq.html" .
 )
diff --git a/app/crypt/pgpdump/pgpdump.SlackBuild b/app/crypt/pgpdump/pgpdump.SlackBuild
index ee981fa9..fcee4bc2 100755
--- a/app/crypt/pgpdump/pgpdump.SlackBuild
+++ b/app/crypt/pgpdump/pgpdump.SlackBuild
@@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
 PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
+CONF_OPTIONS=${CONF_OPTIONS:=}
+NUMJOBS=${NUMJOBS:=-j4}
 
 # Set system optmization flags based on $ARCH
 if [ "$ARCH" = "i386" ]; then
@@ -70,10 +72,10 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA
 cd "$PKG_SRC"
 
 # Configure
-CFLAGS="$SLKCFLAGS" ./configure || exit $ERROR_CONF
+CFLAGS="$SLKCFLAGS" ./configure "$CONF_OPTIONS" || exit $ERROR_CONF
 
 # Compile
-make || exit $ERROR_MAKE
+make "$NUMJOBS" || exit $ERROR_MAKE
 
 # Install
 mkdir -p "$PKG/$PREFIX/bin" "$PKG/$PREFIX/man/man1" || exit $ERROR_MKDIR
@@ -104,8 +106,8 @@ fi
 
 # Install documentation
 DOCS="CHANGES COPYRIGHT README"
-mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
-cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
 
 # Add package description (slack-desc)
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
-- 
cgit v1.2.3