diff options
-rwxr-xr-x | dev/libs/beecrypt/beecrypt.SlackBuild (renamed from sys/cluster/beecrypt/beecrypt.SlackBuild) | 50 | ||||
-rw-r--r-- | dev/libs/beecrypt/slack-required | 2 | ||||
-rwxr-xr-x | net/misc/vlan/vlan.SlackBuild (renamed from sys/cluster/vlan/vlan.SlackBuild) | 32 |
3 files changed, 47 insertions, 37 deletions
diff --git a/sys/cluster/beecrypt/beecrypt.SlackBuild b/dev/libs/beecrypt/beecrypt.SlackBuild index 2733c090..f18b4276 100755 --- a/sys/cluster/beecrypt/beecrypt.SlackBuild +++ b/dev/libs/beecrypt/beecrypt.SlackBuild @@ -4,20 +4,16 @@ # by rhatto at riseup.net # -cat << EOCAT -Check if you have the following stuff installed: - - libgcrypt - libgpg-error - -EOCAT - -if [ "$INTERACT" != "no" ]; then - echo "Hit ENTER do continue, Crtl-C to abort" - read crap -else - echo sleeping 3 seconds... - sleep 3 +if [ -s "slack-required" ]; then + echo Recomended and required packages for building cairo are: + cat slack-required | sed -e 's/^/\t/' + if [ "$INTERACT" != "no" ]; then + echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER. + read crap +# else +# echo Sleeping 3 seconds... +# sleep 3 + fi fi CWD="`pwd`" @@ -37,6 +33,12 @@ SRC_DIR=${SRC:=$CWD} TMP=${TMP:=/tmp} REPOS=${REPOS:=$TMP} +# ------- error codes for createpkg -------------- +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 + if [ "$ARCH" == "x86_64" ]; then LIBDIR=/usr/lib64 else @@ -50,18 +52,12 @@ SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT" URL="http://easynews.dl.sourceforge.net/sourceforge/$PACKAGE/$SRC" -if [ "$PACKAGE_EXT" == "bz2" ]; then - tarflag="j" -else - tarflag="z" -fi - SRC_DIR="$SRC_DIR/$PACKAGE" mkdir -p $SRC_DIR if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then - wget "$URL" -O "$SRC_DIR/$SRC" - wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" + wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET + wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" || exit $ERROR_WGET fi # TODO: signature checking @@ -76,11 +72,11 @@ rm -rf $TMP mkdir -p $TMP cd $TMP -tar xvf$tarflag $SRC_DIR/$SRC +tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR cd $PACKAGE-$VERSION -./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR -make || exit 32 -make DESTDIR=$TMP/package-$PACKAGE install +./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR || exit $ERROR_CONF +make || exit $ERROR_MAKE +make DESTDIR=$TMP/package-$PACKAGE install || exit $ERROR_INSTALL CWD="`pwd`" @@ -119,7 +115,7 @@ for file in AUTHORS BENCHMARKS BUGS CONTRIBUTORS COPYING ChangeLog INSTALL NEWS cp $CWD/$file* usr/doc/$PACKAGE-$VERSION/ done -makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz +makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG if [ "$CLEANUP" == "yes" ]; then rm -rf $TMP diff --git a/dev/libs/beecrypt/slack-required b/dev/libs/beecrypt/slack-required new file mode 100644 index 00000000..3ec97401 --- /dev/null +++ b/dev/libs/beecrypt/slack-required @@ -0,0 +1,2 @@ +libgcrypt +libgpg-error diff --git a/sys/cluster/vlan/vlan.SlackBuild b/net/misc/vlan/vlan.SlackBuild index 06386b8c..412c8dd4 100755 --- a/sys/cluster/vlan/vlan.SlackBuild +++ b/net/misc/vlan/vlan.SlackBuild @@ -3,6 +3,18 @@ # slackbuild for vlan # +if [ -s "slack-required" ]; then + echo Recomended and required packages for building cairo are: + cat slack-required | sed -e 's/^/\t/' + if [ "$INTERACT" != "no" ]; then + echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER. + read crap +# else +# echo Sleeping 3 seconds... +# sleep 3 + fi +fi + CWD="`pwd`" if [ -f ~/.slackbuildrc ]; then @@ -20,6 +32,12 @@ SRC_DIR=${SRC:=$CWD} TMP=${TMP:=/tmp} REPOS=${REPOS:=$TMP} +# ------- error codes for createpkg -------------- +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 + if [ "$ARCH" == "x86_64" ]; then LIBDIR=/usr/lib64 else @@ -31,17 +49,11 @@ PACKAGE_EXT="gz" SRC="$PACKAGE.$VERSION.tar.$PACKAGE_EXT" URL="http://www.candelatech.com/~greear/vlan/$SRC" -if [ "$PACKAGE_EXT" == "bz2" ]; then - tarflag="j" -else - tarflag="z" -fi - SRC_DIR="$SRC_DIR/$PACKAGE" mkdir -p $SRC_DIR if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then - wget "$URL" -O "$SRC_DIR/$SRC" + wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET fi TMP="$TMP/$PACKAGE" @@ -49,11 +61,11 @@ rm -rf $TMP mkdir -p $TMP cd $TMP -tar xvf$tarflag $SRC_DIR/$SRC +tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR mv $PACKAGE $PACKAGE-$VERSION cd $PACKAGE-$VERSION rm -f vconfig vconfig.o -make || exit 32 +make || exit $ERROR_MAKE CWD="`pwd`" @@ -93,7 +105,7 @@ for file in CHANGELOG README vlan.html howto.html; do cp $CWD/$file* usr/doc/$PACKAGE-$VERSION/ done -makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz +makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG if [ "$CLEANUP" == "yes" ]; then rm -rf $TMP |