Update for v1.1.7

Also added TAG=alien, new SRCDIR line, added SlackBuild to the docdir

1 files changed, 30 insertions, 35 deletions

diff --git a/xvidcap/build/xvidcap.SlackBuild b/xvidcap/build/xvidcap.SlackBuild
index 8c2c6bf8..fc420c18 100755
--- a/xvidcap/build/xvidcap.SlackBuild
+++ b/xvidcap/build/xvidcap.SlackBuild
@@ -37,6 +37,8 @@
 #            * Fixed the icon display in the .desktop file.
 # 1.1.6-3:   18/aug/2007 by Eric Hameleers <alien@slackware.com>
 #            * Removed double documentation from the package.
+# 1.1.7-1:   14/aug/2008 by Eric Hameleers <alien@slackware.com>
+#            * Update.
 # 
 # Run 'sh xvidcap.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -47,16 +49,15 @@
 # Set initial variables:
 
 PRGNAM=xvidcap
-VERSION=${VERSION:-1.1.6}
+VERSION=${VERSION:-1.1.7}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-alien}
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO.tasks"
 
 # Where do we look for sources?
-CWD=`pwd`
-SRCDIR=`dirname $0`
-[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+SRCDIR=$(cd $(dirname $0); pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
@@ -64,7 +65,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -78,16 +79,13 @@ set -u
 P1=${1:-1}
 
 # Slackware 11 and up need other option (gcc > 3.3.x)
-if [ `gcc -dumpversion | tr -d  '.' |cut -c 1-2` -gt 33 ]; then
+if [ $(gcc -dumpversion | tr -d  '.' |cut -c 1-2) -gt 33 ]; then
   MOPT=tune
 else
   MOPT=cpu
 fi
 
 case "$ARCH" in
-  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
   i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
@@ -107,26 +105,26 @@ esac
 
 # Create working directories:
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build
-mkdir -p $PKG     # place for the package to be built
-rm -rf $PKG/*     # We always erase old package's contents:
-mkdir -p $OUTPUT  # place for the package to be saved
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+mkdir -p $PKG             # place for the package to be built
+rm -rf $PKG/*             # erase old package's contents
+mkdir -p $OUTPUT          # place for the package to be saved
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
   if ! [ "x${SRCURL}" == "x" ]; then
     # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename $SOURCE`"
-    echo "Source '`basename ${SOURCE}`' not available yet..."
-    echo "Will download file to `dirname $SOURCE`"
-    wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true
+    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+    echo "Source '$(basename ${SOURCE})' not available yet..."
+    echo "Will download file to $(dirname $SOURCE)"
+    wget -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
-      echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
+      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
       exit 1
     fi
   else
-    echo "File '`basename ${SOURCE}`' not available... aborting the build."
+    echo "File '$(basename ${SOURCE})' not available... aborting the build."
     exit 1
   fi
 fi
@@ -145,9 +143,9 @@ echo "++"
 cd $TMP/tmp-$PRGNAM
 
 echo "Extracting the source archive(s) for $PRGNAM..."
-if `file ${SOURCE} | grep -q ": bzip2"`; then
+if $(file ${SOURCE} | grep -q ": bzip2"); then
   tar -xjvf ${SOURCE}
-elif `file ${SOURCE} | grep -q ": gzip"`; then
+elif $(file ${SOURCE} | grep -q ": gzip"); then
   tar -xzvf ${SOURCE}
 fi
 cd ${PRGNAM}-${VERSION}
@@ -162,8 +160,7 @@ CXXFLAGS="$SLKCFLAGS" \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
-            --datarootdir=/usr \
-            --datadir=/usr/share \
+            --mandir=/usr/doc \
             --docdir=/usr/doc/${PRGNAM}-${VERSION} \
 	    --enable-libmp3lame \
 	    --enable-libtheora \
@@ -176,7 +173,7 @@ make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 # Install all the needed stuff to the package dir
 # Use installwatch if available, to produce a logfile of the installation
 # process that is more easily readable:
-if `which installwatch  > /dev/null 2>&1`; then
+if $(which installwatch > /dev/null 2>&1); then
   installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
 else
   make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
@@ -187,24 +184,22 @@ mkdir -p $PKG/install
 cat <<EOINS > $PKG/install/doinst.sh
 # Update the scrollkeeper database if possible:
 if [ -x usr/bin/scrollkeeper-update ]; then
-  usr/bin/scrollkeeper-update -p var/lib/scrollkeeper 1> /dev/null 2> /dev/null
+  chroot . /usr/bin/scrollkeeper-update -p var/lib/scrollkeeper 1> /dev/null 2> /dev/null
 fi
 EOINS
 
-# Fix the .desktop file:
-sed -i -e "s#^Icon=${PRGNAM}.png#Icon=/usr/share/pixmaps/${PRGNAM}.png#" \
-  $PKG/usr/share/applications/${PRGNAM}.desktop
-
 # Add documentation:
 rm -rf $PKG/usr/share/doc
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
-  for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 fi
 
 # Strip binaries:
@@ -219,11 +214,11 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then