View | Details | Raw Unified | Return to bug 234586 | Differences between
and this patch

Collapse All | Expand All

(-)www/foswiki/Makefile (+9 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	foswiki
3
PORTNAME=	foswiki
4
PORTVERSION=	2.1.6
4
PORTVERSION=	2.1.6
5
PORTREVISION=	1
5
CATEGORIES=	www
6
CATEGORIES=	www
6
MASTER_SITES=	SF
7
MASTER_SITES=	SF
7
DISTNAME=	Foswiki-${PORTVERSION}
8
DISTNAME=	Foswiki-${PORTVERSION}
Lines 14-19 Link Here
14
15
15
RUN_DEPENDS=	p5-Error>=0.15:lang/p5-Error \
16
RUN_DEPENDS=	p5-Error>=0.15:lang/p5-Error \
16
		p5-Algorithm-Diff>=1.1901:devel/p5-Algorithm-Diff \
17
		p5-Algorithm-Diff>=1.1901:devel/p5-Algorithm-Diff \
18
		p5-CGI>=3.15:www/p5-CGI \
19
		p5-Email-MIME>=1.903:mail/p5-Email-MIME \
20
		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
21
		p5-JSON>=0:converters/p5-JSON \
17
		p5-Text-Diff>=0.35:textproc/p5-Text-Diff \
22
		p5-Text-Diff>=0.35:textproc/p5-Text-Diff \
18
		p5-Sort-Maker>=0.06:devel/p5-Sort-Maker
23
		p5-Sort-Maker>=0.06:devel/p5-Sort-Maker
19
24
Lines 72-77 Link Here
72
		LocalLib.cfg
77
		LocalLib.cfg
73
	@${FIND} ${WRKSRC} -name \*.orig -delete
78
	@${FIND} ${WRKSRC} -name \*.orig -delete
74
79
80
pre-install:
81
	@cd ${WRKSRC} && \
82
		${PERL} tools/rewriteshebang.pl -p ${PERL} -d ${WRKSRC}/bin -d ${WRKSRC}/tools --noask
83
75
post-install-APACHE-on:
84
post-install-APACHE-on:
76
	@${MKDIR} ${STAGEDIR}${CONFDIR}
85
	@${MKDIR} ${STAGEDIR}${CONFDIR}
77
	${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
86
	${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
(-)www/foswiki/bsd.foswiki.mk (+1 lines)
Lines 39-44 Link Here
39
SUB_LIST+=	FWDIR=${FWDIR} FIND=${FIND} CHMOD=${CHMOD} CHOWN=${CHOWN} \
39
SUB_LIST+=	FWDIR=${FWDIR} FIND=${FIND} CHMOD=${CHMOD} CHOWN=${CHOWN} \
40
		TOUCH=${TOUCH} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \
40
		TOUCH=${TOUCH} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \
41
		CONFDIR=${CONFDIR}
41
		CONFDIR=${CONFDIR}
42
SUB_FILES+=	pkg-install
42
MAINTAINER?=	glarkin@FreeBSD.org
43
MAINTAINER?=	glarkin@FreeBSD.org
43
RUN_DEPENDS+=	${FWDEP:C/([^=<>]*)([=<>]*)(.*)/foswiki-\1\20.0.\3:www\/foswiki-\1/}
44
RUN_DEPENDS+=	${FWDEP:C/([^=<>]*)([=<>]*)(.*)/foswiki-\1\20.0.\3:www\/foswiki-\1/}
44
45
(-)www/foswiki/files/patch-tools_fix__file__permissions.sh (+11 lines)
Line 0 Link Here
1
--- tools/fix_file_permissions.sh.orig	2019-01-03 16:11:17 UTC
2
+++ tools/fix_file_permissions.sh
3
@@ -6,7 +6,7 @@
4
 # servers, the "world" permissions should be removed, and the corresponding changes made to
5
 # the configuration variables listed below.
6
 
7
-OPT=-c              # -c: Show changes.   On FreeBSD,  needs to be -vv
8
+OPT=-vv             # -c: Show changes.   On FreeBSD,  needs to be -vv
9
 
10
 ROOT=444            # Server root read only
11
 DIR=755             # Directories need "exec" for directory operations. Matches {Store}{dirPermission}
(-)www/foswiki/files/pkg-install.in (+25 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD: head/www/twiki/files/pkg-install.in 340719 2014-01-22 15:52:06Z mat $
4
#
5
6
FWDIR=%%FWDIR%%
7
WWWDIR=%%WWWDIR%%
8
WWWOWN=%%WWWOWN%%
9
WWWGRP=%%WWWGRP%%
10
11
case $2 in
12
	PRE-INSTALL)
13
		;;
14
	POST-INSTALL)
15
		chown -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
16
17
		cd ${WWWDIR}
18
		sh tools/fix_file_permissions.sh > /dev/null 2>&1
19
		;;
20
	*)
21
		echo "Unexpected Argument $2!!!"
22
		exit 1
23
		;;
24
esac
25
exit 0
(-)www/foswiki/files/pkg-message-noapache.in (+6 lines)
Lines 2-7 Link Here
2
You have just installed Foswiki without configuring it for a specific
2
You have just installed Foswiki without configuring it for a specific
3
web server.
3
web server.
4
4
5
Path to foswiki: %%FWDIR%%
6
5
To complete the installation, please visit:
7
To complete the installation, please visit:
6
http://foswiki.org/System/InstallationGuide
8
http://foswiki.org/System/InstallationGuide
7
9
10
Notes for Apache 2.4 users:
11
* Generate a new foswiki.conf for Apache 2.4:
12
    https://foswiki.org/Support.ApacheConfigGenerator
13
* Enable these DSO modules in httpd.conf: cgi_module, rewrite_module

Return to bug 234586