The port was face lifted.

PR:		24837
Submitted by:	roman@xpert.com

6 files changed, 70 insertions, 99 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 03a683120041..610fb34f375b 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -22,5 +22,16 @@ USE_GTK=	yes
 USE_LIBTOOL=	yes
 USE_GNOMELIBS=	yes
 WITHOUT_ESOUND=	yes
+CONFIGURE_ARGS+=	--with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
+
+post-extract:
+	@${PERL} -pi -e "s/lc_r/pthread/" ${WRKSRC}/configure ;\
+	${PERL} -pi -e "s|/usr/bin|${LOCALBASE}/bin|" ${WRKSRC}/etc/fwbuilder_prefs.xml.in
+.for i in compiler-framework/Makefile.in gui/gnome-wrappers/Makefile.in \
+	gui/Makefile.in ipchains/Makefile.in ipfilter/Makefile.in \
+	iptables/Makefile.in
+	@${PERL} -pi -e "s|^CFLAGS\s+=\s+-Wall\s+-g|CFLAGS = \@CFLAGS@ -Wall|" ${WRKSRC}/src/$i
+.endfor
+
 
 .include <bsd.port.mk>
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index c657cfc1c785..7e90b4806cb2 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-0.8.7.tar.gz) = f0baca74d572db03b1ff009daf1f0096
+MD5 (fwbuilder-0.8.7.tar.gz) = 3fb13778a5b998bf31b789d410587221
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
index 405e98b3a448..8416f7694d3f 100644
--- a/security/fwbuilder-devel/files/patch-aa
+++ b/security/fwbuilder-devel/files/patch-aa
@@ -1,38 +1,23 @@
---- configure.orig	Fri Feb  2 02:17:34 2001
-+++ configure	Sun Feb  4 01:26:08 2001
-@@ -3145,14 +3145,14 @@
-   PTHREAD_LIB="-lpthreads"
- else
-   echo "$ac_t""no" 1>&6
--echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
--echo "configure:3150: checking for pthread_create in -lc_r" >&5
-+echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
-+echo "configure:3150: checking for pthread_create in -pthread" >&5
- ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lc_r  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3158 "configure"
- #include "confdefs.h"
-@@ -3180,7 +3180,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIB="-lc_r"
-+  PTHREAD_LIB="-pthread"
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3979,7 +3979,7 @@
+--- src/compiler-framework/Makefile.in.orig	Sat Feb  3 23:11:36 2001
++++ src/compiler-framework/Makefile.in	Sat Feb  3 23:11:57 2001
+@@ -11,7 +11,7 @@
  
- else
-   cat >> confdefs.h <<EOF
--#define TEMPLATE_DIR "${PREFIX}/share/fwbuilder"
-+#define TEMPLATE_DIR "${PREFIX}/share/gnome/fwbuilder"
- EOF
+ CC= @CC@
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_DATA=@INSTALL_DATA@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  
- fi
+ XML_CFLAGS = @XML_CFLAGS@
+@@ -45,9 +45,9 @@
+ 
+ install: $(FWLIB) $(HEADERS)
+ 	$(mkinstalldirs) $(libdir)
+-	$(INSTALL_PROGRAM) $(FWLIB) $(libdir)
++	$(INSTALL_DATA) $(FWLIB) $(libdir)
+ 	$(mkinstalldirs) $(includedir)
+-	$(INSTALL_PROGRAM) $(HEADERS) $(includedir)
++	$(INSTALL_DATA) $(HEADERS) $(includedir)
+ 
+ 
+ uninstall: 
diff --git a/security/fwbuilder-devel/files/patch-ae b/security/fwbuilder-devel/files/patch-ae
index 8416f7694d3f..990955c205ca 100644
--- a/security/fwbuilder-devel/files/patch-ae
+++ b/security/fwbuilder-devel/files/patch-ae
@@ -1,23 +1,11 @@
---- src/compiler-framework/Makefile.in.orig	Sat Feb  3 23:11:36 2001
-+++ src/compiler-framework/Makefile.in	Sat Feb  3 23:11:57 2001
-@@ -11,7 +11,7 @@
+--- src/gui/Makefile.in.orig	Wed Mar 21 01:56:07 2001
++++ src/gui/Makefile.in	Wed Mar 21 01:58:19 2001
+@@ -9,7 +9,7 @@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ sbindir = @sbindir@
+-iconsdir = $(prefix)/share/pixmaps/fwbuilder
++iconsdir = @datadir@/fwbuilder/pixmaps
  
