3 files changed, 95 insertions, 110 deletions

diff --git a/security/webfwlog/Makefile b/security/webfwlog/Makefile
index e5dfce3ee535..530f4c104ed2 100644
--- a/security/webfwlog/Makefile
+++ b/security/webfwlog/Makefile
@@ -6,15 +6,11 @@
 #
 
 PORTNAME=	webfwlog
-PORTVERSION=	0.92
+PORTVERSION=	0.93
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	http://devel.webfwlog.net/download/patches/
-PATCHFILES=	webfwlog-0.92-date_syntax_url.patch
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	zeus@ix.netcom.com
 COMMENT=	A web-based firewall log analyzer
 
@@ -31,11 +27,10 @@ WANT_PHP_WEB=	yes
 # Set HTML_DOC_ROOT to your webserver's Document Root where you
 # want to install webfwlog, relative to ${PREFIX}.
 
-HTML_DOC_ROOT?=	www/data
-
-PLIST_SUB=	HTML_DOC_ROOT=${HTML_DOC_ROOT}
-
 SUB_FILES=	pkg-message
+DOCS=		README AUTHORS COPYING \
+		CREDITS ChangeLog INSTALL \
+		README ReleaseNotes
 
 .include <bsd.port.pre.mk>
 
@@ -49,29 +44,26 @@ USE_PGSQL=
 CONFIGURE_ARGS+=--with-pgsql
 .endif
 
