www/foswiki: cleanup

* Add missing dependencies
* Fix permissions

PR:		234586
Submitted by:	Sam Chen <sc.gear@one.caeon.com>
Approved by:	maintainer timeout (portmaster@bsdforge.com, >2 weeks)

5 files changed, 53 insertions, 0 deletions

diff --git a/www/foswiki/Makefile b/www/foswiki/Makefile
index 37bd73be1a9a..251a92699a43 100644
--- a/www/foswiki/Makefile
+++ b/www/foswiki/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	foswiki
 PORTVERSION=	2.1.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 DISTNAME=	Foswiki-${PORTVERSION}
@@ -14,10 +15,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	p5-Error>=0.15:lang/p5-Error \
 		p5-Algorithm-Diff>=1.1901:devel/p5-Algorithm-Diff \
+		p5-CGI>=3.15:www/p5-CGI \
+		p5-Email-MIME>=1.903:mail/p5-Email-MIME \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-JSON>=0:converters/p5-JSON \
 		p5-Text-Diff>=0.35:textproc/p5-Text-Diff \
 		p5-Sort-Maker>=0.06:devel/p5-Sort-Maker
 
 USES=		cpe perl5 tar:tgz
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
@@ -72,6 +78,10 @@ post-patch:
 		LocalLib.cfg
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
+pre-install:
+	@cd ${WRKSRC} && \
+		${PERL} tools/rewriteshebang.pl -p ${PERL} -d ${WRKSRC}/bin -d ${WRKSRC}/tools --noask
+
 post-install-APACHE-on:
 	@${MKDIR} ${STAGEDIR}${CONFDIR}
 	${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
diff --git a/www/foswiki/bsd.foswiki.mk b/www/foswiki/bsd.foswiki.mk
index 831a80e63d76..f0d775cad5ad 100644
--- a/www/foswiki/bsd.foswiki.mk
+++ b/www/foswiki/bsd.foswiki.mk
@@ -39,6 +39,7 @@ PLIST_SUB+=	FWDIR=${FWDIR:S|^${PREFIX}/||}
 SUB_LIST+=	FWDIR=${FWDIR} FIND=${FIND} CHMOD=${CHMOD} CHOWN=${CHOWN} \
 		TOUCH=${TOUCH} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \
 		CONFDIR=${CONFDIR}
+SUB_FILES+=	pkg-install
 MAINTAINER?=	glarkin@FreeBSD.org
 RUN_DEPENDS+=	${FWDEP:C/([^=<>]*)([=<>]*)(.*)/foswiki-\1\20.0.\3:www\/foswiki-\1/}
 
diff --git a/www/foswiki/files/patch-tools_fix__file__permissions.sh b/www/foswiki/files/patch-tools_fix__file__permissions.sh
new file mode 100644
index 000000000000..6381ea62f71f
--- /dev/null
+++ b/www/foswiki/files/patch-tools_fix__file__permissions.sh
@@ -0,0 +1,11 @@
+--- tools/fix_file_permissions.sh.orig	2019-01-03 16:11:17 UTC
++++ tools/fix_file_permissions.sh
+@@ -6,7 +6,7 @@
+ # servers, the "world" permissions should be removed, and the corresponding changes made to
+ # the configuration variables listed below.
+ 
+-OPT=-c              # -c: Show changes.   On FreeBSD,  needs to be -vv
++OPT=-vv             # -c: Show changes.   On FreeBSD,  needs to be -vv
+ 
+ ROOT=444            # Server root read only
+ DIR=755             # Directories need "exec" for directory operations. Matches {Store}{dirPermission}
diff --git a/www/foswiki/files/pkg-install.in b/www/foswiki/files/pkg-install.in
new file mode 100644
index 000000000000..49d83a0ad3ed
--- /dev/null
+++ b/www/foswiki/files/pkg-install.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+FWDIR=%%FWDIR%%
+WWWDIR=%%WWWDIR%%
+WWWOWN=%%WWWOWN%%
+WWWGRP=%%WWWGRP%%
+
+case $2 in
+	PRE-INSTALL)
+		;;
+	POST-INSTALL)
+		chown -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
+
+		cd ${WWWDIR}
+		sh tools/fix_file_permissions.sh > /dev/null 2>&1
+		;;
+	*)
+		echo "Unexpected Argument $2!!!"
+		exit 1
+		;;
+esac
+exit 0
diff --git a/www/foswiki/files/pkg-message-noapache.in b/www/foswiki/files/pkg-message-noapache.in
index f12b6a3e00f8..68a58b05c678 100644
--- a/www/foswiki/files/pkg-message-noapache.in
+++ b/www/foswiki/files/pkg-message-noapache.in
@@ -2,6 +2,12 @@
 You have just installed Foswiki without configuring it for a specific
 web server.
 
+Path to foswiki: %%FWDIR%%
+
 To complete the installation, please visit:
 http://foswiki.org/System/InstallationGuide
 
+Notes for Apache 2.4 users:
+* Generate a new foswiki.conf for Apache 2.4:
+    https://foswiki.org/Support.ApacheConfigGenerator
+* Enable these DSO modules in httpd.conf: cgi_module, rewrite_module