- CC= @CC@
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  
- XML_CFLAGS = @XML_CFLAGS@
-@@ -45,9 +45,9 @@
- 
- install: $(FWLIB) $(HEADERS)
- 	$(mkinstalldirs) $(libdir)
--	$(INSTALL_PROGRAM) $(FWLIB) $(libdir)
-+	$(INSTALL_DATA) $(FWLIB) $(libdir)
- 	$(mkinstalldirs) $(includedir)
--	$(INSTALL_PROGRAM) $(HEADERS) $(includedir)
-+	$(INSTALL_DATA) $(HEADERS) $(includedir)
- 
- 
- uninstall: 
diff --git a/security/fwbuilder-devel/files/patch-af b/security/fwbuilder-devel/files/patch-af
deleted file mode 100644
index 3d967a3b422e..000000000000
--- a/security/fwbuilder-devel/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- etc/fwbuilder_prefs.xml.in.orig	Sun Feb  4 00:21:57 2001
-+++ etc/fwbuilder_prefs.xml.in	Sun Feb  4 00:22:27 2001
-@@ -3,8 +3,8 @@
-   <Paths>
-     <Wdir/>
-     <Icndir>@PACKAGE_PIXMAPS_DIR@</Icndir>
--    <SNMPget>/usr/bin/snmpget</SNMPget>
--    <SNMPwalk>/usr/bin/snmpwalk</SNMPwalk>
-+    <SNMPget>/usr/local/bin/snmpget</SNMPget>
-+    <SNMPwalk>/usr/local/bin/snmpwalk</SNMPwalk>
-   </Paths>
-   <UI>
-     <ShowIconsInPolicy>1</ShowIconsInPolicy>
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index 62f52b7f25b1..421602f42d3f 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -20,34 +20,34 @@ share/doc/fwbuilder/objects.xml
 share/gnome/fwbuilder/fwbuilder.dtd
 share/gnome/fwbuilder/fwbuilder_prefs.xml
 share/gnome/fwbuilder/objects_init.xml
-share/pixmaps/fwbuilder/accept.png
-share/pixmaps/fwbuilder/blank.xpm
-share/pixmaps/fwbuilder/check.xpm
-share/pixmaps/fwbuilder/clock.png
-share/pixmaps/fwbuilder/deny.png
-share/pixmaps/fwbuilder/drag_object.xpm
-share/pixmaps/fwbuilder/error.png
-share/pixmaps/fwbuilder/firewall.png
-share/pixmaps/fwbuilder/firewall_64.png
-share/pixmaps/fwbuilder/folder.png
-share/pixmaps/fwbuilder/folder_64.png
-share/pixmaps/fwbuilder/generic.xpm
-share/pixmaps/fwbuilder/host.png
-share/pixmaps/fwbuilder/host_64.png
-share/pixmaps/fwbuilder/icmp.xpm
-share/pixmaps/fwbuilder/interface.xpm
-share/pixmaps/fwbuilder/ip.xpm
-share/pixmaps/fwbuilder/log.png
-share/pixmaps/fwbuilder/neg.xpm
-share/pixmaps/fwbuilder/net.png
-share/pixmaps/fwbuilder/net_64.png
-share/pixmaps/fwbuilder/question.png
-share/pixmaps/fwbuilder/ref.xpm
-share/pixmaps/fwbuilder/reject.png
-share/pixmaps/fwbuilder/tcp.xpm
-share/pixmaps/fwbuilder/udp.xpm
-share/pixmaps/fwbuilder/uncheck.xpm
-share/pixmaps/fwbuilder/warning.xpm
+share/gnome/fwbuilder/pixmaps/accept.png
+share/gnome/fwbuilder/pixmaps/blank.xpm
+share/gnome/fwbuilder/pixmaps/check.xpm
+share/gnome/fwbuilder/pixmaps/clock.png
+share/gnome/fwbuilder/pixmaps/deny.png
+share/gnome/fwbuilder/pixmaps/drag_object.xpm
+share/gnome/fwbuilder/pixmaps/error.png
+share/gnome/fwbuilder/pixmaps/firewall.png
+share/gnome/fwbuilder/pixmaps/firewall_64.png
+share/gnome/fwbuilder/pixmaps/folder.png
+share/gnome/fwbuilder/pixmaps/folder_64.png
+share/gnome/fwbuilder/pixmaps/generic.xpm
+share/gnome/fwbuilder/pixmaps/host.png
+share/gnome/fwbuilder/pixmaps/host_64.png
+share/gnome/fwbuilder/pixmaps/icmp.xpm
+share/gnome/fwbuilder/pixmaps/interface.xpm
+share/gnome/fwbuilder/pixmaps/ip.xpm
+share/gnome/fwbuilder/pixmaps/log.png
+share/gnome/fwbuilder/pixmaps/neg.xpm
+share/gnome/fwbuilder/pixmaps/net.png
+share/gnome/fwbuilder/pixmaps/net_64.png
+share/gnome/fwbuilder/pixmaps/question.png
+share/gnome/fwbuilder/pixmaps/ref.xpm
+share/gnome/fwbuilder/pixmaps/reject.png
+share/gnome/fwbuilder/pixmaps/tcp.xpm
+share/gnome/fwbuilder/pixmaps/udp.xpm
+share/gnome/fwbuilder/pixmaps/uncheck.xpm
+share/gnome/fwbuilder/pixmaps/warning.xpm
 @dirrm share/doc/fwbuilder
+@dirrm share/gnome/fwbuilder/pixmaps
 @dirrm share/gnome/fwbuilder
-@dirrm share/pixmaps/fwbuilder