Syncing with generic.SlackBuild v0.7.4

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

3 files changed, 74 insertions, 43 deletions

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