aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapp/crypt/gnupg2/gnupg2.SlackBuild2
-rwxr-xr-xdev/libs/libgcrypt/libgcrypt.SlackBuild2
-rwxr-xr-xdev/libs/libgpg-error/libgpg-error.SlackBuild49
-rwxr-xr-xdev/libs/libksba/libksba.SlackBuild49
-rwxr-xr-xdev/libs/libpth/libpth.SlackBuild49
-rwxr-xr-xnet/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild30
-rwxr-xr-xsci/electronics/gtkwave/gtkwave.SlackBuild39
-rwxr-xr-xsci/electronics/iverilog/iverilog.SlackBuild36
-rwxr-xr-xsci/electronics/ivi/ivi.SlackBuild42
-rwxr-xr-xsys/apps/microcode_ctl/microcode_ctl.SlackBuild32
10 files changed, 194 insertions, 136 deletions
diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild
index abd71176..889b36c4 100755
--- a/app/crypt/gnupg2/gnupg2.SlackBuild
+++ b/app/crypt/gnupg2/gnupg2.SlackBuild
@@ -18,7 +18,7 @@ CWD="$(pwd)"
SRC_NAME="gnupg"
PKG_NAME="gnupg2"
ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.0.2}
+SRC_VERSION=${VERSION:=2.0.3}
PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
diff --git a/dev/libs/libgcrypt/libgcrypt.SlackBuild b/dev/libs/libgcrypt/libgcrypt.SlackBuild
index c530b3c4..4290ba10 100755
--- a/dev/libs/libgcrypt/libgcrypt.SlackBuild
+++ b/dev/libs/libgcrypt/libgcrypt.SlackBuild
@@ -92,7 +92,7 @@ fi
gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
# Untar
-cd "$SRC_DIR"
+cd "$TMP"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
cd "$PKG_SRC"
diff --git a/dev/libs/libgpg-error/libgpg-error.SlackBuild b/dev/libs/libgpg-error/libgpg-error.SlackBuild
index 076cd412..be3101aa 100755
--- a/dev/libs/libgpg-error/libgpg-error.SlackBuild
+++ b/dev/libs/libgpg-error/libgpg-error.SlackBuild
@@ -6,8 +6,6 @@
# Author: Luis ( luis at riseup d0t net )
#
-CWD=`pwd`
-
# Look for slackbuildrc
if [ -f ~/.slackbuildrc ]; then
source ~/.slackbuildrc
@@ -16,17 +14,19 @@ elif [ -f /etc/slackbuildrc ]; then
fi
# Set variables
+CWD="$(pwd)"
SRC_NAME="libgpg-error"
PKG_NAME="libgpg-error"
ARCH=${ARCH:=i486}
-VERSION=${VERSION:=1.4}
+SRC_VERSION=${VERSION:=1.4}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
-SRC_DIR=${SRC_DIR:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
PREFIX=${PREFIX:=/usr}
-PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION"
+PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
# Set system libraries' path and optmization flags based on $ARCH
LIBDIR="$PREFIX/lib"
@@ -54,12 +54,20 @@ ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
rm -rf "$PKG_SRC" 2> /dev/null
rm -rf "$PKG" 2> /dev/null
-# Create directories, if necessary
+# Create directories if necessary
mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
mkdir -p "$PKG" || exit $ERROR_MKDIR
mkdir -p "$REPOS" || exit $ERROR_MKDIR
-# Import (minimized) signing key from
+# Dowload source if necessary
+SRC="$SRC_NAME-$SRC_VERSION.tar.bz2"
+URL="http://ftp.gnupg.org/GnuPG/libgpg-error/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! bzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
+ wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+fi
+
+# Import minimized signing key from
# http://www.gnupg.org/(en)/signature_key.html
gpg --import << EOKEY || exit $ERROR_GPG
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -76,29 +84,28 @@ z05PRKjChvxrWzhe/Yn6BAmPF+6YxQo2W98rzq0THS5wKJjXmHw=
-----END PGP PUBLIC KEY BLOCK-----
EOKEY
-# Dowload source and its signature, if necessary
-SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="http://ftp.gnupg.org/GnuPG/libgpg-error/$SRC"
-
-if [ ! -s "$SRC_DIR/$SRC" ] || ! bzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
- wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
-fi
+# Dowload source's signature if necessary and check it
if [ ! -s "$SRC_DIR/$SRC.sig" ]; then
wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" || exit $ERROR_WGET
fi
-# Check source's signature
gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
-# Untar, configure, compile and install
-cd "$SRC_DIR"
+# Untar
+cd "$TMP"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
cd "$PKG_SRC"
+
+# Configure
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix="$PREFIX" --libdir="$LIBDIR" || exit $ERROR_CONF
+
+# Compile
make || exit $ERROR_MAKE
+
+# Install
make install DESTDIR="$PKG" || exit $ERROR_INSTALL
# Strip binaries
@@ -111,8 +118,8 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL
# 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-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
# Add package description (slack-desc)
mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -140,9 +147,9 @@ EODESC
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
-# Delete source and build directories, if requested
+# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
rm -rf "$PKG_SRC" "$PKG"
fi
diff --git a/dev/libs/libksba/libksba.SlackBuild b/dev/libs/libksba/libksba.SlackBuild
index f2fe20fc..595c272c 100755
--- a/dev/libs/libksba/libksba.SlackBuild
+++ b/dev/libs/libksba/libksba.SlackBuild
@@ -6,8 +6,6 @@
# Author: Luis ( luis at riseup d0t net )
#
-CWD=`pwd`
-
# Look for slackbuildrc
if [ -f ~/.slackbuildrc ]; then
source ~/.slackbuildrc
@@ -16,17 +14,19 @@ elif [ -f /etc/slackbuildrc ]; then
fi
# Set variables
+CWD="$(pwd)"
SRC_NAME="libksba"
PKG_NAME="libksba"
ARCH=${ARCH:=i486}
-VERSION=${VERSION:=1.0.1}
+SRC_VERSION=${VERSION:=1.0.1}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
-SRC_DIR=${SRC_DIR:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
PREFIX=${PREFIX:=/usr}
-PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION"
+PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
# Set system libraries' path and optmization flags based on $ARCH
LIBDIR="$PREFIX/lib"
@@ -54,12 +54,20 @@ ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
rm -rf "$PKG_SRC" 2> /dev/null
rm -rf "$PKG" 2> /dev/null
-# Create directories, if necessary
+# Create directories if necessary
mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
mkdir -p "$PKG" || exit $ERROR_MKDIR
mkdir -p "$REPOS" || exit $ERROR_MKDIR
-# Import (minimized) signing key from
+# Dowload source if necessary
+SRC="$SRC_NAME-$SRC_VERSION.tar.bz2"
+URL="ftp://ftp.gnupg.org/gcrypt/libksba/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! bzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
+ wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+fi
+
+# Import minimized signing key from
# http://www.gnupg.org/(en)/signature_key.html
gpg --import << EOKEY || exit $ERROR_GPG
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -76,30 +84,29 @@ z05PRKjChvxrWzhe/Yn6BAmPF+6YxQo2W98rzq0THS5wKJjXmHw=
-----END PGP PUBLIC KEY BLOCK-----
EOKEY
-# Dowload source and its signature, if necessary
-SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="ftp://ftp.gnupg.org/gcrypt/libksba/$SRC"
-
-if [ ! -s "$SRC_DIR/$SRC" ] || ! bzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
- wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
-fi
+# Dowload source's signature if necessary and check it
if [ ! -s "$SRC_DIR/$SRC.sig" ]; then
wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" || exit $ERROR_WGET
fi
-# Check source's signature
gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
-# Untar, configure, compile and install
-cd "$SRC_DIR"
+# Untar
+cd "$TMP"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
cd "$PKG_SRC"
+
+# Configure
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix="$PREFIX" --libdir="$LIBDIR" \
--infodir="$PREFIX/info" || exit $ERROR_CONF
+
+# Compile
make || exit $ERROR_MAKE
+
+# Install
make install DESTDIR="$PKG" || exit $ERROR_INSTALL
# Strip binaries
@@ -120,8 +127,8 @@ 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-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
# Add package description (slack-desc)
mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -149,9 +156,9 @@ EODESC
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
-# Delete source and build directories, if requested
+# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
rm -rf "$PKG_SRC" "$PKG"
fi
diff --git a/dev/libs/libpth/libpth.SlackBuild b/dev/libs/libpth/libpth.SlackBuild
index 4250e90e..9edaeac8 100755
--- a/dev/libs/libpth/libpth.SlackBuild
+++ b/dev/libs/libpth/libpth.SlackBuild
@@ -6,8 +6,6 @@
# Author: Luis ( luis at riseup d0t net )
#
-CWD=`pwd`
-
# Look for slackbuildrc
if [ -f ~/.slackbuildrc ]; then
source ~/.slackbuildrc
@@ -16,17 +14,19 @@ elif [ -f /etc/slackbuildrc ]; then
fi
# Set variables
+CWD="$(pwd)"
SRC_NAME="pth"
PKG_NAME="libpth"
ARCH=${ARCH:=i486}
-VERSION=${VERSION:=2.0.7}
+SRC_VERSION=${VERSION:=2.0.7}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
-SRC_DIR=${SRC_DIR:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
PREFIX=${PREFIX:=/usr}
-PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION"
+PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
# Set system libraries' path and optmization flags based on $ARCH
LIBDIR="$PREFIX/lib"
@@ -54,12 +54,20 @@ ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
rm -rf "$PKG_SRC" 2> /dev/null
rm -rf "$PKG" 2> /dev/null
-# Create directories, if necessary
+# Create directories if necessary
mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
mkdir -p "$PKG" || exit $ERROR_MKDIR
mkdir -p "$REPOS" || exit $ERROR_MKDIR
-# Import (minimized) signing key from
+# Dowload source if necessary
+SRC="$SRC_NAME-$SRC_VERSION.tar.gz"
+URL="ftp://ftp.gnu.org/gnu/pth/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! gzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
+ wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+fi
+
+# Import minimized signing key from
# ftp://ftp.gnu.org/gnu/gnu-keyring.gpg
gpg --import << EOKEY || exit $ERROR_GPG
-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -93,31 +101,30 @@ ZKGPGjkCEUGma0qd+GUAh4A=
-----END PGP PUBLIC KEY BLOCK-----
EOKEY
-# Dowload source and its signature, if necessary
-SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="ftp://ftp.gnu.org/gnu/pth/$SRC"
-
-if [ ! -s "$SRC_DIR/$SRC" ] || ! gzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
- wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
-fi
+# Dowload source's signature if necessary and check it
if [ ! -s "$SRC_DIR/$SRC.sig" ]; then
wget "$URL.sig" -O "$SRC_DIR/$SRC.sig" || exit $ERROR_WGET
fi
-# Check source's signature
gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
-# Untar, configure, compile and install
-cd "$SRC_DIR"
+# Untar
+cd "$TMP"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
cd "$PKG_SRC"
+
+# Configure
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix="$PREFIX" --libdir="$LIBDIR" \
--mandir="$PREFIX/man" || exit $ERROR_CONF
+
+# Compile
make || exit $ERROR_MAKE
make test
+
+# Install
make install DESTDIR="$PKG" || exit $ERROR_INSTALL
# Strip binaries
@@ -146,8 +153,8 @@ 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-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
# Add package description (slack-desc)
mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -175,9 +182,9 @@ EODESC
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
-# Delete source and build directories, if requested
+# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
rm -rf "$PKG_SRC" "$PKG"
fi
diff --git a/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild b/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
index 5530d479..f1145332 100755
--- a/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
+++ b/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
@@ -6,8 +6,6 @@
# Author: Luis ( luis at riseup d0t net )
#
-CWD=`pwd`
-
# Look for slackbuildrc
if [ -f ~/.slackbuildrc ]; then
source ~/.slackbuildrc
@@ -16,17 +14,19 @@ elif [ -f /etc/slackbuildrc ]; then
fi
# Set variables
+CWD="$(pwd)"
SRC_NAME="arno-iptables-firewall"
PKG_NAME="arno-iptables-firewall"
ARCH="noarch"
-VERSION=${VERSION:=1.8.8g}
+SRC_VERSION=${VERSION:=1.8.8h}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
-SRC_DIR=${SRC_DIR:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
PREFIX=${PREFIX:=/usr}
-PKG_SRC="$SRC_DIR/${SRC_NAME}_$VERSION"
+PKG_SRC="$TMP/${SRC_NAME}_$SRC_VERSION"
# Set error codes (used by createpkg)
ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
@@ -38,23 +38,25 @@ ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
rm -rf "$PKG_SRC" 2> /dev/null
rm -rf "$PKG" 2> /dev/null
-# Create directories, if necessary
+# Create directories if necessary
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}_$VERSION.tar.gz"
+# Dowload source if necessary
+SRC="${SRC_NAME}_$SRC_VERSION.tar.gz"
URL="http://rocky.eld.leidenuniv.nl/iptables-firewall/$SRC"
if [ ! -s "$SRC_DIR/$SRC" ] || ! gzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
-# Untar and install
-cd "$SRC_DIR"
+# Untar
+cd "$TMP"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
cd "$PKG_SRC"
+
+# Install
mkdir -p "$PKG/etc/rc.d" || exit $ERROR_MKDIR
mkdir -p "$PKG/etc/logrotate.d" || exit $ERROR_MKDIR
mkdir -p "$PKG/$PREFIX/bin" || exit $ERROR_MKDIR
@@ -89,8 +91,8 @@ fi
# Install documentation
DOCS="CHANGELOG README gpl_license.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-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
# Add package description (slack-desc)
mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -152,9 +154,9 @@ EOSCRIPT
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
-# Delete source and build directories, if requested
+# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
rm -rf "$PKG_SRC" "$PKG"
fi
diff --git a/sci/electronics/gtkwave/gtkwave.SlackBuild b/sci/electronics/gtkwave/gtkwave.SlackBuild
index 383ab23e..782190d7 100755
--- a/sci/electronics/gtkwave/gtkwave.SlackBuild
+++ b/sci/electronics/gtkwave/gtkwave.SlackBuild
@@ -6,8 +6,6 @@
# Author: Luis ( luis at riseup d0t net )
#
-CWD=`pwd`
-
# Look for slackbuildrc
if [ -f ~/.slackbuildrc ]; then
source ~/.slackbuildrc
@@ -16,6 +14,7 @@ elif [ -f /etc/slackbuildrc ]; then
fi
# Set variables
+CWD="$(pwd)"
SRC_NAME="gtkwave"
PKG_NAME="gtkwave"
ARCH="i486"
@@ -23,11 +22,12 @@ VERSION= # Only the -current version is available for download.
#+The version being built can only be defined after
#+decompressing the downloaded source.
BUILD=${BUILD:=1ls}
-SRC_DIR=${SRC_DIR:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
PREFIX=${PREFIX:=/usr}
+PKG_SRC="$TMP/$SRC_NAME"-3.*
# Set error codes (used by createpkg)
ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
@@ -36,15 +36,15 @@ 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 "$SRC_DIR/$SRC_NAME"-3.* 2> /dev/null
+rm -rf "$PKG_SRC" 2> /dev/null
rm -rf "$PKG" 2> /dev/null
-# Create directories, if necessary
+# Create directories if necessary
mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
mkdir -p "$PKG" || exit $ERROR_MKDIR
mkdir -p "$REPOS" || exit $ERROR_MKDIR
-# Dowload source, if necessary
+# Dowload source if necessary
SRC="$SRC_NAME-current.tar.gz"
URL="http://home.nc.rr.com/gtkwave/$SRC"
@@ -67,13 +67,22 @@ else
fi
fi
-# Untar, define $VERSION, configure, compile and install
-cd "$SRC_DIR"
+# Untar
+cd "$TMP"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-VERSION="$(ls -d "$SRC_DIR/$SRC_NAME"-3.* | cut -d "-" -f 2)"
-cd "$SRC_NAME-$VERSION"
+cd "$PKG_SRC"
+
+# Define $SRC_ and $PKG_VERSION
+SRC_VERSION="$(ls -d "$SRC_DIR/$SRC_NAME"-3.* | cut -d "-" -f 2)"
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
+
+# Configure
echo $GTK_VERSION | ./configure || exit $ERROR_CONF
+
+# Compile
make || exit $ERROR_MAKE
+
+# Install
make install prefix="$PKG/$PREFIX" || exit $ERROR_INSTALL
# Strip binaries
@@ -101,8 +110,8 @@ 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-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
# Add package description (slack-desc)
mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -130,9 +139,9 @@ EODESC
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
-# Delete source and build directories, if requested
+# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
- rm -rf "$SRC_DIR/$SRC_NAME-$VERSION" "$PKG"
+ rm -rf "$PKG_SRC" "$PKG"
fi
diff --git a/sci/electronics/iverilog/iverilog.SlackBuild b/sci/electronics/iverilog/iverilog.SlackBuild
index 95c8e1e8..b2420833 100755
--- a/sci/electronics/iverilog/iverilog.SlackBuild
+++ b/sci/electronics/iverilog/iverilog.SlackBuild
@@ -6,8 +6,6 @@
# Author: Luis ( luis at riseup d0t net )
#
-CWD=`pwd`
-
# Look for slackbuildrc
if [ -f ~/.slackbuildrc ]; then
source ~/.slackbuildrc
@@ -16,17 +14,19 @@ elif [ -f /etc/slackbuildrc ]; then
fi
# Set variables
+CWD="$(pwd)"
SRC_NAME="verilog"
PKG_NAME="iverilog"
ARCH=${ARCH:=i486}
-VERSION=${VERSION:=0.8.3}
+SRC_VERSION=${VERSION:=0.8.3}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
-SRC_DIR=${SRC_DIR:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
PREFIX=${PREFIX:=/usr}
-PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION"
+PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
# Set system libraries' path and optmization flags based on $ARCH
LIBDIR="$PREFIX/lib"
@@ -54,27 +54,33 @@ ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
rm -rf "$PKG_SRC" 2> /dev/null
rm -rf "$PKG" 2> /dev/null
-# Create directories, if necessary
+# Create directories if necessary
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-$VERSION.tar.gz"
+# Dowload source if necessary
+SRC="$SRC_NAME-$SRC_VERSION.tar.gz"
URL="ftp://ftp.icarus.com/pub/eda/verilog/v0.8/$SRC"
if [ ! -s "$SRC_DIR/$SRC" ] || ! gzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
-# Untar, configure, compile and install
-cd "$SRC_DIR"
+# Untar
+cd "$TMP"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
cd "$PKG_SRC"
+
+# Configure
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure || exit $ERROR_CONF
+
+# Compile
make || exit $ERROR_MAKE
+
+# Install
make install prefix="$PKG/$PREFIX" || exit $ERROR_INSTALL
# Strip binaries
@@ -101,9 +107,9 @@ if [ -d "$PKG/$PREFIX/man" ]; then
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-$PKG_VERSION/vvp" || exit $ERROR_MKDIR
+cp -a COPYING INSTALL *.txt examples "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
+cp -a vvp/*.txt vvp/examples "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION/vvp"
# Add package description (slack-desc)
mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -131,9 +137,9 @@ EODESC
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
-# Delete source and build directories, if requested
+# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
rm -rf "$PKG_SRC" "$PKG"
fi
diff --git a/sci/electronics/ivi/ivi.SlackBuild b/sci/electronics/ivi/ivi.SlackBuild
index 31fef372..075b409f 100755
--- a/sci/electronics/ivi/ivi.SlackBuild
+++ b/sci/electronics/ivi/ivi.SlackBuild
@@ -6,8 +6,6 @@
# Author: Luis ( luis at riseup d0t net )
#
-CWD=`pwd`
-
# Look for slackbuildrc
if [ -f ~/.slackbuildrc ]; then
source ~/.slackbuildrc
@@ -16,18 +14,19 @@ elif [ -f /etc/slackbuildrc ]; then
fi
# Set variables
+CWD="$(pwd)"
SRC_NAME="ivi"
PKG_NAME="ivi"
ARCH="i486"
SRC_VERSION="0.4-pre-20031121"
-PKG_VERSION="0.4_20031121"
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
-SRC_DIR=${SRC_DIR:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
PREFIX=${PREFIX:=/usr}
-PKG_SRC="$SRC_DIR/$SRC_NAME-$SRC_VERSION"
+PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
# Set error codes (used by createpkg)
ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
@@ -39,12 +38,12 @@ ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
rm -rf "$PKG_SRC" 2> /dev/null
rm -rf "$PKG" 2> /dev/null
-# Create directories, if necessary
+# Create directories if necessary
mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
mkdir -p "$PKG" || exit $ERROR_MKDIR
mkdir -p "$REPOS" || exit $ERROR_MKDIR
-# Dowload source, if necessary
+# Dowload source if necessary
SRC="$SRC_NAME-0.4-pre-20031121.tar.gz"
URL="http://downloads.sourceforge.net/ivi/$SRC"
@@ -52,13 +51,30 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
-# Untar, patch, configure, compile and install
-cd "$SRC_DIR"
+# Untar
+cd "$TMP"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
cd "$PKG_SRC"
-patch -Np1 < "$CWD/ivi-0.4-pre-20031121-gcc3.4.patch" || exit $ERROR_PATCH
+
+# Patch source
+patches="ivi-0.4-pre-20031121-gcc3.4.patch
+ $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
+ $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
+for patch in $patches; do
+ if [ -f "$CWD/$patch" ]; then
+ patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
+ elif [ -f "$CWD/patches/$patch" ]; then
+ patch -Np1 < "$CWD/patches/$patch" || exit $ERROR_PATCH
+ fi
+done
+
+# Configure
./configure --enable-release || exit $ERROR_CONF
+
+# Compile
make || exit $ERROR_MAKE
+
+# Install
make install prefix="$PKG/$PREFIX/share/ivi" || exit $ERROR_INSTALL
# Don't overwrite files under $PKG/$PREFIX/share/ivi/etc
@@ -90,11 +106,11 @@ find "$PKG/$PREFIX/share/ivi/modules" -name "*.vpi" -exec chmod 755 {} \;
# Install documentation and examples
DOCS="LIMITATIONS README *.txt"
-mv -f "$PKG/$PREFIX/share/ivi/doc" "$PKG/$PREFIX/doc"
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/doc/"{getting_started,ivi_commands} \
+mv "$PKG/$PREFIX/share/ivi/doc/"{getting_started,ivi_commands} \
"$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
+rmdir "$PKG/$PREFIX/share/ivi/doc"
# Add package description (slack-desc)
mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -144,7 +160,7 @@ EOSCRIPT
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
+# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
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 59ab8e5a..dac34a07 100755
--- a/sys/apps/microcode_ctl/microcode_ctl.SlackBuild
+++ b/sys/apps/microcode_ctl/microcode_ctl.SlackBuild
@@ -6,8 +6,6 @@
# Author: Luis ( luis at riseup d0t net )
#
-CWD=`pwd`
-
# Look for slackbuildrc
if [ -f ~/.slackbuildrc ]; then
source ~/.slackbuildrc
@@ -16,17 +14,19 @@ elif [ -f /etc/slackbuildrc ]; then
fi
# Set variables
+CWD="$(pwd)"
SRC_NAME="microcode_ctl"
PKG_NAME="microcode_ctl"
ARCH="i486"
-VERSION=${VERSION:=1.16}
+SRC_VERSION=${VERSION:=1.16}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
-SRC_DIR=${SRC_DIR:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
PREFIX=${PREFIX:=/usr}
-PKG_SRC="$SRC_DIR/$SRC_NAME-$VERSION"
+PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
# Set error codes (used by createpkg)
ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
@@ -38,27 +38,31 @@ ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42
rm -rf "$PKG_SRC" 2> /dev/null
rm -rf "$PKG" 2> /dev/null
-# Create directories, if necessary
+# Create directories if necessary
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-$VERSION.tar.gz"
+# Dowload source if necessary
+SRC="$SRC_NAME-$SRC_VERSION.tar.gz"
URL="http://urbanmyth.org/microcode/$SRC"
if [ ! -s "$SRC_DIR/$SRC" ] || ! gzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
-# Untar, compile and install
-cd "$SRC_DIR"
+# Untar
+cd "$TMP"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
cd "$PKG_SRC"
+
+# Compile
make all || exit $ERROR_MAKE
if [ ! -c /dev/cpu/microcode ]; then
make device || exit $ERROR_MAKE
fi
+
+# Install
make install DESTDIR="$PKG" || exit $ERROR_INSTALL
# Strip binaries
@@ -86,8 +90,8 @@ 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-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
# Move the initialization script to /etc/rc.d/, renaming it to rc.*
( cd "$PKG/etc/rc.d"
@@ -144,9 +148,9 @@ EOSCRIPT
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
-# Delete source and build directories, if requested
+# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
rm -rf "$PKG_SRC" "$PKG"
fi