- Update to 0.6

PR:		ports/80063
Submitted by:	Renato Botelho <freebsd@galle.com.br> (maintainer)

5 files changed, 49 insertions, 23 deletions

diff --git a/security/pfw/Makefile b/security/pfw/Makefile
index b1b6e09..217f58d 100644
--- a/security/pfw/Makefile
+++ b/security/pfw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pfw
-PORTVERSION=	0.5.3
+PORTVERSION=	0.6
 CATEGORIES=	security www
 MASTER_SITES=	http://www.allard.nu/pfw/download/
 EXTRACT_SUFX=	.tgz
@@ -28,16 +28,18 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-IGNORE=		"pf is only in 5.x"
+IGNORE=		pf is only in 5.x
 .elif ${OSVERSION} < 502105
 RUN_DEPENDS+=	pf:${PORTSDIR}/security/pf
 .endif
 
 do-install:
-	@${MKDIR} ${PFW_PREFIX} ${PFW_PREFIX}/bin ${PFW_PREFIX}/lib ${PFW_PREFIX}/web
+.for dir in conf lib web
+	@${MKDIR} ${PFW_PREFIX}/${dir}
+	@${CP} -Rv ${WRKSRC}/${dir}/* ${PFW_PREFIX}/${dir}
+.endfor
 	@${CP} -v ${WRKSRC}/INSTALL ${WRKSRC}/README ${PFW_PREFIX}
-	@${CP} -Rv ${WRKSRC}/web/* ${PFW_PREFIX}/web
-	@${CP} -Rv ${WRKSRC}/lib/* ${PFW_PREFIX}/lib
+	@${MKDIR} ${PFW_PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/pfctlwrapper.sh.remote ${PFW_PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/pfctlwrapper.sh ${PFW_PREFIX}/bin
 
diff --git a/security/pfw/distinfo b/security/pfw/distinfo
index 4eae0d0..7a71e3d 100644
--- a/security/pfw/distinfo
+++ b/security/pfw/distinfo
@@ -1,2 +1,2 @@
-MD5 (pfw-0.5.3.tgz) = d0442820beb5b2389c3b577f1bd4f900
-SIZE (pfw-0.5.3.tgz) = 28474
+MD5 (pfw-0.6.tgz) = 67b28218ea1910237221ccda186828b3
+SIZE (pfw-0.6.tgz) = 69960
diff --git a/security/pfw/files/pkg-message.in b/security/pfw/files/pkg-message.in
index 98b0336..2f03fd2 100644
--- a/security/pfw/files/pkg-message.in
+++ b/security/pfw/files/pkg-message.in
@@ -15,7 +15,13 @@ don't do anything nasty before doing this :-)
 http://httpd.apache.org/docs/howto/auth.html and add authentication
 accordingly.
 
-If you want to use pfw to update a remote pfw, please read the
+4) Add the following line to your httpd.conf:
+
+Alias /pfw/ "%%PFW_PREFIX%%/web/"
+
+Restart apache and access pfw as http://localhost/pfw/
+
+5) If you want to use pfw to update a remote pfw, please read the
 documentation in %%PFW_PREFIX%%/bin/pfwctlwrapper.sh.remote.
 
 That's it. Pfw is now installed and ready to be used.
diff --git a/security/pfw/pkg-descr b/security/pfw/pkg-descr
index f979596..7387150 100644
--- a/security/pfw/pkg-descr
+++ b/security/pfw/pkg-descr
@@ -1,23 +1,19 @@
 A web frontend for the pf firewall written in PHP.
 
-What works?
+Features
 
-    o Editing of macro, address translation, scrub, tables and
-      filter rules. See the screenshots to see which options has been
-      implemented.
-    o Queues - works as of version 0.5.
-    o Importing your current rulebase. And please backup your current
-      /etc/pf.conf before you install pfw.
+With the exceptions listed below, everything that can be done with
+pf can be done through pfw. This includes:
+
+    o Editing of all pf rules types like macros, address translation,
+      queues, scrub, tables and filter rules.
+    o Importing your current rulebase. Please backup your current
+      /etc/pf.conf before installing pfw.
     o Installing the rulebase. This is not just a rulebase generator,
       it will read and write to and from your /etc/pf.conf file and
       reload pf through pfctl.
-    o pfw makes an effort to preserving configurations currently
-      not supported.
-
-What doesn't work yet?
-
-    o Advanced filter options like dup-to & fastroute.
-    o Specifications using negated hosts, nets,... like !www.freebsd.org.
+    o Standard based xhtml 1.1 and CSS 2.0 compliant code with
+      separate print style sheet that will print your ruleset nicely.
 
 Author: Allard Consulting
 WWW: http://www.allard.nu/pfw/
diff --git a/security/pfw/pkg-plist b/security/pfw/pkg-plist
index 31de5a6..09a8ee8 100644
--- a/security/pfw/pkg-plist
+++ b/security/pfw/pkg-plist
@@ -3,7 +3,14 @@ www/pfw/INSTALL
 www/pfw/README
 www/pfw/bin/pfctlwrapper.sh
 www/pfw/bin/pfctlwrapper.sh.remote
+www/pfw/conf/isakmpd.conf
+www/pfw/conf/pf-bart.conf
+www/pfw/conf/pf-demo.conf
+www/pfw/conf/pf-holodoc.conf
+www/pfw/conf/pf-test1.conf
+www/pfw/conf/pf.conf
 www/pfw/lib/altq.class.php
+www/pfw/lib/anchor.class.php
 www/pfw/lib/filter.class.php
 www/pfw/lib/macro.class.php
 www/pfw/lib/nat.class.php
@@ -15,6 +22,9 @@ www/pfw/lib/scrub.class.php
 www/pfw/lib/table.class.php
 www/pfw/web/altq.php
 www/pfw/web/altqedit.php
+www/pfw/web/anchor.php
+www/pfw/web/anchoredit.php
+www/pfw/web/anchorloadedit.php
 www/pfw/web/commentedit.php
 www/pfw/web/config.php
 www/pfw/web/filter.php
@@ -24,20 +34,32 @@ www/pfw/web/index.php
 www/pfw/web/install.php
 www/pfw/web/macro.php
 www/pfw/web/macroedit.php
+www/pfw/web/manual/altq.php
+www/pfw/web/manual/anchor.php
+www/pfw/web/manual/filter.php
+www/pfw/web/manual/macro.php
+www/pfw/web/manual/nat.php
+www/pfw/web/manual/options.php
+www/pfw/web/manual/queue.php
+www/pfw/web/manual/scrub.php
+www/pfw/web/manual/table.php
 www/pfw/web/menu.php
 www/pfw/web/nat.php
 www/pfw/web/natedit.php
 www/pfw/web/options.php
+www/pfw/web/print.css
 www/pfw/web/queue.php
 www/pfw/web/queueedit.php
+www/pfw/web/screen.css
 www/pfw/web/scrub.php
 www/pfw/web/scrubedit.php
-www/pfw/web/stylesheet.css
 www/pfw/web/table.php
 www/pfw/web/tableedit.php
 www/pfw/web/test.php
 www/pfw/web/write.php
 @dirrm www/pfw/bin
+@dirrm www/pfw/conf
 @dirrm www/pfw/lib
+@dirrm www/pfw/web/manual
 @dirrm www/pfw/web
 @dirrm www/pfw