-pre-install:
-	@${MKDIR} ${PREFIX}/${HTML_DOC_ROOT}
+do-install:
+	@${MKDIR} ${WWWDIR}
+	@${MKDIR} ${WWWDIR}/include/
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
+	@(cd ${WRKSRC}/webfwlog/include/ && ${COPYTREE_SHARE} \* ${WWWDIR}/include/)
+	${INSTALL_PROGRAM} ${WRKSRC}/syslog/wfwl_syslog ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/webfwlog/style.css ${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/webfwlog/index.php ${WWWDIR}
 
 post-install:
-
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/COPYING ${WRKSRC}/AUTHORS ${WRKSRC}/README \
-		${WRKSRC}/INSTALL ${WRKSRC}/CREDITS ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/ChangeLog ${WRKSRC}/ReleaseNotes ${DOCSDIR}
-
-	@${MKDIR} ${DOCSDIR}/mysql/scripts
-	@${INSTALL_MAN} ${WRKSRC}/mysql/README ${WRKSRC}/mysql/setup ${DOCSDIR}/mysql
-	@${INSTALL_MAN} ${WRKSRC}/mysql/scripts/* ${DOCSDIR}/mysql/scripts
-	@${CHMOD} a+x ${DOCSDIR}/mysql/setup
-
-	@${MKDIR} ${DOCSDIR}/pgsql/scripts
-	@${INSTALL_MAN} ${WRKSRC}/pgsql/README ${WRKSRC}/pgsql/setup ${DOCSDIR}/pgsql
-	@${INSTALL_MAN} ${WRKSRC}/pgsql/scripts/* ${DOCSDIR}/pgsql/scripts
-	@${CHMOD} a+x ${DOCSDIR}/pgsql/setup
-
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_MAN} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${DOCSDIR}/mysql
+	@${MKDIR} ${DOCSDIR}/pgsql
+	@(cd ${WRKSRC}/mysql/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/mysql/)
+	@(cd ${WRKSRC}/pgsql/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/pgsql/)
+.for FILE in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+.endfor
 .endif
 
 	@if test -f ${PREFIX}/etc/webfwlog.conf; \
@@ -90,10 +82,6 @@ post-install:
 		${RM} -f ${PREFIX}/etc/webfwlog.conf; \
 	fi
 	@${RM} -f ${PREFIX}/etc/webfwlog.conf.new
-	@${CHMOD} 0555 ${PREFIX}/${HTML_DOC_ROOT}/webfwlog
-	@${CHMOD} 0555 ${PREFIX}/${HTML_DOC_ROOT}/webfwlog/include
-	@${CHOWN} :${WWWGRP} ${PREFIX}/bin/wfwl_syslog
-	@${CHMOD} o-wrx ${PREFIX}/bin/wfwl_syslog
 
 	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
diff --git a/security/webfwlog/distinfo b/security/webfwlog/distinfo
index c3e2dceb7a46..2ef70b58b2cb 100644
--- a/security/webfwlog/distinfo
+++ b/security/webfwlog/distinfo
@@ -1,6 +1,3 @@
-MD5 (webfwlog-0.92.tar.gz) = c0c94543bdb5694febf40352a0fae0dd
-SHA256 (webfwlog-0.92.tar.gz) = 374230f485a276036490a7fc9c500ebb00e9b7db5a83461fed5d50018175b1f7
-SIZE (webfwlog-0.92.tar.gz) = 246148
-MD5 (webfwlog-0.92-date_syntax_url.patch) = 9e30ea72a6724d6a9adff91754906aa8
-SHA256 (webfwlog-0.92-date_syntax_url.patch) = 11abd961fc327af4aad3d907ef4e8cfaf4ec0ec1d70acf2f478ef313856c255a
-SIZE (webfwlog-0.92-date_syntax_url.patch) = 1147
+MD5 (webfwlog-0.93.tar.gz) = 85f863bf11f882486169ac0b5bb36d22
+SHA256 (webfwlog-0.93.tar.gz) = 25cf014e1580c9e270cc07bbc6a5c51e12617d6695f67e281f5a1bb4ed9779ef
+SIZE (webfwlog-0.93.tar.gz) = 271426
diff --git a/security/webfwlog/pkg-plist b/security/webfwlog/pkg-plist
index 518643bcbce8..43d1727a348d 100644
--- a/security/webfwlog/pkg-plist
+++ b/security/webfwlog/pkg-plist
@@ -1,74 +1,74 @@
 bin/wfwl_syslog
 etc/webfwlog.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes
-%%PORTDOCS%%%%DOCSDIR%%/mysql/README
-%%PORTDOCS%%%%DOCSDIR%%/mysql/setup
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/temp_grants
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/ulog_copy
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/ulog_local
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/ulogd_grants
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_grants
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_hostnames_create
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_addcol
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_altercol
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_reports_create
-%%PORTDOCS%%%%DOCSDIR%%/mysql/scripts/wfwl_services_create
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/README
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/setup
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/ulog_copy
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/ulog_local
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/ulogd_73_grants
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/ulogd_grants
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_73_grants
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_functions
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_grants
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_hostnames_create
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_reports_addcol
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_reports_create
-%%PORTDOCS%%%%DOCSDIR%%/pgsql/scripts/wfwl_services_create
-%%PORTDOCS%%%%EXAMPLESDIR%%/basic
-%%PORTDOCS%%%%EXAMPLESDIR%%/current_count
-%%PORTDOCS%%%%EXAMPLESDIR%%/current_dport
-%%PORTDOCS%%%%EXAMPLESDIR%%/last20hosts
-%%PORTDOCS%%%%EXAMPLESDIR%%/latest_logged_packets
-%%PORTDOCS%%%%EXAMPLESDIR%%/recent_active
-%%PORTDOCS%%%%EXAMPLESDIR%%/tcpports
-%%PORTDOCS%%%%EXAMPLESDIR%%/tcpsyn
-%%PORTDOCS%%%%EXAMPLESDIR%%/udpports
-%%HTML_DOC_ROOT%%/webfwlog/include/config.php
-%%HTML_DOC_ROOT%%/webfwlog/include/criteria.php
-%%HTML_DOC_ROOT%%/webfwlog/include/debug.php
-%%HTML_DOC_ROOT%%/webfwlog/include/delete_report.php
-%%HTML_DOC_ROOT%%/webfwlog/include/edit_doc.php
-%%HTML_DOC_ROOT%%/webfwlog/include/edit_report.php
-%%HTML_DOC_ROOT%%/webfwlog/include/functions.php
-%%HTML_DOC_ROOT%%/webfwlog/include/home.php
-%%HTML_DOC_ROOT%%/webfwlog/include/html_out.php
-%%HTML_DOC_ROOT%%/webfwlog/include/import.php
-%%HTML_DOC_ROOT%%/webfwlog/include/orders.php
-%%HTML_DOC_ROOT%%/webfwlog/include/packet.php
-%%HTML_DOC_ROOT%%/webfwlog/include/save_report.php
-%%HTML_DOC_ROOT%%/webfwlog/include/selection.php
-%%HTML_DOC_ROOT%%/webfwlog/include/sorting.php
-%%HTML_DOC_ROOT%%/webfwlog/include/sql.php
-%%HTML_DOC_ROOT%%/webfwlog/include/state.php
-%%HTML_DOC_ROOT%%/webfwlog/include/static.php
-%%HTML_DOC_ROOT%%/webfwlog/include/syslog.php
-%%HTML_DOC_ROOT%%/webfwlog/include/update_cache.php
-%%HTML_DOC_ROOT%%/webfwlog/style.css
-%%HTML_DOC_ROOT%%/webfwlog/index.php
-@dirrm %%HTML_DOC_ROOT%%/webfwlog/include
-@dirrm %%HTML_DOC_ROOT%%/webfwlog
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pgsql/scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pgsql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/mysql/scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/mysql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry www/data
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/CREDITS
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/README
+%%DOCSDIR%%/ReleaseNotes
+%%DOCSDIR%%/mysql/README
+%%DOCSDIR%%/mysql/setup
+%%DOCSDIR%%/mysql/scripts/temp_grants
+%%DOCSDIR%%/mysql/scripts/ulog_copy
+%%DOCSDIR%%/mysql/scripts/ulog_local
+%%DOCSDIR%%/mysql/scripts/ulogd_grants
+%%DOCSDIR%%/mysql/scripts/wfwl_grants
+%%DOCSDIR%%/mysql/scripts/wfwl_hostnames_create
+%%DOCSDIR%%/mysql/scripts/wfwl_reports_addcol
+%%DOCSDIR%%/mysql/scripts/wfwl_reports_altercol
+%%DOCSDIR%%/mysql/scripts/wfwl_reports_create
+%%DOCSDIR%%/mysql/scripts/wfwl_services_create
+%%DOCSDIR%%/pgsql/README
+%%DOCSDIR%%/pgsql/setup
+%%DOCSDIR%%/pgsql/scripts/ulog_copy
+%%DOCSDIR%%/pgsql/scripts/ulog_local
+%%DOCSDIR%%/pgsql/scripts/ulogd_73_grants
+%%DOCSDIR%%/pgsql/scripts/ulogd_grants
+%%DOCSDIR%%/pgsql/scripts/wfwl_73_grants
+%%DOCSDIR%%/pgsql/scripts/wfwl_functions
+%%DOCSDIR%%/pgsql/scripts/wfwl_grants
+%%DOCSDIR%%/pgsql/scripts/wfwl_hostnames_create
+%%DOCSDIR%%/pgsql/scripts/wfwl_reports_addcol
+%%DOCSDIR%%/pgsql/scripts/wfwl_reports_create
+%%DOCSDIR%%/pgsql/scripts/wfwl_services_create
+%%EXAMPLESDIR%%/basic
+%%EXAMPLESDIR%%/current_count
+%%EXAMPLESDIR%%/current_dport
+%%EXAMPLESDIR%%/last20hosts
+%%EXAMPLESDIR%%/latest_logged_packets
+%%EXAMPLESDIR%%/recent_active
+%%EXAMPLESDIR%%/tcpports
+%%EXAMPLESDIR%%/tcpsyn
+%%EXAMPLESDIR%%/udpports
+%%WWWDIR%%/include/config.php
+%%WWWDIR%%/include/criteria.php
+%%WWWDIR%%/include/debug.php
+%%WWWDIR%%/include/delete_report.php
+%%WWWDIR%%/include/edit_doc.php
+%%WWWDIR%%/include/edit_report.php
+%%WWWDIR%%/include/functions.php
+%%WWWDIR%%/include/home.php
+%%WWWDIR%%/include/html_out.php
+%%WWWDIR%%/include/import.php
+%%WWWDIR%%/include/orders.php
+%%WWWDIR%%/include/packet.php
+%%WWWDIR%%/include/save_report.php
+%%WWWDIR%%/include/selection.php
+%%WWWDIR%%/include/sorting.php
+%%WWWDIR%%/include/sql.php
+%%WWWDIR%%/include/state.php
+%%WWWDIR%%/include/static.php
+%%WWWDIR%%/include/syslog.php
+%%WWWDIR%%/include/update_cache.php
+%%WWWDIR%%/include/config.php.in
+%%WWWDIR%%/style.css
+%%WWWDIR%%/index.php
+@dirrm %%DOCSDIR%%/pgsql/scripts
+@dirrm %%DOCSDIR%%/pgsql
+@dirrm %%DOCSDIR%%/mysql/scripts
+@dirrm %%DOCSDIR%%/mysql
+@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%WWWDIR%%/include
+@dirrmtry %%WWWDIR%%