- Add needed patch

- Fix options so they work
- Add dependencies on required php extensions
- Install the executable setuid so it can actually access the logs

PR:		ports/140399
Submitted by:	Bob Hockney <zeus@ix.netcom.com> (maintainer)

4 files changed, 26 insertions, 14 deletions

diff --git a/security/webfwlog/Makefile b/security/webfwlog/Makefile
index 1699a4b9bc43..0aa07409cdef 100644
--- a/security/webfwlog/Makefile
+++ b/security/webfwlog/Makefile
@@ -7,45 +7,55 @@
 
 PORTNAME=	webfwlog
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
+PATCHFILES=	webfwlog-0.94-tcpflags.patch
+PATCH_SITES=	http://devel.webfwlog.net/download/patches/
+
 MAINTAINER=	zeus@ix.netcom.com
 COMMENT=	A web-based firewall log analyzer
 
 OPTIONS=	MYSQL "Include MySQL Support" on \
-		POSTGRESQL "Include PostgreSQL Support" off
+		PGSQL "Include PostgreSQL Support" off
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-html-doc-root=${PREFIX}/${HTML_DOC_ROOT}
-CONFIGURE_ARGS+=--enable-syslog
+CONFIGURE_ARGS+=	--with-html-doc-root=${PREFIX}
+CONFIGURE_ARGS+=	--enable-syslog
 
-USE_PHP=	yes
+USE_PHP=	session pcre
 WANT_PHP_WEB=	yes
 
-# Set HTML_DOC_ROOT to your webserver's Document Root where you
-# want to install webfwlog, relative to ${PREFIX}.
-
 SUB_FILES=	pkg-message
+SUB_LIST+=	VERSION=${PORTVERSION}
 
 PORTDOCS=	AUTHORS COPYING CREDITS ChangeLog INSTALL \
 		README ReleaseNotes
 PORTEXAMPLES=	*
 
+.include <bsd.port.options.mk>
+
 .if defined(WITH_MYSQL)
+USE_PHP+=	mysql
 USE_MYSQL=	yes
-CONFIGURE_ARGS+=--with-mysql
+CONFIGURE_ARGS+=	--with-mysql
 .endif
 
-.if defined(WITH_POSTGRESQL)
-USE_PGSQL=
-CONFIGURE_ARGS+=--with-pgsql
+.if defined(WITH_PGSQL)
+USE_PHP+=	pgsql
+USE_PGSQL=	yes
+CONFIGURE_ARGS+=	--with-pgsql
 .endif
 
+BINMODE=	4550
+BINGRP=	${WWWGRP}
+
 do-install:
 	@${MKDIR} ${WWWDIR}
 	@${MKDIR} ${WWWDIR}/include/
-	@(cd ${WRKSRC}/webfwlog/include/ && ${COPYTREE_SHARE} \* ${WWWDIR}/include/)
+	@(cd ${WRKSRC}/webfwlog/include/ && ${COPYTREE_SHARE} \*.php ${WWWDIR}/include/)
+	${CHMOD} 555 ${WWWDIR}/include
 	${INSTALL_PROGRAM} ${WRKSRC}/syslog/wfwl_syslog ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/webfwlog/style.css ${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webfwlog/index.php ${WWWDIR}
diff --git a/security/webfwlog/distinfo b/security/webfwlog/distinfo
index 51e180438fd4..b3ad851bcbb7 100644
--- a/security/webfwlog/distinfo
+++ b/security/webfwlog/distinfo
@@ -1,3 +1,6 @@
 MD5 (webfwlog-0.94.tar.gz) = 5af2fbbd36b039c004592e9dbf10ccc1
 SHA256 (webfwlog-0.94.tar.gz) = c1b84dd4036aa9f81fc4fbd527eda202e51c3767659b8f1eef12bfb3381c5b36
 SIZE (webfwlog-0.94.tar.gz) = 288138
+MD5 (webfwlog-0.94-tcpflags.patch) = 4d8a8e5f926832e504b196582b0fc85d
+SHA256 (webfwlog-0.94-tcpflags.patch) = b29df0df2b62ec99f121e50033b852e1a5177f0db1b31ecf12a8c535a16812dd
+SIZE (webfwlog-0.94-tcpflags.patch) = 455
diff --git a/security/webfwlog/files/pkg-message.in b/security/webfwlog/files/pkg-message.in
index f7d96251a245..672055d5d2c7 100644
--- a/security/webfwlog/files/pkg-message.in
+++ b/security/webfwlog/files/pkg-message.in
@@ -1,4 +1,4 @@
-Webfwlog-0.91 has been installed.  You should read the README in the mysql or
+Webfwlog-%%VERSION%% has been installed.  You should read the README in the mysql or
 pgsql directoy in %%DOCSDIR%% for information
 on setting up your MySQL or PostgreSQL server for use with webfwlog, and also
 copy the webfwlog.conf.sample file in %%PREFIX%%/etc to webfwlog.conf and
diff --git a/security/webfwlog/pkg-plist b/security/webfwlog/pkg-plist
index 4e07820aacd9..6dfc46b3a88a 100644
--- a/security/webfwlog/pkg-plist
+++ b/security/webfwlog/pkg-plist
@@ -45,7 +45,6 @@ etc/webfwlog.conf.sample
 %%WWWDIR%%/include/static.php
 %%WWWDIR%%/include/syslog.php
 %%WWWDIR%%/include/update_cache.php
-%%WWWDIR%%/include/config.php.in
 %%WWWDIR%%/style.css
 %%WWWDIR%%/index.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pgsql/scripts