diff options
| -rwxr-xr-x | app/crypt/gnupg2/gnupg2.SlackBuild | 68 | ||||
| -rwxr-xr-x | dev/libs/libassuan/libassuan.SlackBuild | 63 | ||||
| -rwxr-xr-x | dev/libs/libgcrypt/libgcrypt.SlackBuild | 63 | ||||
| -rwxr-xr-x | dev/libs/libgpg-error/libgpg-error.SlackBuild | 65 | ||||
| -rwxr-xr-x | dev/libs/libksba/libksba.SlackBuild | 63 | ||||
| -rwxr-xr-x | dev/libs/libpth/libpth.SlackBuild | 54 | ||||
| -rwxr-xr-x | sci/electronics/gtkwave/gtkwave.SlackBuild | 52 | ||||
| -rwxr-xr-x | sci/electronics/iverilog/iverilog.SlackBuild | 54 | ||||
| -rwxr-xr-x | sci/electronics/ivi/ivi.SlackBuild | 76 | ||||
| -rwxr-xr-x | sys/apps/microcode_ctl/microcode_ctl.SlackBuild | 60 |
10 files changed, 248 insertions, 370 deletions
diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild index 8d709ce8..b3514d5d 100755 --- a/app/crypt/gnupg2/gnupg2.SlackBuild +++ b/app/crypt/gnupg2/gnupg2.SlackBuild @@ -26,10 +26,10 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_DIR/$SRC_NAME-$VERSION +PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,13 +51,13 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +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 @@ -77,7 +77,7 @@ z05PRKjChvxrWzhe/Yn6BAmPF+6YxQo2W98rzq0THS5wKJjXmHw= EOKEY # Dowload source and its signature, if necessary -SRC="$PKG_SRC.tar.bz2" +SRC="$SRC_NAME-$VERSION.tar.bz2" URL="ftp://ftp.gnupg.org/gcrypt/gnupg/$SRC" if [ ! -f "$SRC_DIR/$SRC" ]; then @@ -88,24 +88,24 @@ if [ ! -f "$SRC_DIR/$SRC.sig" ]; then fi # Check source's signature -gpg --verify $SRC_DIR/$SRC.sig $SRC_DIR/$SRC || exit $ERROR_GPG +gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG # Untar, patch, configure, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC/g10 -patch -Np0 < $CWD/filter-context-20-small.diff || exit $ERROR_PATCH -cd .. +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC/g10" +patch -Np0 < "$CWD/filter-context-20-small.diff" || exit $ERROR_PATCH +cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=$PREFIX --libdir=$LIBDIR \ - --infodir=$PREFIX/info --mandir=$PREFIX/man \ + --prefix="$PREFIX" --libdir="$LIBDIR" \ + --infodir="$PREFIX/info" --mandir="$PREFIX/man" \ --enable-static-rnd=linux --enable-noexecstack || exit $ERROR_CONF make || exit $ERROR_MAKE make install DESTDIR=$PKG || exit $ERROR_INSTALL # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ @@ -113,14 +113,14 @@ make install DESTDIR=$PKG || exit $ERROR_INSTALL ) # Avoid overwriting share/gnupg/ files, from the original gnupg package -mv -f $PKG/$PREFIX/share/gnupg $PKG/$PREFIX/share/gnupg2 +mv -f "$PKG/$PREFIX/share/gnupg" "$PKG/$PREFIX/share/gnupg2" # Install gpg2, gpgv2, gpg-agent, and gpgsm already suid root -chmod 4755 $PKG/$PREFIX/bin/{gpg2,gpgv2,gpg-agent,gpgsm} +chmod 4755 "$PKG/$PREFIX/bin/{gpg2,gpgv2,gpg-agent,gpgsm}" -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man +# Compress and link manpages +if [ -d "$PKG/$PREFIX/man" ]; then + ( cd "$PKG/$PREFIX/man" for manpagedir in $(find . -type d -name "man*") ; do ( cd $manpagedir for eachpage in $( find . -type l -maxdepth 1) ; do @@ -133,9 +133,9 @@ if [ -d $PKG/$PREFIX/man ]; then ) fi -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info +# Compress info files +if [ -d "$PKG/$PREFIX/info" ]; then + ( cd "$PKG/$PREFIX/info" rm -f dir gzip -9 * ) @@ -145,16 +145,16 @@ 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-$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 . - ln -sf $PREFIX/share/$PKG_NAME/faq.html . +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" . + ln -sf "$PREFIX/share/$PKG_NAME/faq.html" . ) # Add package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -177,10 +177,10 @@ gnupg2: EODESC # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi diff --git a/dev/libs/libassuan/libassuan.SlackBuild b/dev/libs/libassuan/libassuan.SlackBuild index 26361437..a632cd55 100755 --- a/dev/libs/libassuan/libassuan.SlackBuild +++ b/dev/libs/libassuan/libassuan.SlackBuild @@ -26,10 +26,10 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_NAME-$VERSION +PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,13 +51,13 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +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 @@ -77,7 +77,7 @@ z05PRKjChvxrWzhe/Yn6BAmPF+6YxQo2W98rzq0THS5wKJjXmHw= EOKEY # Dowload source and its signature, if necessary -SRC="$PKG_SRC.tar.bz2" +SRC="$SRC_NAME-$VERSION.tar.bz2" URL="ftp://ftp.gnupg.org/gcrypt/libassuan/$SRC" if [ ! -f "$SRC_DIR/$SRC" ]; then @@ -88,45 +88,30 @@ if [ ! -f "$SRC_DIR/$SRC.sig" ]; then fi # Check source's signature -gpg --verify $SRC_DIR/$SRC.sig $SRC_DIR/$SRC || exit $ERROR_GPG +gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG # Untar, configure, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=$PREFIX --libdir=$LIBDIR \ - --infodir=$PREFIX/info --mandir=$PREFIX/man || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" \ + --infodir="$PREFIX/info" --mandir="$PREFIX/man" || exit $ERROR_CONF make || exit $ERROR_MAKE make install DESTDIR=$PKG || exit $ERROR_INSTALL # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info +# Compress info files +if [ -d "$PKG/$PREFIX/info" ]; then + ( cd "$PKG/$PREFIX/info" rm -f dir gzip -9 * ) @@ -134,12 +119,12 @@ fi # Install documentation DOCS="AUTHORS 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-$VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" # Add package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -162,10 +147,10 @@ libassuan: EODESC # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi diff --git a/dev/libs/libgcrypt/libgcrypt.SlackBuild b/dev/libs/libgcrypt/libgcrypt.SlackBuild index df63cb49..1809a9fa 100755 --- a/dev/libs/libgcrypt/libgcrypt.SlackBuild +++ b/dev/libs/libgcrypt/libgcrypt.SlackBuild @@ -26,10 +26,10 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_NAME-$VERSION +PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,13 +51,13 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +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 @@ -77,7 +77,7 @@ z05PRKjChvxrWzhe/Yn6BAmPF+6YxQo2W98rzq0THS5wKJjXmHw= EOKEY # Dowload source and its signature, if necessary -SRC="$PKG_SRC.tar.bz2" +SRC="$SRC_NAME-$VERSION.tar.bz2" URL="ftp://ftp.gnupg.org/gcrypt/libgcrypt/$SRC" if [ ! -f "$SRC_DIR/$SRC" ]; then @@ -88,46 +88,31 @@ if [ ! -f "$SRC_DIR/$SRC.sig" ]; then fi # Check source's signature -gpg --verify $SRC_DIR/$SRC.sig $SRC_DIR/$SRC || exit $ERROR_GPG +gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG # Untar, configure, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=$PREFIX --libdir=$LIBDIR \ - --infodir=$PREFIX/info --mandir=$PREFIX/man \ + --prefix="$PREFIX" --libdir="$LIBDIR" \ + --infodir="$PREFIX/info" --mandir="$PREFIX/man" \ --enable-m-guard --enable-noexecstack || exit $ERROR_CONF make || exit $ERROR_MAKE make install DESTDIR=$PKG || exit $ERROR_INSTALL # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info +# Compress info files +if [ -d "$PKG/$PREFIX/info" ]; then + ( cd "$PKG/$PREFIX/info" rm -f dir gzip -9 * ) @@ -135,12 +120,12 @@ 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-$VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" # Add package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -163,10 +148,10 @@ libgcrypt: EODESC # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi diff --git a/dev/libs/libgpg-error/libgpg-error.SlackBuild b/dev/libs/libgpg-error/libgpg-error.SlackBuild index d13103ff..db95ac8f 100755 --- a/dev/libs/libgpg-error/libgpg-error.SlackBuild +++ b/dev/libs/libgpg-error/libgpg-error.SlackBuild @@ -26,10 +26,10 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_NAME-$VERSION +PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,13 +51,13 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +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 @@ -77,7 +77,7 @@ z05PRKjChvxrWzhe/Yn6BAmPF+6YxQo2W98rzq0THS5wKJjXmHw= EOKEY # Dowload source and its signature, if necessary -SRC="$PKG_SRC.tar.bz2" +SRC="$SRC_NAME-$VERSION.tar.bz2" URL="http://ftp.gnupg.org/GnuPG/libgpg-error/$SRC" if [ ! -f "$SRC_DIR/$SRC" ]; then @@ -88,58 +88,35 @@ if [ ! -f "$SRC_DIR/$SRC.sig" ]; then fi # Check source's signature -gpg --verify $SRC_DIR/$SRC.sig $SRC_DIR/$SRC || exit $ERROR_GPG +gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG # Untar, configure, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=$PREFIX --libdir=$LIBDIR \ - --infodir=$PREFIX/info --mandir=$PREFIX/man || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" \ + --infodir="$PREFIX/info" --mandir="$PREFIX/man" || exit $ERROR_CONF make || exit $ERROR_MAKE make install DESTDIR=$PKG || exit $ERROR_INSTALL # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info - rm -f dir - gzip -9 * - ) -fi - # Install documentation DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING* INSTALL NEWS README" -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-$VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" # Add package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -162,10 +139,10 @@ libgpg-error: EODESC # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi diff --git a/dev/libs/libksba/libksba.SlackBuild b/dev/libs/libksba/libksba.SlackBuild index 596ec243..a75e556c 100755 --- a/dev/libs/libksba/libksba.SlackBuild +++ b/dev/libs/libksba/libksba.SlackBuild @@ -26,10 +26,10 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_NAME-$VERSION +PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,13 +51,13 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +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 @@ -77,7 +77,7 @@ z05PRKjChvxrWzhe/Yn6BAmPF+6YxQo2W98rzq0THS5wKJjXmHw= EOKEY # Dowload source and its signature, if necessary -SRC="$PKG_SRC.tar.bz2" +SRC="$SRC_NAME-$VERSION.tar.bz2" URL="ftp://ftp.gnupg.org/gcrypt/libksba/$SRC" if [ ! -f "$SRC_DIR/$SRC" ]; then @@ -88,45 +88,30 @@ if [ ! -f "$SRC_DIR/$SRC.sig" ]; then fi # Check source's signature -gpg --verify $SRC_DIR/$SRC.sig $SRC_DIR/$SRC || exit $ERROR_GPG +gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG # Untar, configure, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=$PREFIX --libdir=$LIBDIR \ - --infodir=$PREFIX/info --mandir=$PREFIX/man || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" \ + --infodir="$PREFIX/info" --mandir="$PREFIX/man" || exit $ERROR_CONF make || exit $ERROR_MAKE make install DESTDIR=$PKG || exit $ERROR_INSTALL # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info +# Compress info files +if [ -d "$PKG/$PREFIX/info" ]; then + ( cd "$PKG/$PREFIX/info" rm -f dir gzip -9 * ) @@ -134,12 +119,12 @@ fi # Install documentation DOCS="AUTHORS 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-$VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" # Add package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -162,10 +147,10 @@ libksba: EODESC # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi diff --git a/dev/libs/libpth/libpth.SlackBuild b/dev/libs/libpth/libpth.SlackBuild index a7a6805c..5936a20b 100755 --- a/dev/libs/libpth/libpth.SlackBuild +++ b/dev/libs/libpth/libpth.SlackBuild @@ -26,10 +26,10 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_NAME-$VERSION +PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,13 +51,13 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR +mkdir -p "$PKG" || exit $ERROR_MKDIR +mkdir -p "$REPOS" || exit $ERROR_MKDIR # Import (minimized) signing key from # ftp://ftp.gnu.org/gnu/gnu-keyring.gpg @@ -94,7 +94,7 @@ ZKGPGjkCEUGma0qd+GUAh4A= EOKEY # Dowload source and its signature, if necessary -SRC="$PKG_SRC.tar.gz" +SRC="$SRC_NAME-$VERSION.tar.gz" URL="ftp://ftp.gnu.org/gnu/pth/$SRC" if [ ! -f "$SRC_DIR/$SRC" ]; then @@ -105,30 +105,30 @@ if [ ! -f "$SRC_DIR/$SRC.sig" ]; then fi # Check source's signature -gpg --verify $SRC_DIR/$SRC.sig $SRC_DIR/$SRC || exit $ERROR_GPG +gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG # Untar, configure, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=$PREFIX --libdir=$LIBDIR || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" || exit $ERROR_CONF make || exit $ERROR_MAKE make test make install DESTDIR=$PKG || exit $ERROR_INSTALL # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man +# Compress and link manpages +if [ -d "$PKG/$PREFIX/man" ]; then + ( cd "$PKG/$PREFIX/man" for manpagedir in $(find . -type d -name "man*") ; do ( cd $manpagedir for eachpage in $( find . -type l -maxdepth 1) ; do @@ -141,23 +141,15 @@ if [ -d $PKG/$PREFIX/man ]; then ) fi -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info - rm -f dir - gzip -9 * - ) -fi - # 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 || exit $ERROR_MKDIR -cp -a $DOCS $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 package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -180,10 +172,10 @@ libpth: EODESC # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi diff --git a/sci/electronics/gtkwave/gtkwave.SlackBuild b/sci/electronics/gtkwave/gtkwave.SlackBuild index c1182899..62f7d283 100755 --- a/sci/electronics/gtkwave/gtkwave.SlackBuild +++ b/sci/electronics/gtkwave/gtkwave.SlackBuild @@ -19,17 +19,17 @@ fi SRC_NAME="gtkwave" PKG_NAME="gtkwave" ARCH=${ARCH:=i486} -VERSION=${VERSION:=3.0.18} +VERSION=${VERSION:=3.0.20} BUILD=${BUILD:=1ls} SRC_DIR=${SRC_DIR:=$CWD} TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_NAME-$VERSION +PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,13 +51,13 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR +mkdir -p "$PKG" || exit $ERROR_MKDIR +mkdir -p "$REPOS" || exit $ERROR_MKDIR # Dowload source, if necessary SRC="$SRC_NAME-current.tar.gz" @@ -83,26 +83,26 @@ else fi # Untar, configure, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ echo $GTK_VERSION | ./configure \ - --prefix=$PREFIX --libdir=$LIBDIR || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" || exit $ERROR_CONF make || exit $ERROR_MAKE make install prefix=$PKG/$PREFIX || exit $ERROR_INSTALL # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man +# Compress and link manpages +if [ -d "$PKG/$PREFIX/man" ]; then + ( cd "$PKG/$PREFIX/man" for manpagedir in $(find . -type d -name "man*") ; do ( cd $manpagedir for eachpage in $( find . -type l -maxdepth 1) ; do @@ -115,22 +115,14 @@ if [ -d $PKG/$PREFIX/man ]; then ) fi -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info - rm -f dir - gzip -9 * - ) -fi - # Install documentation and examples DOCS="*.TXT doc/gtkwave.odt examples" -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-$VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" # Add package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -153,10 +145,10 @@ gtkwave: EODESC # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi diff --git a/sci/electronics/iverilog/iverilog.SlackBuild b/sci/electronics/iverilog/iverilog.SlackBuild index 905acab3..3242ec47 100755 --- a/sci/electronics/iverilog/iverilog.SlackBuild +++ b/sci/electronics/iverilog/iverilog.SlackBuild @@ -26,10 +26,10 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_NAME-$VERSION +PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,16 +51,16 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR +mkdir -p "$PKG" || exit $ERROR_MKDIR +mkdir -p "$REPOS" || exit $ERROR_MKDIR # Dowload source, if necessary -SRC="$PKG_SRC.tar.gz" +SRC="$SRC_NAME-$VERSION.tar.gz" URL="ftp://ftp.icarus.com/pub/eda/verilog/v0.8/$SRC" if [ ! -f "$SRC_DIR/$SRC" ]; then @@ -68,26 +68,26 @@ if [ ! -f "$SRC_DIR/$SRC" ]; then fi # Untar, configure, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=$PREFIX --libdir=$LIBDIR || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" || exit $ERROR_CONF make || exit $ERROR_MAKE make install prefix=$PKG/$PREFIX || exit $ERROR_INSTALL # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man +# Compress and link manpages +if [ -d "$PKG/$PREFIX/man" ]; then + ( cd "$PKG/$PREFIX/man" for manpagedir in $(find . -type d -name "man*") ; do ( cd $manpagedir for eachpage in $( find . -type l -maxdepth 1) ; do @@ -100,22 +100,14 @@ if [ -d $PKG/$PREFIX/man ]; then ) fi -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info - rm -f dir - gzip -9 * - ) -fi - # Install documentation and examples -mkdir -p $PKG/$PREFIX/doc/$PKG_NAME-$VERSION/vvp || exit $ERROR_MKDIR -cp -a COPYING INSTALL *.txt examples $PKG/$PREFIX/doc/$PKG_NAME-$VERSION -cp -a vvp/*.txt vvp/examples $PKG/$PREFIX/doc/$PKG_NAME-$VERSION/vvp +mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION/vvp" || exit $ERROR_MKDIR +cp -a COPYING INSTALL *.txt examples "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" +cp -a vvp/*.txt vvp/examples "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION/vvp" # Add package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -138,10 +130,10 @@ iverilog: EODESC # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi diff --git a/sci/electronics/ivi/ivi.SlackBuild b/sci/electronics/ivi/ivi.SlackBuild index 27c381bf..7956df86 100755 --- a/sci/electronics/ivi/ivi.SlackBuild +++ b/sci/electronics/ivi/ivi.SlackBuild @@ -19,17 +19,18 @@ fi SRC_NAME="ivi" PKG_NAME="ivi" ARCH=${ARCH:=i486} -VERSION=${VERSION:=0.4_20031121} +SRC_VERSION="0.4-pre-20031121" +PKG_VERSION="0.4_20031121" BUILD=${BUILD:=1ls} SRC_DIR=${SRC_DIR:=$CWD} TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_NAME-0.4-pre-20031121 +PKG_SRC="$SRC_DIR/$SRC_NAME-$SRC_VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,16 +52,16 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR +mkdir -p "$PKG" || exit $ERROR_MKDIR +mkdir -p "$REPOS" || exit $ERROR_MKDIR # Dowload source, if necessary -SRC="$PKG_SRC.tar.gz" +SRC="$SRC_NAME-0.4-pre-20031121.tar.gz" URL="http://downloads.sourceforge.net/ivi/$SRC" if [ ! -f "$SRC_DIR/$SRC" ]; then @@ -68,62 +69,39 @@ if [ ! -f "$SRC_DIR/$SRC" ]; then fi # Untar, patch, configure, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC -patch -Np1 < $CWD/ivi-0.4-pre-20031121-gcc3.4.patch || exit $ERROR_PATCH +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC" +patch -Np1 < "$CWD/ivi-0.4-pre-20031121-gcc3.4.patch" || exit $ERROR_PATCH CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix=$PREFIX --libdir=$LIBDIR --enable-release || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" --enable-release || exit $ERROR_CONF make || exit $ERROR_MAKE make install prefix=$PKG/$PREFIX || exit $ERROR_INSTALL # Fix permissions -find $PKG -type f -exec chmod a-x {} \; -chmod a+x $PKG/$PREFIX/bin/ivi -find $PKG/$PREFIX/modules -name "*.vpi" -exec chmod a+x {} \; +find "$PKG" -type f -exec chmod a-x {} \; +chmod a+x "$PKG/$PREFIX/bin/ivi" +find "$PKG/$PREFIX/modules" -name "*.vpi" -exec chmod a+x {} \; # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info - rm -f dir - gzip -9 * - ) -fi - # Install documentation and examples DOCS="LIMITATIONS README *.txt" -mkdir -p $PKG/$PREFIX/doc/$PKG_NAME-$VERSION || exit $ERROR_MKDIR -cp -a $DOCS $PKG/$PREFIX/doc/$PKG_NAME-$VERSION -mv $PKG/$PREFIX/{examples,doc/getting_started,doc/ivi_commands} \ - $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" +mv "$PKG/$PREFIX/{examples,doc/getting_started,doc/ivi_commands}" \ + "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" # Add package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -146,10 +124,10 @@ ivi: EODESC # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi diff --git a/sys/apps/microcode_ctl/microcode_ctl.SlackBuild b/sys/apps/microcode_ctl/microcode_ctl.SlackBuild index 367d6b73..09493c1e 100755 --- a/sys/apps/microcode_ctl/microcode_ctl.SlackBuild +++ b/sys/apps/microcode_ctl/microcode_ctl.SlackBuild @@ -26,10 +26,10 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} -PKG_SRC=$SRC_NAME-$VERSION +PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION" # Set system libraries' path and optmization flags based on $ARCH -LIBDIR=$PREFIX/lib +LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" @@ -51,16 +51,16 @@ ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 # Clean up any leftovers of previous builds -rm -rf $PKG_SRC 2> /dev/null -rm -rf $PKG 2> /dev/null +rm -rf "$PKG_SRC" 2> /dev/null +rm -rf "$PKG" 2> /dev/null # Create directories, if necessary -mkdir -p $SRC_DIR || exit $ERROR_MKDIR -mkdir -p $PKG || exit $ERROR_MKDIR -mkdir -p $REPOS || exit $ERROR_MKDIR +mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR +mkdir -p "$PKG" || exit $ERROR_MKDIR +mkdir -p "$REPOS" || exit $ERROR_MKDIR # Dowload source, if necessary -SRC="$PKG_SRC.tar.gz" +SRC="$SRC_NAME-$VERSION.tar.gz" URL="http://urbanmyth.org/microcode/$SRC" if [ ! -f "$SRC_DIR/$SRC" ]; then @@ -68,25 +68,25 @@ if [ ! -f "$SRC_DIR/$SRC" ]; then fi # Untar, compile and install -tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR -cd $SRC_DIR/$PKG_SRC +tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" -C "$SRC_DIR" || exit $ERROR_TAR +cd "$PKG_SRC" make all || exit $ERROR_MAKE if [ ! -c /dev/cpu/microcode ]; then make device || exit $ERROR_MAKE fi -make install DESTDIR=$PKG || exit $ERROR_INSTALL +make install DESTDIR="$PKG" || exit $ERROR_INSTALL # Strip binaries -( cd $PKG +( cd "$PKG" find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages, if any -if [ -d $PKG/$PREFIX/man ]; then - ( cd $PKG/$PREFIX/man +# Compress and link manpages +if [ -d "$PKG/$PREFIX/man" ]; then + ( cd "$PKG/$PREFIX/man" for manpagedir in $(find . -type d -name "man*") ; do ( cd $manpagedir for eachpage in $( find . -type l -maxdepth 1) ; do @@ -99,33 +99,25 @@ if [ -d $PKG/$PREFIX/man ]; then ) fi -# Compress info files, if any -if [ -d $PKG/$PREFIX/info ]; then - ( cd $PKG/$PREFIX/info - rm -f dir - gzip -9 * - ) -fi - # Install documentation DOCS="Changelog README intel-*.txt" -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-$VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$VERSION" # Move the initialization script to /etc/rc.d/, renaming it to rc.* -( cd $PKG/etc/rc.d +( cd "$PKG/etc/rc.d" mv -f init.d/microcode_ctl rc.microcode_ctl.new rmdir init.d/ ) # Patch the initialization script to be less verbose -( cd $PKG - patch -Np1 < $CWD/microcode_ctl-less_verbose.patch || exit $ERROR_PATCH +( cd "$PKG" + patch -Np1 < "$CWD/microcode_ctl-less_verbose.patch" || exit $ERROR_PATCH ) # Add package description (slack-desc) -mkdir -p $PKG/install || exit $ERROR_MKDIR -cat << EODESC > $PKG/install/slack-desc +mkdir -p "$PKG/install" || exit $ERROR_MKDIR +cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' @@ -148,7 +140,7 @@ microcode_ctl: For more information, http://urbanmyth.org/microcode/ EODESC # Add a post-installation script (doinst.sh) -cat << EOSCRIPT > $PKG/install/doinst.sh +cat << EOSCRIPT > "$PKG/install/doinst.sh" config() { NEW="\$1" OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)" @@ -166,10 +158,10 @@ config etc/rc.d/rc.microcode_ctl.new EOSCRIPT # Build the package -cd $PKG -makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG +cd "$PKG" +makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories, if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf $SRC_DIR/$PKG_SRC $PKG + rm -rf "$PKG_SRC" "$PKG" fi |