Update for 1.5.9 with a lot of changes to the script. The source builds cleaner now.

1 files changed, 23 insertions, 16 deletions

diff --git a/vde/build/vde.SlackBuild b/vde/build/vde.SlackBuild
index ca3f5814..cd3fbeaf 100755
--- a/vde/build/vde.SlackBuild
+++ b/vde/build/vde.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-#
+# $Id$
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
@@ -19,6 +19,9 @@
 #              sets up the right environment for qemu, using dnsmasq.
 #              If you already run a local nameserver, you'll have to edit out
 #              parts of that file.
+# 1.5.9-1:   05/jul/2005 by Eric Hameleers
+#            * New release. Changed the rc.vdenetwork script so that it will
+#              run out of the box.
 #
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
@@ -35,9 +38,9 @@ if [ "$TMP" = "" ]; then
 fi
 
 PRGNAM=vde
-VERSION=1.5.7
+VERSION=1.5.9
 ARCH=${ARCH:-i486}
-BUILD=3
+BUILD=1
 
 if [ "$ARCH" = "i386" ]; then
   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
@@ -80,9 +83,14 @@ cd $TMP/tmp-$PRGNAM
 # --- TARBALL EXTRACTION,PATCH,MODIFY ---
 
 echo "Extracting the program tarball for $PRGNAM..."
-tar -xzvf $CWD/${PRGNAM}-${VERSION}.tgz
+tar -xzvf $CWD/${PRGNAM}-${VERSION}.tar.gz
 
 cd ${PRGNAM}-${VERSION}
+patch -p1 < $CWD/vde-DESTDIR.patch
+
+# Get rid of the references to /usr/local in vdetap output, man page
+sed -i 's|local/lib|lib|g' vdetaplib/vdetap.c
+sed -i 's|local/lib|lib|g' doc/vdetaplib.1
 
 chown -R root.root *
 
@@ -91,16 +99,12 @@ chown -R root.root *
 
 echo Building ...
 
-mkdir -p $PKG/usr/bin $PKG/usr/lib $PKG/usr/man
-
+./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+  2>&1 | tee $CWD/configure-${PRGNAM}.log
 make 2>&1 | tee $CWD/make-${PRGNAM}.log
 
-cd qemu
-make
-cp vdeq $PKG/usr/bin
-(cd $PKG/usr/bin && ln -sf vdeq vdeqemu)
-cd ..
-
 #
 # Install all the needed stuff to the package dir
 #
@@ -108,10 +112,9 @@ cd ..
 which installwatch > /dev/null 2>&1
 if [ $? == 0 ]; then
   installwatch -o $CWD/install-${PRGNAM}.log \
-    make BIN_DIR=$PKG/usr/bin LIB_DIR=$PKG/usr/lib MAN_DIR=$PKG/usr/man install
+    make DESTDIR=$PKG install
 else
-  make BIN_DIR=$PKG/usr/bin LIB_DIR=$PKG/usr/lib MAN_DIR=$PKG/usr/man install \
-    2>&1 |tee $CWD/install-${PRGNAM}.log
+  make DESTDIR=$PKG install 2>&1 |tee $CWD/install-${PRGNAM}.log
 fi
 
 # Fix incorrect link
@@ -122,9 +125,13 @@ fi
 
 # --- DOCUMENTATION ---
 
+cp qemu/README README.qemu
+cp bochs/README README.bochs
+cp slirpvde/README README.slirpvde
 cp uml/README README.uml
 
-DOCS="COPYING LICENSE README README.uml VERSION $CWD/rc.vdenetwork"
+DOCS="COPYING LICENSE README* VERSION \
+      $CWD/rc.vdenetwork $CWD/Using_VDE_with_QEMU_HOWTO.txt"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS \