From bd4a05a0db99d9ea7a2ce614da51731d70dfeb56 Mon Sep 17 00:00:00 2001
From: David Somero <dsomero@hotmail.com>
Date: Wed, 12 May 2010 17:43:21 +0200
Subject: network/fwbuilder: Updated for version 3.0.4

---
 network/fwbuilder/fwbuilder.SlackBuild | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

(limited to 'network/fwbuilder/fwbuilder.SlackBuild')

diff --git a/network/fwbuilder/fwbuilder.SlackBuild b/network/fwbuilder/fwbuilder.SlackBuild
index 722865282c..bc7ea16369 100644
--- a/network/fwbuilder/fwbuilder.SlackBuild
+++ b/network/fwbuilder/fwbuilder.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libfwbuilder
 
-# Copyright 2007  David Somero <dsomero@hotmail.com>
+# Copyright 2008  David Somero <dsomero@hotmail.com> Athens,TN USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fwbuilder
-VERSION=2.1.19
+VERSION=3.0.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,12 +33,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "${ARCH}" = "i486" ]; then
+if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -60,11 +63,13 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --with-docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-qmake=qmake-qt4 \
   --build=$ARCH-slackware-linux
 
 make
-make install DDIR=$PKG
+make INSTALL_ROOT=$PKG install
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -72,28 +77,10 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Move incorrectly installed man pages; stupid configure overrides our settings
 mv $PKG/usr/share/man $PKG/usr/
 
-# Add icons
-install -Dpm 0644 src/gui/icons/firewall_64.png \
-  $PKG/usr/share/icons/hicolor/64x64/apps/fwbuilder.png
-install -Dpm 0644 src/gui/icons/firewall_25.png \
-  $PKG/usr/share/icons/hicolor/24x24/apps/fwbuilder.png
-install -Dpm 0644 src/gui/icons/firewall_16.png \
-  $PKG/usr/share/icons/hicolor/16x16/apps/fwbuilder.png
-
-# Make a menu entry and install it; use the new FDo stuff if it's here
-which desktop-file-install > /dev/null 2>&1
-if [ $? == 0 ]; then
-  desktop-file-install --vendor slackware  \
-    --dir $PKG/usr/share/applications   \
-    $CWD/fwbuilder.desktop
-else
-  install -Dpm 0644 $CWD/fwbuilder.desktop $PKG/usr/share/applications/fwbuilder.desktop
-fi
-
 # Compress man pages
 ( cd $PKG/usr/man ; find . -type f -exec gzip -9 {} \; )
 
-cat $CWD/${PRGNAM}.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-- 
cgit v1.2.3