From 79245abc0c95ce44786f9ca6f954858d9f6501c8 Mon Sep 17 00:00:00 2001 From: rudson Date: Fri, 14 Dec 2007 14:28:45 +0000 Subject: git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1533 370017ae-e619-0410-ac65-c121f96126d4 --- media/video/dvdauthor/dvdauthor.SlackBuild | 13 ++++++++----- media/video/vamps/vamps.SlackBuild | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'media/video') diff --git a/media/video/dvdauthor/dvdauthor.SlackBuild b/media/video/dvdauthor/dvdauthor.SlackBuild index 084b2779..c45d9246 100755 --- a/media/video/dvdauthor/dvdauthor.SlackBuild +++ b/media/video/dvdauthor/dvdauthor.SlackBuild @@ -15,7 +15,7 @@ # Place - Suite 330, Boston, MA 02111-1307, USA # # slackbuild for dvdauthor, by Rudson R. Alves -# requires: libdvdread +# requires: libdvdread # tested: dvdauthor-0.6.14 # @@ -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,7 +83,6 @@ 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 @@ -113,7 +112,11 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL # Install documentation DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog COPYING" 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 @@ -144,5 +147,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/media/video/vamps/vamps.SlackBuild b/media/video/vamps/vamps.SlackBuild index 169640ba..96fa48f0 100755 --- a/media/video/vamps/vamps.SlackBuild +++ b/media/video/vamps/vamps.SlackBuild @@ -15,7 +15,7 @@ # Place - Suite 330, Boston, MA 02111-1307, USA # # slackbuild for vamps, by Rudson R. Alves -# requires: dvdauthor libdvdread +# requires: dvdauthor libdvdread # tested: vamps-0.99.2 # @@ -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,7 +83,6 @@ 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 @@ -108,7 +107,11 @@ PREFIX=$PKG/$PREFIX make install || exit $ERROR_INSTALL # Install documentation DOCS="COPYING INSTALL" 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 @@ -140,5 +143,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 -- cgit v1.2.3