Adicionando $ERROR_VCS e $ERROR_MKDIR e outras mudancas menores

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

diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild
index d0d0e2fde054e4e48225b97e1fa3bb7a476e8de3..b8fe3792924e401b4329832d97953f936180a441 100755 (executable)
--- a/app/crypt/gnupg2/gnupg2.SlackBuild
+++ b/app/crypt/gnupg2/gnupg2.SlackBuild
@@ -48,14 +48,14 @@ fi
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
-ERROR_PATCH=40
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
 
 # Clean up any leftovers of previous builds
-rm -rf $SRC_NAME-$VERSION
-rm -rf $PKG
-mkdir -p $SRC_DIR
-mkdir -p $PKG
-mkdir -p $REPOS
+rm -rf $SRC_NAME-$VERSION 2> /dev/null
+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
 
 # Import (minimized) signing key from
 # http://www.gnupg.org/(en)/signature_key.html
@@ -113,13 +113,13 @@ chmod 4755 $PKG/$PREFIX/bin/{gpg2,gpgv2,gpg-agent,gpgsm}
 mv -f $PKG/$PREFIX/share/info $PKG/$PREFIX/
 mv -f $PKG/$PREFIX/share/man $PKG/$PREFIX/
 mv -f $PKG/$PREFIX/share/gnupg $PKG/$PREFIX/share/gnupg2
-rm -rf $PKG/$PREFIX/info/dir
+rm -f $PKG/$PREFIX/info/dir
 gzip -9 $PKG/$PREFIX/info/*
 gzip -9 $PKG/$PREFIX/man/*/*
 
 # Install documentation
 DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* THANKS TODO VERSION"
-mkdir -p $PKG/$PREFIX/doc/$PKG_NAME-$VERSION
+mkdir -p $PKG/$PREFIX/doc/$PKG_NAME-$VERSION || exit $ERROR_MKDIR
 cp -a $DOCS $PKG/$PREFIX/doc/$PKG_NAME-$VERSION
 ( cd $PKG/$PREFIX/doc/$PKG_NAME-$VERSION
   ln -sf /$PREFIX/share/$PKG_NAME/FAQ .
@@ -127,7 +127,7 @@ cp -a $DOCS $PKG/$PREFIX/doc/$PKG_NAME-$VERSION
 )
 
 # Add slack-desc file
-mkdir -p $PKG/install
+mkdir -p $PKG/install || exit $ERROR_MKDIR
 cat << EOF > $PKG/install/slack-desc
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
@@ -156,5 +156,5 @@ makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPK
 
 # Delete build directory, if requested
 if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $PKG
+  rm -rf $PKG $CWD/$PACKAGE-$VERSION
 fi

diff --git a/dev/libs/libassuan/libassuan.SlackBuild b/dev/libs/libassuan/libassuan.SlackBuild
index 0d118919096a283eceb8b5547e89f60ef9859f0f..a2557dd157d93e67d1f661ae61e64568723a8a9b 100755 (executable)
--- a/dev/libs/libassuan/libassuan.SlackBuild
+++ b/dev/libs/libassuan/libassuan.SlackBuild
@@ -47,14 +47,14 @@ fi
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
-ERROR_PATCH=40
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
 
 # Clean up any leftovers of previous builds
-rm -rf $PACKAGE-$VERSION
-rm -rf $PKG
-mkdir -p $SRC_DIR
-mkdir -p $PKG
-mkdir -p $REPOS
+rm -rf $PACKAGE-$VERSION 2>/dev/null
+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
 
 # Import (minimized) signing key from
 # http://www.gnupg.org/(en)/signature_key.html
@@ -106,16 +106,16 @@ make install DESTDIR=$PKG || exit $ERROR_INSTALL
 
 # Compress info pages
 mv -f $PKG/$PREFIX/share/info $PKG/$PREFIX/
