diff --exclude=work -ruN ../fwbuilder.orig/Makefile ./Makefile
--- ../fwbuilder.orig/Makefile	Tue Jun  3 13:52:15 2003
+++ ./Makefile	Tue Jun 10 09:04:52 2003
@@ -1,13 +1,13 @@
-# New ports collection makefile for:    fwbuilder
-# Date Created:                         3 Feb 2001
-# Whom:                                 Roman Shterenzon <roman@xpert.com>
+# New ports collection makefile for:	fwbuilder
+# Date Created:				3 Feb 2001
+# Whom:					Roman Shterenzon <roman@xpert.com>
 #
-# $FreeBSD: ports/security/fwbuilder/Makefile,v 1.11 2003/05/22 14:36:29 foxfair Exp $
+# $FreeBSD: ports/security/fwbuilder/Makefile,v 1.12 2003/06/01 15:28:03 foxfair Exp $
 #
 
 PORTNAME=	fwbuilder
 PORTVERSION=	1.0.10
-PORTREVISION=    1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -17,14 +17,11 @@
 
 BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf \
 		aclocal:${PORTSDIR}/devel/automake
-
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
 
 CONFIGURE_SCRIPT= autogen.sh
-# CONFIGURE_ARGS+=  --with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
-USE_AUTOCONF=   yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_GTK=	yes
@@ -36,15 +33,12 @@
 
 .include <bsd.port.pre.mk>
 
-
 .if ${OSVERSION} >= 500000
-EXTRA_PATCHES=  files/CertDruidP30Dialog.cc-patch
+EXTRA_PATCHES=  ${FILESDIR}/CertDruidP30Dialog.cc-patch
 .endif
 
-
-post-extract:
+post-patch:
 	@${ECHO_CMD} "===! Running aclocal"
-	@(cd ${WRKSRC}; aclocal -I /usr/local/share/aclocal; autoconf)
+	@(cd ${WRKSRC}; aclocal; autoconf)
 
 .include <bsd.port.post.mk>
-
diff --exclude=work -ruN ../fwbuilder.orig/files/CertDruidP30Dialog.cc-patch ./files/CertDruidP30Dialog.cc-patch
--- ../fwbuilder.orig/files/CertDruidP30Dialog.cc-patch	Tue Jun  3 13:35:09 2003
+++ ./files/CertDruidP30Dialog.cc-patch	Mon Jun  9 11:18:32 2003
@@ -1,21 +1,16 @@
---- src/gui/CertDruidP30Dialog.cc.ol	Tue Jun  3 07:31:22 2003
-+++ src/gui/CertDruidP30Dialog.cc	Tue Jun  3 07:31:52 2003
-@@ -25,14 +25,17 @@
- */
- 
- 
--
-+#if 0
- #define _XOPEN_SOURCE /* glibc2 needs this for strptime   --vk */
-+#endif
- 
- #include "config.h"
- #include "CertDruidP30Dialog.hh"
- #include "MessageDialog.hh"
- 
- #include <time.h>
-+
-+#include <cmath>
- 
- using namespace std;
- using namespace libfwbuilder;
+diff --exclude=work -ruN /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.
+cc-patch ./files/CertDruidP30Dialog.cc-patch
+--- /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.cc-patch     Thu Jan 
+ 1 08:00:00 1970
++++ ./files/CertDruidP30Dialog.cc-patch Fri May 23 07:37:51 2003
+@@ -0,0 +1,9 @@
++--- src/gui/CertDruidP30Dialog.cc.orig Thu May 22 22:42:13 2003
+++++ src/gui/CertDruidP30Dialog.cc      Thu May 22 22:42:37 2003
++@@ -25,5 +25,5 @@
++ */
++ 
++-
+++#include <cmath>
++ 
++ #define _XOPEN_SOURCE /* glibc2 needs this for strptime   --vk */
+
diff --exclude=work -ruN ../fwbuilder.orig/pkg-descr ./pkg-descr
--- ../fwbuilder.orig/pkg-descr	Sat Sep 21 03:17:22 2002
+++ ./pkg-descr	Mon Jun  9 16:39:48 2003
@@ -16,4 +16,3 @@
 iptables and FreeBSD or Solaris running ipfilter. 
 
 WWW: http://www.fwbuilder.org/
-