6 files changed, 22 insertions, 39 deletions
diff --git a/network/fwbuilder/README b/network/fwbuilder/README
index f04d80079fa4a..9132b8c3dd9b9 100644
--- a/network/fwbuilder/README
+++ b/network/fwbuilder/README
@@ -5,4 +5,4 @@ administrator maintain a database of network objects and allows policy
 editing using simple drag-and-drop operations. Firewall Builder currently 
 supports iptables, ipfilter, OpenBSD PF, and Cisco PIX. 
 
-This requires libfwbuilder, which is also available at SlackBuilds.org.
+This requires libfwbuilder and QT4 available at SlackBuilds.org.
diff --git a/network/fwbuilder/doinst.sh b/network/fwbuilder/doinst.sh
index 301399ba37c77..1f8ff67dedb29 100644
--- a/network/fwbuilder/doinst.sh
+++ b/network/fwbuilder/doinst.sh
@@ -1,5 +1,10 @@
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/network/fwbuilder/fwbuilder.SlackBuild b/network/fwbuilder/fwbuilder.SlackBuild
index 722865282cdfe..bc7ea16369f9c 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
diff --git a/network/fwbuilder/fwbuilder.desktop b/network/fwbuilder/fwbuilder.desktop
deleted file mode 100644
index b879bde876135..0000000000000
--- a/network/fwbuilder/fwbuilder.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=System;
-Comment=Design IPTables Firewall Rules
-Encoding=UTF-8
-Name=Firewall Builder
-Icon=fwbuilder
-Exec=fwbuilder
-Type=Application
-StartupNotify=true
-Terminal=false
diff --git a/network/fwbuilder/fwbuilder.info b/network/fwbuilder/fwbuilder.info
index 82d423d0a2f6f..8a58f4b31b48c 100644
--- a/network/fwbuilder/fwbuilder.info
+++ b/network/fwbuilder/fwbuilder.info
@@ -1,8 +1,8 @@
 PRGNAM="fwbuilder"
-VERSION="2.1.19"
+VERSION="3.0.4"
 HOMEPAGE="http://www.fwbuilder.org/"
-DOWNLOAD="http://downloads.sourceforge.net/fwbuilder/fwbuilder-2.1.19.tar.gz"
-MD5SUM="285e6f364733b6aabead143db87b309b"
+DOWNLOAD="http://downloads.sourceforge.net/fwbuilder/fwbuilder-3.0.4.tar.gz"
+MD5SUM="a53ad035511e6a8a6b4b89e6eacf4485"
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
 APPROVED="rworkman"
diff --git a/network/fwbuilder/slack-desc b/network/fwbuilder/slack-desc
index 12dfb892f4e1a..d895fd631a396 100644
--- a/network/fwbuilder/slack-desc
+++ b/network/fwbuilder/slack-desc
@@ -4,6 +4,7 @@
 # the right side marks the last column you can put a character in.  You must make
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
+
          |-----handy-ruler---------------------------------------------------|
 fwbuilder: fwbuilder (Firewall creation utility)
 fwbuilder:
@@ -13,6 +14,6 @@ fwbuilder: objects and allows policy editing using simple drag-and-drop
 fwbuilder: operations. Firewall Builder currently supports iptables, ipfilter, 
 fwbuilder: OpenBSD PF and Cisco PIX.
 fwbuilder: 
-fwbuilder:
+fwbuilder: Homepage: http://www.fwbuilder.org
 fwbuilder:
 fwbuilder: