Date: Sat, 26 Jan 2019 12:40:45 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491274 - in head/www/foswiki: . files Message-ID: <201901261240.x0QCejJK016055@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sat Jan 26 12:40:44 2019 New Revision: 491274 URL: https://svnweb.freebsd.org/changeset/ports/491274 Log: 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) Added: head/www/foswiki/files/patch-tools_fix__file__permissions.sh (contents, props changed) head/www/foswiki/files/pkg-install.in (contents, props changed) Modified: head/www/foswiki/Makefile (contents, props changed) head/www/foswiki/bsd.foswiki.mk (contents, props changed) head/www/foswiki/files/pkg-message-noapache.in (contents, props changed) Modified: head/www/foswiki/Makefile ============================================================================== --- head/www/foswiki/Makefile Sat Jan 26 12:29:22 2019 (r491273) +++ head/www/foswiki/Makefile Sat Jan 26 12:40:44 2019 (r491274) @@ -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 @@ -71,6 +77,10 @@ post-patch: ${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} Modified: head/www/foswiki/bsd.foswiki.mk ============================================================================== --- head/www/foswiki/bsd.foswiki.mk Sat Jan 26 12:29:22 2019 (r491273) +++ head/www/foswiki/bsd.foswiki.mk Sat Jan 26 12:40:44 2019 (r491274) @@ -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/} Added: head/www/foswiki/files/patch-tools_fix__file__permissions.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/foswiki/files/patch-tools_fix__file__permissions.sh Sat Jan 26 12:40:44 2019 (r491274) @@ -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} Added: head/www/foswiki/files/pkg-install.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/foswiki/files/pkg-install.in Sat Jan 26 12:40:44 2019 (r491274) @@ -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 Modified: head/www/foswiki/files/pkg-message-noapache.in ============================================================================== --- head/www/foswiki/files/pkg-message-noapache.in Sat Jan 26 12:29:22 2019 (r491273) +++ head/www/foswiki/files/pkg-message-noapache.in Sat Jan 26 12:40:44 2019 (r491274) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901261240.x0QCejJK016055>