Fix

1 files changed, 46 insertions, 47 deletions

diff --git a/vde/build/vde.SlackBuild b/vde/build/vde.SlackBuild
index 7bf13682..92a355e7 100755
--- a/vde/build/vde.SlackBuild
+++ b/vde/build/vde.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2004-2008 Eric Hameleers <alien@slackware.com>
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -24,12 +24,12 @@
 #
 # Slackware SlackBuild script 
 # ===========================
-# By:        Eric Hameleers <alien@slackware.com>
-# For:       vde
-# Descr:     Virtual Distributed Ethernet
-# URL:       http://vde.sourceforge.net/
-# Needs:     
-# Changelog:
+# By:         Eric Hameleers <alien@slackware.com>
+# For:        vde
+# Descr:      virtual distributed ethernet
+# URL:        http://vde.sourceforge.net/
+# Needs:      
+# Changelog:  
 # 1.5.7-1:   16/dec/2004 by Eric Hameleers
 #            * Initial build.
 # 1.5.7-2:   18/dec/2004 by Eric Hameleers
@@ -55,6 +55,8 @@
 #            * New release.
 # 2.1.6-1:   26/jul/2007 by Eric Hameleers <alien@slackware.com>
 #            * Update.
+# 2.2.0.pre1-1: 02/Jun/2008 by Eric Hameleers <alien@slackware.com>
+#               * Update.
 # 
 # Run 'sh vde.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -65,15 +67,14 @@
 # Set initial variables:
 
 PRGNAM=vde
-VERSION=${VERSION:-2.1.6}
+SRCVER=${SRCVER:-2.2.0-pre1}
+VERSION=$(echo $SRCVER | tr '-' '.')
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
-CVS=no
+TAG=${TAG:-alien}
 
 # Where do we look for sources?
-CWD=`pwd`
-SRCDIR=`dirname $0`
-[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+SRCDIR=$(cd $(dirname $0); pwd)
 
 DOCS="COPYING* LICENSE README* VERSION qemu/qemu-vde-HOWTO \
       $SRCDIR/rc.vdenetwork $SRCDIR/Using_VDE_with_QEMU_HOWTO.txt"
@@ -83,9 +84,9 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Input URL: http://dl.sourceforge.net/vde/vde2-2.1.6.tar.bz2
-SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
-SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}2-${VERSION}.tar.bz2"
+# Input URL: http://downloads.sourceforge.net/vde/vde2-2.2.0-pre1.tar.bz2
+SOURCE="$SRCDIR/${PRGNAM}2-${VERSION}.tar.bz2"
+SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}2-${VERSION}.tar.bz2"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -93,22 +94,19 @@ SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}2-${VERSION}.tar.bz2"
 
 # Exit the script on errors:
 set -e
-trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
 # Catch unitialized variables:
 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=""
              ;;
@@ -127,27 +125,27 @@ case "$ARCH" in
 esac
 
 # Create working directories:
+mkdir -p $OUTPUT          # place for the package to be saved
 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
+mkdir -p $PKG             # place for the package to be built
+rm -rf $PKG/*             # always erase old package's contents
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
 
 # 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 20 -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
@@ -165,28 +163,25 @@ 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
-mv ${PRGNAM}2-${VERSION} ${PRGNAM}-${VERSION}
+mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION}
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-#Building ...
-# For the CVS snapshot:
-[ "$CVS" = "yes" ] && CFLAGS="$SLKCFLAGS" autoreconf --install
-
+echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
-            --datarootdir=/usr \
-            --datadir=/usr/share \
+            --mandir=/usr/man \
             --program-prefix="" \
             --program-suffix="" \
             --build=$ARCH-slackware-linux \
@@ -196,14 +191,14 @@ 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
 fi
 
 # Fix incorrect links
-(cd $PKG/usr/bin &&
+(cd $PKG/usr/bin
  rm -f vdeqemu; ln -s vdeq vdeqemu
  rm -f vdeo; ln -s vdeq vdeo
  rm -f vdeoqemu; ln -s vdeq vdeoqemu
@@ -218,13 +213,14 @@ cp uml/README README.uml
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-chown -R root:root $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
   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:
@@ -236,14 +232,17 @@ cd -
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
+if [ -f $SRCDIR/doinst.sh ]; then
+  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
+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