Syncing with generic.SlackBuild v0.8.2

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

3 files changed, 20 insertions, 14 deletions

diff --git a/sci/electronics/gtkwave/gtkwave.SlackBuild b/sci/electronics/gtkwave/gtkwave.SlackBuild
index 44ee6013..0bf03e60 100755
--- a/sci/electronics/gtkwave/gtkwave.SlackBuild
+++ b/sci/electronics/gtkwave/gtkwave.SlackBuild
@@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
 PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
+CONF_OPTIONS=${CONF_OPTIONS:=}
+NUMJOBS=${NUMJOBS:=-j4}
 
 # Set error codes (used by createpkg)
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
@@ -72,10 +74,10 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA
 cd "$PKG_SRC"
 
 # Configure
-echo $GTK_VERSION | ./configure || exit $ERROR_CONF
+echo $GTK_VERSION | ./configure "$CONF_OPTIONS" || exit $ERROR_CONF
 
 # Compile
-make || exit $ERROR_MAKE
+make "$NUMJOBS" || exit $ERROR_MAKE
 
 # Install
 make install prefix="$PKG/$PREFIX" || exit $ERROR_INSTALL
@@ -105,8 +107,8 @@ fi
 
 # Install documentation
 DOCS="*.TXT doc/gtkwave.odt examples"
-mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
-cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
 
 # Add package description (slack-desc)
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
diff --git a/sci/electronics/iverilog/iverilog.SlackBuild b/sci/electronics/iverilog/iverilog.SlackBuild
index f502a471..979ce178 100755
--- a/sci/electronics/iverilog/iverilog.SlackBuild
+++ b/sci/electronics/iverilog/iverilog.SlackBuild
@@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
 PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
+CONF_OPTIONS=${CONF_OPTIONS:=}
+NUMJOBS=${NUMJOBS:=-j4}
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR="$PREFIX/lib"
@@ -75,10 +77,10 @@ cd "$PKG_SRC"
 # Configure
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
-  ./configure || exit $ERROR_CONF
+  ./configure "$CONF_OPTIONS" || exit $ERROR_CONF
 
 # Compile
-make || exit $ERROR_MAKE
+make "$NUMJOBS" || exit $ERROR_MAKE
 
 # Install
 make install prefix="$PKG/$PREFIX" || exit $ERROR_INSTALL
@@ -107,9 +109,9 @@ if [ -d "$PKG/$PREFIX/man" ]; then
 fi
 
 # Install documentation
-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"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION/vvp" || exit $ERROR_MKDIR
+cp -a COPYING INSTALL *.txt examples "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+cp -a vvp/*.txt vvp/examples "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION/vvp"
 
 # Add package description (slack-desc)
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
diff --git a/sci/electronics/ivi/ivi.SlackBuild b/sci/electronics/ivi/ivi.SlackBuild
index 8fc95937..75501392 100755
--- a/sci/electronics/ivi/ivi.SlackBuild
+++ b/sci/electronics/ivi/ivi.SlackBuild
@@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
 PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
+CONF_OPTIONS=${CONF_OPTIONS:=--enable-release}
+NUMJOBS=${NUMJOBS:=-j4}
 
 # Set error codes (used by createpkg)
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
@@ -69,10 +71,10 @@ for patch in $patches; do
 done
 
 # Configure
-./configure --enable-release || exit $ERROR_CONF
+./configure "$CONF_OPTIONS" || exit $ERROR_CONF
 
 # Compile
-make || exit $ERROR_MAKE
+make "$NUMJOBS" || exit $ERROR_MAKE
 
 # Install
 make install prefix="$PKG/$PREFIX/share/ivi" || exit $ERROR_INSTALL
@@ -106,10 +108,10 @@ find "$PKG/$PREFIX/share/ivi/modules" -name "*.vpi" -exec chmod 755 {} \;
 
 # Install documentation
 DOCS="LIMITATIONS README *.txt"
-mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
-cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
 mv "$PKG/$PREFIX/share/ivi/doc/"{getting_started,ivi_commands} \
-  "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION"
+  "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
 rmdir "$PKG/$PREFIX/share/ivi/doc"
 
 # Add package description (slack-desc)