Update to 1.0.90 for Slackware 13.37

1 files changed, 22 insertions, 15 deletions

diff --git a/tigervnc/build/tigervnc.SlackBuild b/tigervnc/build/tigervnc.SlackBuild
index 44f8dc28..02d92813 100755
--- a/tigervnc/build/tigervnc.SlackBuild
+++ b/tigervnc/build/tigervnc.SlackBuild
@@ -34,6 +34,8 @@
 #             * Initial build.
 # r4126-2:    02/sep/2010 by Eric Hameleers <alien@slackware.com>
 #             * Fix a syntax error in thye doinst.sh script
+# 1.0.90-1:   14/may/2011 by Eric Hameleers <alien@slackware.com>
+#             * Update to 1.1.beta1
 # 
 # Run 'sh tigervnc.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -44,8 +46,8 @@
 # Set initial variables:
 
 PRGNAM=tigervnc
-VERSION=${VERSION:-r4126}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.0.90}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
@@ -53,6 +55,11 @@ TAG=${TAG:-alien}
 # that of your installed X.Org package:
 XORG=${XORG:-$(X -version 2>&1 | grep "^X.Org X Server " | cut -f4 -d' ')}
 
+# OS Stamp into the binaries:
+OSNAME="Slackware 13.37"
+OSVENDOR="Slackware Linux Project"
+BUILDER="Built by Alien BOB on $(date -u)"
+
 # This covers most filenames you'd want as documentation. Change if needed.
 DOCS="LICENCE.TXT doc/TODO doc/*.txt doc/*.odt"
 DOCS_XORG="COPYING ChangeLog"
@@ -67,7 +74,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 # If you want automatic download to work, supply a URL for 'SRCURL' below:
 SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-SRCURL[0]=""
+SRCURL[0]="http://downloads.sourceforge.net/$PRGNAM/${PRGNAM}-${VERSION}.tar.gz"
 
 SOURCE[1]="$SRCDIR/xorg-server-${XORG}.tar.gz"
 SRCURL[1]="http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${XORG}.tar.gz"
@@ -154,12 +161,12 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
                           # remove old log files
 
 # Source file availability:
-# Source file availability:
 for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
   if ! [ -f ${SOURCE[$i]} ]; then
     echo "Source '$(basename ${SOURCE[$i]})' not available yet..."
     # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
     [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
+    if [ -f ${SOURCE[$i]} ]; then echo "Ah, found it!"; continue; fi
     if ! [ "x${SRCURL[$i]}" == "x" ]; then
       echo "Will download file to $(dirname $SOURCE[$i])"
       wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
@@ -171,7 +178,8 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
     else
       # Try if we have a SVN/CVS download routine for ${SOURCE[$i]}
       echo "Will checkout sources to $(dirname $SOURCE[$i])"
-      src_checkout $i "${SOURCE[$i]}" 2>&1 > $OUTPUT/checkout-$(basename ${SOURCE[$i]}).log
+      src_checkout $i "${SOURCE[$i]}" \
+        2>&1 > $OUTPUT/checkout-$(basename ${SOURCE[$i]}).log
     fi
     if [ ! -f "${SOURCE[$i]}" -o ! -s "${SOURCE[$i]}" ]; then
       echo "File '$(basename ${SOURCE[$i]})' not available. Aborting the build."
@@ -213,14 +221,14 @@ cd -
 sed -i -e 's#/vnc/class#/tigervnc/class#'g $(grep -rl vnc/class .)
 
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
 export LDFLAGS="$SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
 
-echo "*** Building tigervnc ***"
+echo -e "\n*** Building tigervnc ***\n"
 autoreconf -vif 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 ./configure \
   --prefix=/usr \
@@ -239,7 +247,7 @@ make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
 cd unix/xserver
-  echo "*** Building xserver ***"
+  echo -e "\n*** Building xserver ***\n"
   autoreconf -vif 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
   # Default font paths to be used by the X server
@@ -267,13 +275,12 @@ cd unix/xserver
     --with-xkb-output=/var/lib/xkb \
     --disable-config-dbus \
     --disable-config-hal \
-    --with-os-name="Slackware 13.1" \
-    --with-os-vendor="Slackware Linux Project" \
-    --with-builderstring="Built by Alien BOB on $(date -u)" \
+    --disable-config-udev \
+    --with-os-name="$OSNAME" \
+    --with-os-vendor="$OSVENDOR" \
+    --with-builderstring="$BUILDER" \
     --build=$ARCH-slackware-linux \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-    # For future versions of xorg-server:
-    #--disable-config-udev \
 
   make $NUMJOBS 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
   make -C hw/vnc DESTDIR=$PKG install 2>&1 | tee -a $OUTPUT/install-${PRGNAM}.log
@@ -324,12 +331,12 @@ EOT
 cat <<EOT >> $PKG/install/doinst.sh
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
+  chroot . /usr/bin/update-desktop-database usr/share/applications 1>/dev/null 2>&1
 fi
 
 # Update the mime database:
 if [ -x usr/bin/update-mime-database ]; then
-  chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+  chroot . /usr/bin/update-mime-database usr/share/mime 1>/dev/null 2>&1
 fi
 
 EOT