-rm -rf $PKG/$PREFIX/info/dir
+rm -f $PKG/$PREFIX/info/dir
 gzip -9 $PKG/$PREFIX/info/*
 
 # Install documentation
 DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README* THANKS TODO VERSION"
-mkdir -p $PKG/$PREFIX/doc/$PACKAGE-$VERSION
+mkdir -p $PKG/$PREFIX/doc/$PACKAGE-$VERSION || exit $ERROR_MKDIR
 cp -a $DOCS $PKG/$PREFIX/doc/$PACKAGE-$VERSION
 
 # Add slack-desc file
-mkdir -p $PKG/install
+mkdir -p $PKG/install || exit $ERROR_MKDIR
 cat << EOF > $PKG/install/slack-desc
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
@@ -144,5 +144,5 @@ makepkg -l y -c n $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
 
 # Delete build directory, if requested
 if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $PKG
+  rm -rf $PKG $CWD/$PACKAGE-$VERSION
 fi

diff --git a/dev/libs/libgcrypt/libgcrypt.SlackBuild b/dev/libs/libgcrypt/libgcrypt.SlackBuild
index f1c3ac220f29065d4aebbe88129a8da3716d169d..01f62579050ee9bbbe23f1641c08bbcd453711c2 100755 (executable)
--- a/dev/libs/libgcrypt/libgcrypt.SlackBuild
+++ b/dev/libs/libgcrypt/libgcrypt.SlackBuild
@@ -47,14 +47,14 @@ fi
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
-ERROR_PATCH=40
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
 
 # Clean up any leftovers of previous builds
-rm -rf $PACKAGE-$VERSION
-rm -rf $PKG
-mkdir -p $SRC_DIR
-mkdir -p $PKG
-mkdir -p $REPOS
+rm -rf $PACKAGE-$VERSION 2> /dev/null
+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
 
 # Import (minimized) signing key from
 # http://www.gnupg.org/(en)/signature_key.html
@@ -106,16 +106,16 @@ make install DESTDIR=$PKG || exit $ERROR_INSTALL
 )
 
 # Compress info pages
-rm -rf $PKG/$PREFIX/info/dir
+rm -f $PKG/$PREFIX/info/dir
 gzip -9 $PKG/$PREFIX/info/*
 
 # Install documentation
 DOCS="AUTHORS BUGS COPYING* ChangeLog INSTALL NEWS README* THANKS TODO VERSION"
-mkdir -p $PKG/$PREFIX/doc/$PACKAGE-$VERSION
+mkdir -p $PKG/$PREFIX/doc/$PACKAGE-$VERSION || exit $ERROR_MKDIR
 cp -a $DOCS $PKG/$PREFIX/doc/$PACKAGE-$VERSION
 
 # Add slack-desc file
-mkdir -p $PKG/install
+mkdir -p $PKG/install || exit $ERROR_MKDIR
 cat << EOF > $PKG/install/slack-desc
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
@@ -144,5 +144,5 @@ makepkg -l y -c n $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
 
 # Delete build directory, if requested
 if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $PKG
+  rm -rf $PKG $CWD/$PACKAGE-$VERSION
 fi

diff --git a/dev/libs/libgpg-error/libgpg-error.SlackBuild b/dev/libs/libgpg-error/libgpg-error.SlackBuild
index d73cb2fa67dd98229af2f8fff40a1a3ead64c233..07f06319cdf2bdc6f3a2b4e8dbcc195ca9cb60b5 100755 (executable)
--- a/dev/libs/libgpg-error/libgpg-error.SlackBuild
+++ b/dev/libs/libgpg-error/libgpg-error.SlackBuild
@@ -47,14 +47,14 @@ fi
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
-ERROR_PATCH=40
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
 
 # Clean up any leftovers of previous builds
-rm -rf $PACKAGE-$VERSION
-rm -rf $PKG
-mkdir -p $SRC_DIR
-mkdir -p $PKG
-mkdir -p $REPOS
+rm -rf $PACKAGE-$VERSION 2> /dev/null
+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
 
 # Import (minimized) signing key from
 # http://www.gnupg.org/(en)/signature_key.html
@@ -106,11 +106,11 @@ make install DESTDIR=$PKG || exit $ERROR_INSTALL
 
 # Install documentation
 DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING* INSTALL NEWS README"
-mkdir -p $PKG/$PREFIX/doc/$PACKAGE-$VERSION
+mkdir -p $PKG/$PREFIX/doc/$PACKAGE-$VERSION || exit $ERROR_MKDIR
 cp -a $DOCS $PKG/$PREFIX/doc/$PACKAGE-$VERSION
 
 # Add slack-desc file
-mkdir -p $PKG/install
+mkdir -p $PKG/install || exit $ERROR_MKDIR
 cat << EOF > $PKG/install/slack-desc
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
@@ -139,5 +139,5 @@ makepkg -l y -c n $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
 
 # Delete build directory, if requested
 if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $PKG
+  rm -rf $PKG $CWD/$PACKAGE-$VERSION
 fi

diff --git a/dev/libs/libksba/libksba.SlackBuild b/dev/libs/libksba/libksba.SlackBuild
index 92e08180d304e84725def5a33dcbe684794745e3..4bef7c31e41a397073debadd2cdd7f4b8f00c530 100755 (executable)
--- a/dev/libs/libksba/libksba.SlackBuild
+++ b/dev/libs/libksba/libksba.SlackBuild
@@ -47,14 +47,14 @@ fi
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
-ERROR_PATCH=40
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
 
 # Clean up any leftovers of previous builds
-rm -rf $PACKAGE-$VERSION
-rm -rf $PKG
-mkdir -p $SRC_DIR
-mkdir -p $PKG
-mkdir -p $REPOS
+rm -rf $PACKAGE-$VERSION 2> /dev/null
+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
 
 # Import (minimized) signing key from
 # http://www.gnupg.org/(en)/signature_key.html
@@ -106,16 +106,16 @@ make install DESTDIR=$PKG || exit $ERROR_INSTALL
 
 # Compress info pages
 mv -f $PKG/$PREFIX/share/info $PKG/$PREFIX/
-rm -rf $PKG/$PREFIX/info/dir
+rm -f $PKG/$PREFIX/info/dir
 gzip -9 $PKG/$PREFIX/info/*
 
 # Install documentation
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION"
-mkdir -p $PKG/$PREFIX/doc/$PACKAGE-$VERSION
+mkdir -p $PKG/$PREFIX/doc/$PACKAGE-$VERSION || exit $ERROR_MKDIR
 cp -a $DOCS $PKG/$PREFIX/doc/$PACKAGE-$VERSION
 
 # Add slack-desc file
-mkdir -p $PKG/install
+mkdir -p $PKG/install || exit $ERROR_MKDIR
 cat << EOF > $PKG/install/slack-desc
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
@@ -144,5 +144,5 @@ makepkg -l y -c n $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
 
 # Delete build directory, if requested
 if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $PKG
+  rm -rf $PKG $CWD/$PACKAGE-$VERSION
 fi

diff --git a/dev/libs/libpth/libpth.SlackBuild b/dev/libs/libpth/libpth.SlackBuild
index e483b9a8f2acde238281aec925763350c0bd8446..d1564e2ad3ac7c0bc08898a7974abc49a5912b97 100755 (executable)
--- a/dev/libs/libpth/libpth.SlackBuild
+++ b/dev/libs/libpth/libpth.SlackBuild
@@ -48,17 +48,17 @@ fi
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
-ERROR_PATCH=40
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
 
 # Clean up any leftovers of previous builds
-rm -rf $SRC_NAME-$VERSION
-rm -rf $PKG
-mkdir -p $SRC_DIR
-mkdir -p $PKG
-mkdir -p $REPOS
+rm -rf $SRC_NAME-$VERSION 2> /dev/null
+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
 
 # Import (minimized) signing key from
-# http://www.gnupg.org/(en)/signature_key.html
+# ftp://ftp.gnu.org/gnu/gnu-keyring.gpg
 gpg --import << EOGPG || exit $ERROR_GPG
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
@@ -129,11 +129,11 @@ gzip -9 $PKG/$PREFIX/man/*/*
 # Install documentation
 DOCS="ANNOUNCE AUTHORS COPYING ChangeLog HACKING HISTORY INSTALL NEWS PORTING \
       README SUPPORT TESTS THANKS USERS"
-mkdir -p $PKG/$PREFIX/doc/$PKG_NAME-$VERSION
+mkdir -p $PKG/$PREFIX/doc/$PKG_NAME-$VERSION || exit $ERROR_MKDIR
 cp -a $DOCS $PKG/$PREFIX/doc/$PKG_NAME-$VERSION
 
 # Add slack-desc file
-mkdir -p $PKG/install
+mkdir -p $PKG/install || exit $ERROR_MKDIR
 cat << EOF > $PKG/install/slack-desc
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
@@ -162,5 +162,5 @@ makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPK
 
 # Delete build directory, if requested
 if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $PKG
+  rm -rf $PKG $CWD/$PACKAGE-$VERSION
 fi