diff options
Diffstat (limited to 'net')
| -rwxr-xr-x | net/dns/avahi/avahi.SlackBuild | 17 | ||||
| -rwxr-xr-x | net/im/skype/skype.SlackBuild | 21 |
2 files changed, 22 insertions, 16 deletions
diff --git a/net/dns/avahi/avahi.SlackBuild b/net/dns/avahi/avahi.SlackBuild index 5fc5fe4c..c6d49fdd 100755 --- a/net/dns/avahi/avahi.SlackBuild +++ b/net/dns/avahi/avahi.SlackBuild @@ -15,7 +15,7 @@ # Place - Suite 330, Boston, MA 02111-1307, USA # # slackbuild for avahi, by Rudson R. Alves -# requires: glib2 expat libdaemon mono monodoc xmltoman +# requires: glib2 expat libdaemon mono monodoc xmltoman # tested: avahi-0.6.21 # @@ -40,7 +40,7 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_WORK="$TMP/$SRC_NAME" -CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --localstatedir=/var --program-prefix= --program-suffix= --disable-qt4 --with-avahi-priv-access-group=root --disable-static"} +CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --localstatedir=/var --program-prefix= --program-suffix= --disable-qt4 --with-avahi-priv-access-group=root --disable-static"} NUMJOBS=${NUMJOBS:="-j7"} # Set system libraries' path and optmization flags based on $ARCH @@ -66,7 +66,7 @@ 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_WORK" 2> /dev/null rm -rf "$PKG" 2> /dev/null # Create directories if necessary @@ -83,11 +83,10 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET fi - # Untar cd "$PKG_WORK" tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR -PKG_SRC=$SRC_NAME-$SRC_VERSION +PKG_SRC=`ls -l | awk '/^d/ { print $8 }'` cd "$PKG_SRC" # Configure @@ -113,7 +112,11 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL # Install documentation DOCS="LICENSE docs/API-CHANGES-0.6 docs/AUTHORS docs/COMPAT-LAYERS docs/DBUS-API docs/HACKING docs/INSTALL docs/MALLOC docs/NEWS docs/README docs/TODO" mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" +for doc in $DOCS; do + if [ -f "$doc" ]; then + cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" + fi +done # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR @@ -145,5 +148,5 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO # Delete source and build directories if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf "$PKG_SRC" "$PKG" + rm -rf "$PKG_WORK" "$PKG" fi diff --git a/net/im/skype/skype.SlackBuild b/net/im/skype/skype.SlackBuild index b6e95075..941671ad 100755 --- a/net/im/skype/skype.SlackBuild +++ b/net/im/skype/skype.SlackBuild @@ -15,7 +15,7 @@ # Place - Suite 330, Boston, MA 02111-1307, USA # # slackbuild for skype, by Rudson R. Alves -# requires: dbus alsa-lib libsigc++ +# requires: dbus alsa-lib libsigc++ # tested: skype-1.4.0.118 # @@ -39,7 +39,7 @@ TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr/share} -PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +PKG_WORK="$TMP/$SRC_NAME" CONF_OPTIONS=${CONF_OPTIONS:=""} NUMJOBS=${NUMJOBS:="-j7"} @@ -50,13 +50,14 @@ 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_WORK" 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 "$PKG_WORK" || exit $ERROR_MKDIR # Dowload source if necessary SRC="$SRC_NAME-$VERSION.tar.bz2" @@ -66,13 +67,12 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET fi - # Untar -cd "$TMP" +cd "$PKG_WORK" tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR +PKG_SRC=`ls -l | awk '/^d/ { print $8 }'` cd "$PKG_SRC" - # Install Skype mkdir -pv $PKG/$PREFIX/$PKG_NAME-$VERSION mkdir -pv $PKG/usr/bin @@ -101,11 +101,14 @@ cp ../$PKG_NAME-$VERSION/skype.desktop skype.desktop cd $PKG_SRC - # Install documentation DOCS="README LICENSE" mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" +for doc in $DOCS; do + if [ -f "$doc" ]; then + cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" + fi +done # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR @@ -136,5 +139,5 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO # Delete source and build directories if requested if [ "$CLEANUP" == "yes" ]; then - rm -rf "$PKG_SRC" "$PKG" + rm -rf "$PKG_WORK" "$PKG" fi |