Index: head/www/foswiki/Makefile
===================================================================
--- head/www/foswiki/Makefile	(revision 491273)
+++ head/www/foswiki/Makefile	(revision 491274)
@@ -1,81 +1,91 @@
 # $FreeBSD$
 
 PORTNAME=	foswiki
 PORTVERSION=	2.1.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 DISTNAME=	Foswiki-${PORTVERSION}
 
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Free and open source enterprise wiki
 
 LICENSE=	GPLv2
 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
 
 OPTIONS_DEFINE=	OPTINT OPTOTH APACHE
 OPTIONS_DEFAULT=	OPTINT OPTOTH
 OPTIONS_SUB=	yes
 OPTINT_DESC=	Perl modules for intl character support
 OPTOTH_DESC=	Other optional Perl modules
 APACHE_DESC=	Apache web server and sample config file
 
 OPTINT_RUN_DEPENDS=	p5-Locale-Maketext-Lexicon>=0:devel/p5-Locale-Maketext-Lexicon
 OPTOTH_RUN_DEPENDS=	p5-Apache-Htpasswd>=0:security/p5-Apache-Htpasswd \
 		p5-Cache-Cache>=0:devel/p5-Cache-Cache \
 		p5-CGI-Session>=4.40:www/p5-CGI-Session \
 		p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
 		p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS \
 		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
 		p5-Lingua-EN-Sentence>=0:textproc/p5-Lingua-EN-Sentence \
 		p5-libwww>=0:www/p5-libwww \
 		p5-HTML-Tree>=3.23:www/p5-HTML-Tree
 APACHE_USES=	apache:run
 APACHE_SUB_FILES=	pkg-message-apache
 APACHE_SUB_LIST=	FOSCONFDIR=${CONFDIR}
 APACHE_PLIST_SUB=	CONFDIR=${APACHEETCDIR}/Includes
 APACHE_VARS=	PKGMESSAGE=pkg-message-apache \
 		CONFDIR=${PREFIX}/${APACHEETCDIR}/Includes
 APACHE_SUB_FILES_OFF=	pkg-message-noapache
 APACHE_VARS_OFF=	PKGMESSAGE=pkg-message-noapache
 
 SUB_FILES+=	LocalSite.cfg
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 post-patch:
 	@${RM} -r ${WRKSRC}/lib/CPAN
 	@${MV} ${WRKSRC}/bin-htaccess-basic.txt ${WRKSRC}/bin/.htaccess-basic.txt
 	@${MV} ${WRKSRC}/bin-htaccess-advanced.txt ${WRKSRC}/bin/.htaccess-advanced.txt
 	@${CP} ${WRKSRC}/subdir-htaccess.txt ${WRKSRC}/working/.htaccess
 	@cd ${WRKSRC} && \
 		${REINPLACE_CMD} -i "" \
 		-e "s|^#[[:space:]]*\(.*\)/home/httpd/foswiki|\1${WWWDIR}|g" \
 		-e "s|^#[[:space:]]*\(.*\)\(\= \'/foswiki/\)|\1\2|g" \
 		-e "s|/bin/grep|/usr/bin/grep|g" \
 		lib/Foswiki.spec
 	@cd ${WRKSRC} && \
 		${REINPLACE_CMD} -i "" \
 		-e "s|/var/www/foswiki|${WWWDIR}|g" \
 		-e "s|192.168.1.10||g" \
 		foswiki_httpd_conf.txt
 	@cd ${WRKSRC}/bin && \
 		${INSTALL_DATA} LocalLib.cfg.txt LocalLib.cfg && \
 		${REINPLACE_CMD} -i "" -e "s|/absolute/path/to/your/lib|${WWWDIR}/lib|g" \
 		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 \
 		${STAGEDIR}${CONFDIR}/foswiki.conf.sample
 
 .include "${.CURDIR}/bsd.foswiki.mk"
 .include <bsd.port.mk>
