34 files changed, 718 insertions, 0 deletions

diff --git a/security/Makefile b/security/Makefile
index 954027af25fc..283d5791b4b5 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -31,6 +31,7 @@
     SUBDIR += firewalk
     SUBDIR += fragrouter
     SUBDIR += fuzz
+    SUBDIR += fwbuilder
     SUBDIR += fwtk
     SUBDIR += gag
     SUBDIR += gnupg
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
new file mode 100644
index 000000000000..03a683120041
--- /dev/null
+++ b/security/fwbuilder-devel/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	fwbuilder
+# Date Created:				3 Feb 2001
+# Whom:					Roman Shterenzon <roman@xpert.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fwbuilder
+PORTVERSION=	0.8.7
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	roman@xpert.com
+
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
+		gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
+
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_GTK=	yes
+USE_LIBTOOL=	yes
+USE_GNOMELIBS=	yes
+WITHOUT_ESOUND=	yes
+
+.include <bsd.port.mk>
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
new file mode 100644
index 000000000000..c657cfc1c785
--- /dev/null
+++ b/security/fwbuilder-devel/distinfo
@@ -0,0 +1 @@
+MD5 (fwbuilder-0.8.7.tar.gz) = f0baca74d572db03b1ff009daf1f0096
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
new file mode 100644
index 000000000000..405e98b3a448
--- /dev/null
+++ b/security/fwbuilder-devel/files/patch-aa
@@ -0,0 +1,38 @@
+--- 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 @@
+ 
+ else
+   cat >> confdefs.h <<EOF
+-#define TEMPLATE_DIR "${PREFIX}/share/fwbuilder"
++#define TEMPLATE_DIR "${PREFIX}/share/gnome/fwbuilder"
+ EOF
+ 
+ fi
diff --git a/security/fwbuilder-devel/files/patch-ab b/security/fwbuilder-devel/files/patch-ab
new file mode 100644
index 000000000000..baadcf884946
--- /dev/null
+++ b/security/fwbuilder-devel/files/patch-ab
@@ -0,0 +1,20 @@
+--- examples/Makefile.in.orig	Sat Feb  3 23:01:10 2001
++++ examples/Makefile.in	Sat Feb  3 23:01:36 2001
+@@ -13,7 +13,7 @@
+ examplesdir = $(docdir)
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_DATA=@INSTALL_DATA@
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+@@ -24,7 +24,7 @@
+ 
+ install:
+ 	$(mkinstalldirs) $(examplesdir)
+-	$(INSTALL_PROGRAM) -m 0644 $(EXAMPLES) $(examplesdir)
++	$(INSTALL_DATA) $(EXAMPLES) $(examplesdir)
+ 
+ uninstall:
+ 	list='$(EXAMPLES)'; for file in $$list; do \
diff --git a/security/fwbuilder-devel/files/patch-ac b/security/fwbuilder-devel/files/patch-ac
new file mode 100644
index 000000000000..91181f8d26e1
--- /dev/null
+++ b/security/fwbuilder-devel/files/patch-ac
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	Sat Feb  3 23:04:02 2001
++++ doc/Makefile.in	Sat Feb  3 23:03:24 2001
+@@ -12,7 +12,7 @@
+ docdir = @DOCDIR@/fwbuilder
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_DATA=@INSTALL_DATA@
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+@@ -33,7 +33,7 @@
+ 
+ install:
+ 	$(mkinstalldirs) $(docdir)
+-	$(INSTALL_PROGRAM) -m 0644 $(DOCS) $(docdir)
++	$(INSTALL_DATA) $(DOCS) $(docdir)
+ 
+ uninstall:
+ 	list='$(DOCS)'; for file in $$list; do \
diff --git a/security/fwbuilder-devel/files/patch-ad b/security/fwbuilder-devel/files/patch-ad
new file mode 100644
index 000000000000..4fefde3c0957
--- /dev/null
+++ b/security/fwbuilder-devel/files/patch-ad
@@ -0,0 +1,24 @@
+--- etc/Makefile.in.orig	Sat Feb  3 23:10:14 2001
++++ etc/Makefile.in	Sat Feb  3 23:10:40 2001
+@@ -11,7 +11,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
++INSTALL_DATA = @INSTALL_DATA@ 
+ 
+ all: fwbuilder_prefs.xml
+ 
+@@ -27,9 +27,9 @@
+ 
+ install: objects_init.xml fwbuilder_prefs.xml
+ 	$(mkinstalldirs) $(datadir)
+-	$(INSTALL_PROGRAM) objects_init.xml $(datadir)
+-	$(INSTALL_PROGRAM) fwbuilder_prefs.xml $(datadir)
+-	$(INSTALL_PROGRAM) fwbuilder.dtd $(datadir)
++	$(INSTALL_DATA) objects_init.xml $(datadir)
++	$(INSTALL_DATA) fwbuilder_prefs.xml $(datadir)
++	$(INSTALL_DATA) fwbuilder.dtd $(datadir)
+ 
+ uninstall: 
+ 	rm -f $(datadir)/objects_init.xml
diff --git a/security/fwbuilder-devel/files/patch-ae b/security/fwbuilder-devel/files/patch-ae
new file mode 100644
index 000000000000..8416f7694d3f
--- /dev/null
+++ b/security/fwbuilder-devel/files/patch-ae
@@ -0,0 +1,23 @@
+--- 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 @@
+ 
+ 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
new file mode 100644
index 000000000000..3d967a3b422e
--- /dev/null
+++ b/security/fwbuilder-devel/files/patch-af
@@ -0,0 +1,13 @@
+--- 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-comment b/security/fwbuilder-devel/pkg-comment
new file mode 100644
index 000000000000..59a15672ff03
--- /dev/null
+++ b/security/fwbuilder-devel/pkg-comment
@@ -0,0 +1 @@
+Firewall Builder GUI for IPFilter
diff --git a/security/fwbuilder-devel/pkg-descr b/security/fwbuilder-devel/pkg-descr
new file mode 100644
index 000000000000..e6968c1ca2bb
--- /dev/null
+++ b/security/fwbuilder-devel/pkg-descr
@@ -0,0 +1,20 @@
+Firewall Builder consists of object-oriented GUI and set of policy compilers
+for various firewall platforms. In Firewall Builder, firewall policy is a set
+of rules, each rule consists of abstract objects which represent real network
+objects and services (hosts, routers, firewalls, networks, protocols).
+Firewall Builder helps user maintain database of objects and allows policy
+editing using simple drag-and-drop operations.
+
+Preferences and objects databases are stored in XML format. 
+GUI and policy compilers are completely independent. Support for a new firewall
+platform can be added to GUI without any changes done to the program, although
+new policy compiler must be written. This provides for consistent abstract
+model and the same GUI for different firewall platforms. Currently three most
+popular free firewalls are supported: ipchains, iptables and ipfilter.
+Because of this, Firewall Builder can be used to manage firewalls built on
+variety of platforms including, but not limited to, Linux running ipchains or
+iptables and FreeBSD or Solaris running ipfilter. 
+
+WWW: http://www.crocodile.org/~vadim/fwbuilder/
+
+Roman Shterenzon <roman@xpert.com>
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
new file mode 100644
index 000000000000..62f52b7f25b1
--- /dev/null
+++ b/security/fwbuilder-devel/pkg-plist
@@ -0,0 +1,53 @@
+bin/fwb_ipchains
+bin/fwb_ipfilter
+bin/fwb_iptables
+bin/fwbuilder
+include/fwcompiler.h
+lib/libfwcompiler.a
+share/doc/fwbuilder/AUTHORS
+share/doc/fwbuilder/COPYING
+share/doc/fwbuilder/ChangeLog
+share/doc/fwbuilder/Credits
+share/doc/fwbuilder/FAQ
+share/doc/fwbuilder/NEWS
+share/doc/fwbuilder/README.compiler-framework
+share/doc/fwbuilder/README.examples
+share/doc/fwbuilder/README.gui
+share/doc/fwbuilder/README.ipchains
+share/doc/fwbuilder/README.ipfilter
+share/doc/fwbuilder/Requirements
+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
+@dirrm share/doc/fwbuilder
+@dirrm share/gnome/fwbuilder
+@dirrm share/pixmaps/fwbuilder
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
new file mode 100644
index 000000000000..03a683120041
--- /dev/null
+++ b/security/fwbuilder/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	fwbuilder
+# Date Created:				3 Feb 2001
+# Whom:					Roman Shterenzon <roman@xpert.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fwbuilder
+PORTVERSION=	0.8.7
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	roman@xpert.com
+
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
+		gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
+
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_GTK=	yes
+USE_LIBTOOL=	yes
+USE_GNOMELIBS=	yes
+WITHOUT_ESOUND=	yes
+
+.include <bsd.port.mk>
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
new file mode 100644
index 000000000000..c657cfc1c785
--- /dev/null
+++ b/security/fwbuilder/distinfo
@@ -0,0 +1 @@
+MD5 (fwbuilder-0.8.7.tar.gz) = f0baca74d572db03b1ff009daf1f0096
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-aa
new file mode 100644
index 000000000000..405e98b3a448
--- /dev/null
+++ b/security/fwbuilder/files/patch-aa
@@ -0,0 +1,38 @@
+--- 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 @@
+ 
+ else
+   cat >> confdefs.h <<EOF
+-#define TEMPLATE_DIR "${PREFIX}/share/fwbuilder"
++#define TEMPLATE_DIR "${PREFIX}/share/gnome/fwbuilder"
+ EOF
+ 
+ fi
diff --git a/security/fwbuilder/files/patch-ab b/security/fwbuilder/files/patch-ab
new file mode 100644
index 000000000000..baadcf884946
--- /dev/null
+++ b/security/fwbuilder/files/patch-ab
@@ -0,0 +1,20 @@
+--- examples/Makefile.in.orig	Sat Feb  3 23:01:10 2001
++++ examples/Makefile.in	Sat Feb  3 23:01:36 2001
+@@ -13,7 +13,7 @@
+ examplesdir = $(docdir)
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_DATA=@INSTALL_DATA@
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+@@ -24,7 +24,7 @@
+ 
+ install:
+ 	$(mkinstalldirs) $(examplesdir)
+-	$(INSTALL_PROGRAM) -m 0644 $(EXAMPLES) $(examplesdir)
++	$(INSTALL_DATA) $(EXAMPLES) $(examplesdir)
+ 
+ uninstall:
+ 	list='$(EXAMPLES)'; for file in $$list; do \
diff --git a/security/fwbuilder/files/patch-ac b/security/fwbuilder/files/patch-ac
new file mode 100644
index 000000000000..91181f8d26e1
--- /dev/null
+++ b/security/fwbuilder/files/patch-ac
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	Sat Feb  3 23:04:02 2001
++++ doc/Makefile.in	Sat Feb  3 23:03:24 2001
+@@ -12,7 +12,7 @@
+ docdir = @DOCDIR@/fwbuilder
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_DATA=@INSTALL_DATA@
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+@@ -33,7 +33,7 @@
+ 
+ install:
+ 	$(mkinstalldirs) $(docdir)
+-	$(INSTALL_PROGRAM) -m 0644 $(DOCS) $(docdir)
++	$(INSTALL_DATA) $(DOCS) $(docdir)
+ 
+ uninstall:
+ 	list='$(DOCS)'; for file in $$list; do \
diff --git a/security/fwbuilder/files/patch-ad b/security/fwbuilder/files/patch-ad
new file mode 100644
index 000000000000..4fefde3c0957
--- /dev/null
+++ b/security/fwbuilder/files/patch-ad
@@ -0,0 +1,24 @@
+--- etc/Makefile.in.orig	Sat Feb  3 23:10:14 2001
++++ etc/Makefile.in	Sat Feb  3 23:10:40 2001
+@@ -11,7 +11,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
++INSTALL_DATA = @INSTALL_DATA@ 
+ 
+ all: fwbuilder_prefs.xml
+ 
+@@ -27,9 +27,9 @@
+ 
+ install: objects_init.xml fwbuilder_prefs.xml
+ 	$(mkinstalldirs) $(datadir)
+-	$(INSTALL_PROGRAM) objects_init.xml $(datadir)
+-	$(INSTALL_PROGRAM) fwbuilder_prefs.xml $(datadir)
+-	$(INSTALL_PROGRAM) fwbuilder.dtd $(datadir)
++	$(INSTALL_DATA) objects_init.xml $(datadir)
++	$(INSTALL_DATA) fwbuilder_prefs.xml $(datadir)
++	$(INSTALL_DATA) fwbuilder.dtd $(datadir)
+ 
+ uninstall: 
+ 	rm -f $(datadir)/objects_init.xml
diff --git a/security/fwbuilder/files/patch-ae b/security/fwbuilder/files/patch-ae
new file mode 100644
index 000000000000..8416f7694d3f
--- /dev/null
+++ b/security/fwbuilder/files/patch-ae
@@ -0,0 +1,23 @@
+--- 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 @@
+ 
+ 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/files/patch-af b/security/fwbuilder/files/patch-af
new file mode 100644
index 000000000000..3d967a3b422e
--- /dev/null
+++ b/security/fwbuilder/files/patch-af
@@ -0,0 +1,13 @@
+--- 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/pkg-comment b/security/fwbuilder/pkg-comment
new file mode 100644
index 000000000000..59a15672ff03
--- /dev/null
+++ b/security/fwbuilder/pkg-comment
@@ -0,0 +1 @@
+Firewall Builder GUI for IPFilter
diff --git a/security/fwbuilder/pkg-descr b/security/fwbuilder/pkg-descr
new file mode 100644
index 000000000000..e6968c1ca2bb
--- /dev/null
+++ b/security/fwbuilder/pkg-descr
@@ -0,0 +1,20 @@
+Firewall Builder consists of object-oriented GUI and set of policy compilers
+for various firewall platforms. In Firewall Builder, firewall policy is a set
+of rules, each rule consists of abstract objects which represent real network
+objects and services (hosts, routers, firewalls, networks, protocols).
+Firewall Builder helps user maintain database of objects and allows policy
+editing using simple drag-and-drop operations.
+
+Preferences and objects databases are stored in XML format. 
+GUI and policy compilers are completely independent. Support for a new firewall
+platform can be added to GUI without any changes done to the program, although
+new policy compiler must be written. This provides for consistent abstract
+model and the same GUI for different firewall platforms. Currently three most
+popular free firewalls are supported: ipchains, iptables and ipfilter.
+Because of this, Firewall Builder can be used to manage firewalls built on
+variety of platforms including, but not limited to, Linux running ipchains or
+iptables and FreeBSD or Solaris running ipfilter. 
+
+WWW: http://www.crocodile.org/~vadim/fwbuilder/
+
+Roman Shterenzon <roman@xpert.com>
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
new file mode 100644
index 000000000000..62f52b7f25b1
--- /dev/null
+++ b/security/fwbuilder/pkg-plist
@@ -0,0 +1,53 @@
+bin/fwb_ipchains
+bin/fwb_ipfilter
+bin/fwb_iptables
+bin/fwbuilder
+include/fwcompiler.h
+lib/libfwcompiler.a
+share/doc/fwbuilder/AUTHORS
+share/doc/fwbuilder/COPYING
+share/doc/fwbuilder/ChangeLog
+share/doc/fwbuilder/Credits
+share/doc/fwbuilder/FAQ
+share/doc/fwbuilder/NEWS
+share/doc/fwbuilder/README.compiler-framework
+share/doc/fwbuilder/README.examples
+share/doc/fwbuilder/README.gui
+share/doc/fwbuilder/README.ipchains
+share/doc/fwbuilder/README.ipfilter
+share/doc/fwbuilder/Requirements
+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
+@dirrm share/doc/fwbuilder
+@dirrm share/gnome/fwbuilder
+@dirrm share/pixmaps/fwbuilder
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
new file mode 100644
index 000000000000..03a683120041
--- /dev/null
+++ b/security/fwbuilder2/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	fwbuilder
+# Date Created:				3 Feb 2001
+# Whom:					Roman Shterenzon <roman@xpert.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fwbuilder
+PORTVERSION=	0.8.7
+CATEGORIES=	security
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	roman@xpert.com
+
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml \
+		gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
+
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+USE_GTK=	yes
+USE_LIBTOOL=	yes
+USE_GNOMELIBS=	yes
+WITHOUT_ESOUND=	yes
+
+.include <bsd.port.mk>
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
new file mode 100644
index 000000000000..c657cfc1c785
--- /dev/null
+++ b/security/fwbuilder2/distinfo
@@ -0,0 +1 @@
+MD5 (fwbuilder-0.8.7.tar.gz) = f0baca74d572db03b1ff009daf1f0096
diff --git a/security/fwbuilder2/files/patch-aa b/security/fwbuilder2/files/patch-aa
new file mode 100644
index 000000000000..405e98b3a448
--- /dev/null
+++ b/security/fwbuilder2/files/patch-aa
@@ -0,0 +1,38 @@
+--- 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 @@
+ 
+ else
+   cat >> confdefs.h <<EOF
+-#define TEMPLATE_DIR "${PREFIX}/share/fwbuilder"
++#define TEMPLATE_DIR "${PREFIX}/share/gnome/fwbuilder"
+ EOF
+ 
+ fi
diff --git a/security/fwbuilder2/files/patch-ab b/security/fwbuilder2/files/patch-ab
new file mode 100644
index 000000000000..baadcf884946
--- /dev/null
+++ b/security/fwbuilder2/files/patch-ab
@@ -0,0 +1,20 @@
+--- examples/Makefile.in.orig	Sat Feb  3 23:01:10 2001
++++ examples/Makefile.in	Sat Feb  3 23:01:36 2001
+@@ -13,7 +13,7 @@
+ examplesdir = $(docdir)
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_DATA=@INSTALL_DATA@
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+@@ -24,7 +24,7 @@
+ 
+ install:
+ 	$(mkinstalldirs) $(examplesdir)
+-	$(INSTALL_PROGRAM) -m 0644 $(EXAMPLES) $(examplesdir)
++	$(INSTALL_DATA) $(EXAMPLES) $(examplesdir)
+ 
+ uninstall:
+ 	list='$(EXAMPLES)'; for file in $$list; do \
diff --git a/security/fwbuilder2/files/patch-ac b/security/fwbuilder2/files/patch-ac
new file mode 100644
index 000000000000..91181f8d26e1
--- /dev/null
+++ b/security/fwbuilder2/files/patch-ac
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	Sat Feb  3 23:04:02 2001
++++ doc/Makefile.in	Sat Feb  3 23:03:24 2001
+@@ -12,7 +12,7 @@
+ docdir = @DOCDIR@/fwbuilder
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_DATA=@INSTALL_DATA@
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+@@ -33,7 +33,7 @@
+ 
+ install:
+ 	$(mkinstalldirs) $(docdir)
+-	$(INSTALL_PROGRAM) -m 0644 $(DOCS) $(docdir)
++	$(INSTALL_DATA) $(DOCS) $(docdir)
+ 
+ uninstall:
+ 	list='$(DOCS)'; for file in $$list; do \
diff --git a/security/fwbuilder2/files/patch-ad b/security/fwbuilder2/files/patch-ad
new file mode 100644
index 000000000000..4fefde3c0957
--- /dev/null
+++ b/security/fwbuilder2/files/patch-ad
@@ -0,0 +1,24 @@
+--- etc/Makefile.in.orig	Sat Feb  3 23:10:14 2001
++++ etc/Makefile.in	Sat Feb  3 23:10:40 2001
+@@ -11,7 +11,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
++INSTALL_DATA = @INSTALL_DATA@ 
+ 
+ all: fwbuilder_prefs.xml
+ 
+@@ -27,9 +27,9 @@
+ 
+ install: objects_init.xml fwbuilder_prefs.xml
+ 	$(mkinstalldirs) $(datadir)
+-	$(INSTALL_PROGRAM) objects_init.xml $(datadir)
+-	$(INSTALL_PROGRAM) fwbuilder_prefs.xml $(datadir)
+-	$(INSTALL_PROGRAM) fwbuilder.dtd $(datadir)
++	$(INSTALL_DATA) objects_init.xml $(datadir)
++	$(INSTALL_DATA) fwbuilder_prefs.xml $(datadir)
++	$(INSTALL_DATA) fwbuilder.dtd $(datadir)
+ 
+ uninstall: 
+ 	rm -f $(datadir)/objects_init.xml
diff --git a/security/fwbuilder2/files/patch-ae b/security/fwbuilder2/files/patch-ae
new file mode 100644
index 000000000000..8416f7694d3f
--- /dev/null
+++ b/security/fwbuilder2/files/patch-ae
@@ -0,0 +1,23 @@
+--- 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 @@
+ 
+ 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/fwbuilder2/files/patch-af b/security/fwbuilder2/files/patch-af
new file mode 100644
index 000000000000..3d967a3b422e
--- /dev/null
+++ b/security/fwbuilder2/files/patch-af
@@ -0,0 +1,13 @@
+--- 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/fwbuilder2/pkg-comment b/security/fwbuilder2/pkg-comment
new file mode 100644
index 000000000000..59a15672ff03
--- /dev/null
+++ b/security/fwbuilder2/pkg-comment
@@ -0,0 +1 @@
+Firewall Builder GUI for IPFilter
diff --git a/security/fwbuilder2/pkg-descr b/security/fwbuilder2/pkg-descr
new file mode 100644
index 000000000000..e6968c1ca2bb
--- /dev/null
+++ b/security/fwbuilder2/pkg-descr
@@ -0,0 +1,20 @@
+Firewall Builder consists of object-oriented GUI and set of policy compilers
+for various firewall platforms. In Firewall Builder, firewall policy is a set
+of rules, each rule consists of abstract objects which represent real network
+objects and services (hosts, routers, firewalls, networks, protocols).
+Firewall Builder helps user maintain database of objects and allows policy
+editing using simple drag-and-drop operations.
+
+Preferences and objects databases are stored in XML format. 
+GUI and policy compilers are completely independent. Support for a new firewall
+platform can be added to GUI without any changes done to the program, although
+new policy compiler must be written. This provides for consistent abstract
+model and the same GUI for different firewall platforms. Currently three most
+popular free firewalls are supported: ipchains, iptables and ipfilter.
+Because of this, Firewall Builder can be used to manage firewalls built on
+variety of platforms including, but not limited to, Linux running ipchains or
+iptables and FreeBSD or Solaris running ipfilter. 
+
+WWW: http://www.crocodile.org/~vadim/fwbuilder/
+
+Roman Shterenzon <roman@xpert.com>
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
new file mode 100644
index 000000000000..62f52b7f25b1
--- /dev/null
+++ b/security/fwbuilder2/pkg-plist
@@ -0,0 +1,53 @@
+bin/fwb_ipchains
+bin/fwb_ipfilter
+bin/fwb_iptables
+bin/fwbuilder
+include/fwcompiler.h
+lib/libfwcompiler.a
+share/doc/fwbuilder/AUTHORS
+share/doc/fwbuilder/COPYING
+share/doc/fwbuilder/ChangeLog
+share/doc/fwbuilder/Credits
+share/doc/fwbuilder/FAQ
+share/doc/fwbuilder/NEWS
+share/doc/fwbuilder/README.compiler-framework
+share/doc/fwbuilder/README.examples
+share/doc/fwbuilder/README.gui
+share/doc/fwbuilder/README.ipchains
+share/doc/fwbuilder/README.ipfilter
+share/doc/fwbuilder/Requirements
+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
+@dirrm share/doc/fwbuilder
+@dirrm share/gnome/fwbuilder
+@dirrm share/pixmaps/fwbuilder