UPdate for Slackware 12.1 with added TAG=alien; new SRCDIR; SlackBuild added to the docdir.

1 files changed, 21 insertions, 22 deletions

diff --git a/tightvnc/build/tightvnc.SlackBuild b/tightvnc/build/tightvnc.SlackBuild
index 1dc085c0..20a9f59c 100755
--- a/tightvnc/build/tightvnc.SlackBuild
+++ b/tightvnc/build/tightvnc.SlackBuild
@@ -38,6 +38,8 @@
 #              those that want to start a VNC server on boot.
 # 1.3.9-1:   15/Sep/2007 by Eric Hameleers <alien@slackware.com>
 #            * Update.
+# 1.3.9-2:   09/aug/2008 by Eric Hameleers <alien@slackware.com>
+#            * Package for Slackware 12.1 based on a revamped SlackBuild
 # 
 # Run 'sh tightvnc.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -51,22 +53,20 @@ PRGNAM=tightvnc
 VERSION=${VERSION:-1.3.9}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
+TAG=${TAG:-alien}
 
 DOCS="LICENCE.TXT README WhatsNew ChangeLog"
 
 # 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}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Input URL: http://dl.sourceforge.net/vnc-tight/tightvnc-1.3.9_unixsrc.tar.bz2
-SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
-SRCURL="http://dl.sourceforge.net/vnc-tight/${PRGNAM}-${VERSION}_unixsrc.tar.bz2"
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}_unixsrc.tar.bz2"
+SRCURL="http://downloads.sourceforge.net/vnc-tight/${PRGNAM}-${VERSION}_unixsrc.tar.bz2"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -87,9 +87,6 @@ else
 fi
 
 case "$ARCH" in
-  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
   i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
@@ -109,10 +106,10 @@ 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
@@ -121,7 +118,7 @@ if ! [ -f ${SOURCE} ]; then
     [ -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
+    wget -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
@@ -158,7 +155,7 @@ if $(file ${SOURCE} | grep -q ": bzip2"); then
 elif $(file ${SOURCE} | grep -q ": gzip"); then
   tar -xzvf ${SOURCE}
 fi
-mv vnc_unixsrc ${PRGNAM}-${VERSION}
+mv vnc_unixsrc ${PRGNAM}-${VERSION}_unixsrc
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -178,6 +175,7 @@ LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+echo "" >> $OUTPUT/make-${PRGNAM}.log
 make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$SLKCFLAGS" \
      EXTRA_DEFINES="-DUSE_LIBWRAP=1" \
      2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
@@ -192,7 +190,7 @@ mkdir -p $PKG/usr/share/vnc
 cp -aR classes $PKG/usr/share/vnc
 
 # Add this to the doinst.sh:
-! [ -d $PKG/install ] && mkdir -p $PKG/install
+mkdir -p $PKG/install
 cat <<EOINS >> $PKG/install/doinst.sh
 # Handle the incoming configuration files:
 config() {
@@ -226,7 +224,7 @@ fi
 
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database /usr/share/applications > /dev/null 
+  chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 
 2>&1
 fi
 
@@ -235,8 +233,9 @@ EOINS
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-mv $PKG/install/README.1st $PKG/usr/doc/$PRGNAM-$VERSION
-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
@@ -259,11 +258,11 @@ fi
 
 # 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