Index: head/www/foswiki/bsd.foswiki.mk
===================================================================
--- head/www/foswiki/bsd.foswiki.mk	(revision 491273)
+++ head/www/foswiki/bsd.foswiki.mk	(revision 491274)
@@ -1,118 +1,119 @@
 # ex:ts=4 sw=4
 #
 # New ports collection makefile for:	foswiki infrastructure
 # Date created:		15 June 2009
 # Whom:			Greg Larkin <glarkin@FreeBSD.org>
 # Copied From Whom:	Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 #
 # For more info, please go to http://wiki.FreeBSD.org/TWiki
 #
 
 PORTVERSION?=	0.0.${SVNREV}
 .if ${PORTNAME} == foswiki
 .if ${.TARGETS} == make-port
 PNAME=
 .else
 PNAME=		core
 .endif
 FWDIR?=		${WWWDIR}
 .else
 PKGNAMEPREFIX?=	foswiki-
 PNAME=		${PORTNAME}
 FILESDIR?=	${.CURDIR}/../foswiki/files
 BUILD_DEPENDS+=	foswiki>=0:www/foswiki
 FWDIR?=		${WWWDIR}
 .endif
 
 MASTER_SITES?=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/glarkin
 DIST_SUBDIR?=	foswiki
 CATEGORIES?=	www
 SVNURL?=	http://svn.foswiki.org/trunk/${PNAME}
 NO_BUILD=	yes
 WWWDIR?=	${PREFIX}/www/foswiki
 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/}
 
 make-dist:
 	${INSTALL} -d ${WRKDIR}/
 	cd ${WRKDIR}/ && svn export -r ${SVNREV} ${SVNURL} && \
 		${MV} ${PNAME} ${DISTNAME} && \
 		${FIND} . -type d -empty | ${SED} -e 's|$$|/.keep_me|' | \
 		${XARGS} ${TOUCH} && \
 		${TAR} cjvf ${DISTNAME}.tar.bz2 ${DISTNAME}
 
 do-install:
 	@${INSTALL} -d ${STAGEDIR}${FWDIR}/
 	@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${FWDIR}/
 .if ${PORTNAME} == foswiki
 	@${INSTALL_DATA} ${WRKDIR}/LocalSite.cfg ${STAGEDIR}${WWWDIR}/lib/LocalSite.cfg.sample
 .endif
 
 make-fwdep: extract
 	@echo "FWDEP=`grep -v ^# ${WRKSRC}/lib/*[wW]iki/*/${PORTNAME}/DEPENDENCIES |\
 		grep -v ',cpan,'|cut -f1-2 -d, | ${SED} -e 's|.*::||;s|,||g' |\
 		tr '\n' ' ' | sed 's| $$||'`"
 	@echo "RUN_DEPENDS=`grep -v ^# ${WRKSRC}/lib/*[wW]iki/*/${PORTNAME}/DEPENDENCIES |\
 		grep ',cpan,' | cut -f1-2 -d, | ${SED} -e 's|::|-|' | while read a; do\
 			n=p5-$${a%%,*}; v=$${a##*,}; \
 			o=\`echo ${PORTSDIR}/*/$$n\`; : $${o:=${PORTSDIR}/X/$$n}; \
 			echo $$n$$v:'$${PORTSDIR}'$${o##${PORTSDIR}}; done`"
 
 make-port:
 	${INSTALL} -d ${_DISTDIR}
 	for n in ${name} ${names}; do\
 	cd ../ &&\
 	nnam="$${n%%:*}" &&\
 	nver="$${n##$$nnam}" &&\
 	nver="$${nver##:}" &&\
 	if [ -z "$$nver" ]; then \
 	nver=`svn log -q -l 1 ${SVNURL}$$nnam | grep -v '^--------' | awk '{ print $$1 }' | cut -c2-`; fi &&\
 	pnam="foswiki-$$nnam" &&\
 	if [ -d $$pnam ]; then continue; fi &&\
 	mkdir $$pnam/ && cd $$pnam/ &&\
 	echo "# New ports collection makefile for:	$$pnam" > Makefile &&\
 	date '+# Date created:%t%t%e %B %Y' >> Makefile &&\
 	echo '#' >> Makefile &&\
 	echo '# $$''FreeBSD$$' >> Makefile &&\
 	echo '#' >> Makefile &&\
 	echo >> Makefile &&\
 	echo "PORTNAME=	$$nnam" >> Makefile &&\
 	echo "MAINTAINER=	${MAINTAINER}" >> Makefile &&\
 	echo >> Makefile &&\
 	echo "SVNREV=		$$nver" >> Makefile &&\
 	echo >> Makefile &&\
 	echo 'COMMENT=	' >> Makefile &&\
 	echo >> Makefile &&\
 	echo 'BUILD_DEPENDS=	foswiki>=0:www/foswiki' >> Makefile &&\
 	echo >> Makefile &&\
 	echo '.include "$${.CURDIR}/../foswiki/bsd.foswiki.mk"' >> Makefile &&\
 	echo '.include <bsd.port.mk>' >> Makefile &&\
 	wrksrc=`make -V WRKSRC` &&\
 	make make-dist &&\
 	: "mv `make -V WRKDIR`/*bz2 ${_DISTDIR}/" &&\
 	: "make makesum create-plist" &&\
 	page1="$$wrksrc/data/TWiki/$$nnam.txt" &&\
 	page2="$$wrksrc/data/System/$$nnam.txt" &&\
 	if [ -e $$page1 ]; then \
 	page=$$page1; elif [ -e $$page2 ]; then \
 	page=$$page2; else \
 	echo "Could not locate $$page1 or $$page2"; exit; fi &&\
 	grep -m1 'Set SHORTDESC' $$page |\
 		sed -e 's|.*N = ||;s|<nop>||g;s|! |. |g;s|!||g;s|=||g' |\
 		fmt -w 70 > pkg-descr &&\
 	echo >> pkg-descr &&\
 	grep -m1 Author $$page|grep '^|' |cut -f3 -d'|' |\
 		sed -E 's|.+[wW]iki:Main[./]||g;s|^|Author: |;s|  | |g;s| $$||;\
 		s|([a-z]) |\1, |;s|([a-z])([A-Z])|\1 \2|g' >> pkg-descr &&\
 	echo "WWW:	http://www.foswiki.org/Support/$$nnam" >> pkg-descr;\
 
 	done
Index: head/www/foswiki/files/patch-tools_fix__file__permissions.sh
===================================================================
--- head/www/foswiki/files/patch-tools_fix__file__permissions.sh	(nonexistent)
+++ head/www/foswiki/files/patch-tools_fix__file__permissions.sh	(revision 491274)
@@ -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}

Property changes on: head/www/foswiki/files/patch-tools_fix__file__permissions.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/foswiki/files/pkg-install.in
===================================================================
--- head/www/foswiki/files/pkg-install.in	(nonexistent)
+++ head/www/foswiki/files/pkg-install.in	(revision 491274)
@@ -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

Property changes on: head/www/foswiki/files/pkg-install.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/foswiki/files/pkg-message-noapache.in
===================================================================
--- head/www/foswiki/files/pkg-message-noapache.in	(revision 491273)
+++ head/www/foswiki/files/pkg-message-noapache.in	(revision 491274)
@@ -1,7 +1,13 @@
 *********************************************************************
 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