From 37d561ca2d24d0d1bf516eb4be54ec214172674c Mon Sep 17 00:00:00 2001 From: luis Date: Mon, 4 Dec 2006 04:56:35 +0000 Subject: 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 --- app/crypt/gnupg2/gnupg2.SlackBuild | 20 ++++++++++---------- dev/libs/libassuan/libassuan.SlackBuild | 20 ++++++++++---------- dev/libs/libgcrypt/libgcrypt.SlackBuild | 20 ++++++++++---------- dev/libs/libgpg-error/libgpg-error.SlackBuild | 18 +++++++++--------- dev/libs/libksba/libksba.SlackBuild | 20 ++++++++++---------- dev/libs/libpth/libpth.SlackBuild | 20 ++++++++++---------- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild index d0d0e2fd..b8fe3792 100755 --- 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 0d118919..a2557dd1 100755 --- 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 f1c3ac22..01f62579 100755 --- 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 d73cb2fa..07f06319 100755 --- 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 92e08180..4bef7c31 100755 --- 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 e483b9a8..d1564e2a 100755 --- 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 -- cgit v1.2.3