9 files changed, 36 insertions, 12 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 252d9b9a5174..2a3b6c65ad35 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.0.4
+PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -17,6 +17,9 @@ COMMENT=	Firewall Builder GUI and policy compilers
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 LIB_DEPENDS=	fwbuilder.6:${PORTSDIR}/security/libfwbuilder
+.if !exists(/usr/include/getopt.h)
+LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+.endif
 
 USE_QT_VER=	3
 
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index 7c1b02ccdfe4..b62bc85f0ce0 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1 +1,2 @@
-MD5 (fwbuilder-2.0.2.tar.gz) = 1a31df4d7c6ddcbe9aa7ae861ea438d2
+MD5 (fwbuilder-2.0.4.tar.gz) = a63df33d38f4845cc5721cee9a10640b
+SIZE (fwbuilder-2.0.4.tar.gz) = 1064789
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index 5d4c94261b96..6b90b86fe148 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -22,6 +22,10 @@ bin/fwbuilder
 %%DOCSDIR%%/ReleaseNotes_2.0.1.txt
 %%DOCSDIR%%/ReleaseNotes_2.0.2.html
 %%DOCSDIR%%/ReleaseNotes_2.0.2.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.3.html
+%%DOCSDIR%%/ReleaseNotes_2.0.3.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.4.html
+%%DOCSDIR%%/ReleaseNotes_2.0.4.txt
 %%DOCSDIR%%/PatchAcceptancePolicy.txt
 %%DATADIR%%/objects_init.xml
 %%DATADIR%%/templates.xml
@@ -41,8 +45,8 @@ bin/fwbuilder
 %%DATADIR%%/os/pix_os.xml
 %%DATADIR%%/os/unknown_os.xml
 %%DATADIR%%/locale/fwbuilder_fr.qm
+%%DATADIR%%/locale/fwbuilder_ja.qm
 %%DATADIR%%/locale/fwbuilder_ru.qm
-%%DATADIR%%/locale/fwbuilder_vi.qm
 @dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/platform
 @dirrm %%DATADIR%%/os
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 252d9b9a5174..2a3b6c65ad35 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.0.4
+PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -17,6 +17,9 @@ COMMENT=	Firewall Builder GUI and policy compilers
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 LIB_DEPENDS=	fwbuilder.6:${PORTSDIR}/security/libfwbuilder
+.if !exists(/usr/include/getopt.h)
+LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+.endif
 
 USE_QT_VER=	3
 
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 7c1b02ccdfe4..b62bc85f0ce0 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1 +1,2 @@
-MD5 (fwbuilder-2.0.2.tar.gz) = 1a31df4d7c6ddcbe9aa7ae861ea438d2
+MD5 (fwbuilder-2.0.4.tar.gz) = a63df33d38f4845cc5721cee9a10640b
+SIZE (fwbuilder-2.0.4.tar.gz) = 1064789
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index 5d4c94261b96..6b90b86fe148 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -22,6 +22,10 @@ bin/fwbuilder
 %%DOCSDIR%%/ReleaseNotes_2.0.1.txt
 %%DOCSDIR%%/ReleaseNotes_2.0.2.html
 %%DOCSDIR%%/ReleaseNotes_2.0.2.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.3.html
+%%DOCSDIR%%/ReleaseNotes_2.0.3.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.4.html
+%%DOCSDIR%%/ReleaseNotes_2.0.4.txt
 %%DOCSDIR%%/PatchAcceptancePolicy.txt
 %%DATADIR%%/objects_init.xml
 %%DATADIR%%/templates.xml
@@ -41,8 +45,8 @@ bin/fwbuilder
 %%DATADIR%%/os/pix_os.xml
 %%DATADIR%%/os/unknown_os.xml
 %%DATADIR%%/locale/fwbuilder_fr.qm
+%%DATADIR%%/locale/fwbuilder_ja.qm
 %%DATADIR%%/locale/fwbuilder_ru.qm
-%%DATADIR%%/locale/fwbuilder_vi.qm
 @dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/platform
 @dirrm %%DATADIR%%/os
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index 252d9b9a5174..2a3b6c65ad35 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.0.4
+PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -17,6 +17,9 @@ COMMENT=	Firewall Builder GUI and policy compilers
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 LIB_DEPENDS=	fwbuilder.6:${PORTSDIR}/security/libfwbuilder
+.if !exists(/usr/include/getopt.h)
+LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+.endif
 
 USE_QT_VER=	3
 
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
index 7c1b02ccdfe4..b62bc85f0ce0 100644
--- a/security/fwbuilder2/distinfo
+++ b/security/fwbuilder2/distinfo
@@ -1 +1,2 @@
-MD5 (fwbuilder-2.0.2.tar.gz) = 1a31df4d7c6ddcbe9aa7ae861ea438d2
+MD5 (fwbuilder-2.0.4.tar.gz) = a63df33d38f4845cc5721cee9a10640b
+SIZE (fwbuilder-2.0.4.tar.gz) = 1064789
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
index 5d4c94261b96..6b90b86fe148 100644
--- a/security/fwbuilder2/pkg-plist
+++ b/security/fwbuilder2/pkg-plist
@@ -22,6 +22,10 @@ bin/fwbuilder
 %%DOCSDIR%%/ReleaseNotes_2.0.1.txt
 %%DOCSDIR%%/ReleaseNotes_2.0.2.html
 %%DOCSDIR%%/ReleaseNotes_2.0.2.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.3.html
+%%DOCSDIR%%/ReleaseNotes_2.0.3.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.4.html
+%%DOCSDIR%%/ReleaseNotes_2.0.4.txt
 %%DOCSDIR%%/PatchAcceptancePolicy.txt
 %%DATADIR%%/objects_init.xml
 %%DATADIR%%/templates.xml
@@ -41,8 +45,8 @@ bin/fwbuilder
 %%DATADIR%%/os/pix_os.xml
 %%DATADIR%%/os/unknown_os.xml
 %%DATADIR%%/locale/fwbuilder_fr.qm
+%%DATADIR%%/locale/fwbuilder_ja.qm
 %%DATADIR%%/locale/fwbuilder_ru.qm
-%%DATADIR%%/locale/fwbuilder_vi.qm
 @dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/platform
 @dirrm %%DATADIR%%/os