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

Collapse All | Expand All

(-)Makefile (-36 / +15 lines)
Lines 19-39 Link Here
19
19
20
USES=		cpe perl5 tar:tgz
20
USES=		cpe perl5 tar:tgz
21
NO_BUILD=	yes
21
NO_BUILD=	yes
22
NO_ARCH=	yes
22
23
23
OPTIONS_DEFINE=	OPTINT OPTOTH APACHE
24
OPTIONS_DEFINE=	OPTINT OPTOTH APACHE
24
OPTIONS_DEFAULT=	OPTINT OPTOTH
25
OPTIONS_DEFAULT=	OPTINT OPTOTH
25
OPTINT_DESC=	Install Perl modules for intl character support
26
OPTIONS_SUB=	yes
26
OPTOTH_DESC=	Install other optional Perl modules
27
OPTINT_DESC=	Perl modules for intl character support
27
APACHE_DESC=	Install Apache web server and sample config file
28
OPTOTH_DESC=	Other optional Perl modules
29
APACHE_DESC=	Apache web server and sample config file
28
30
29
.include <bsd.port.options.mk>
31
OPTINT_RUN_DEPENDS=	p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon
30
32
OPTOTH_RUN_DEPENDS=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
31
.if ${PORT_OPTIONS:MOPTINT}
32
RUN_DEPENDS+=	p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon
33
.endif
34
35
.if ${PORT_OPTIONS:MOPTOTH}
36
RUN_DEPENDS+=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
37
		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
33
		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
38
		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
34
		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
39
		p5-CGI-Session>=4.40:${PORTSDIR}/www/p5-CGI-Session \
35
		p5-CGI-Session>=4.40:${PORTSDIR}/www/p5-CGI-Session \
Lines 44-72 Link Here
44
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
40
		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
45
		p5-HTML-Tree>=3.23:${PORTSDIR}/www/p5-HTML-Tree \
41
		p5-HTML-Tree>=3.23:${PORTSDIR}/www/p5-HTML-Tree \
46
		p5-Net>=1.19:${PORTSDIR}/net/p5-Net
42
		p5-Net>=1.19:${PORTSDIR}/net/p5-Net
47
.endif
43
APACHE_USE=	APACHE_RUN=22+
44
APACHE_SUB_FILES=	pkg-message-apache
45
APACHE_SUB_LIST=	FOSCONFDIR=${CONFDIR}
46
APACHE_PLIST_SUB=	CONFDIR=${APACHEETCDIR}/Includes
47
APACHE_VARS=	PKGMESSAGE=pkg-message-apache \
48
		CONFDIR=${PREFIX}/${APACHEETCDIR}/Includes
49
APACHE_VARS_OFF=	PKGMESSAGE=pkg-message-noapache
48
50
49
.if ${PORT_OPTIONS:MAPACHE}
50
USE_APACHE_RUN?=22+
51
PLIST_SUB+=	NOAPACHE=""
52
PKGMESSAGE=	pkg-message-apache
53
SUB_FILES+=	pkg-message-apache
54
55
CONFDIR_REL=	${APACHEETCDIR}/Includes
56
CONFDIR=	${PREFIX}/${CONFDIR_REL}
57
58
PLIST_SUB+=	CONFDIR=${CONFDIR_REL}
59
.else
60
# Weirdness - need to include in this branch of the .if because
61
# it was included in the other one. The other branch needs the
62
# include performed after the USE_APACHE variable is set so
63
# APACHE_VERSION can be tested above.
64
65
PLIST_SUB+=	NOAPACHE="@comment "
66
PKGMESSAGE=	pkg-message-noapache
67
SUB_FILES+=	pkg-message-noapache
68
.endif
69
70
SUB_FILES+=	LocalSite.cfg
51
SUB_FILES+=	LocalSite.cfg
71
PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
52
PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
72
53
Lines 91-98 Link Here
91
		LocalLib.cfg
72
		LocalLib.cfg
92
	@${FIND} ${WRKSRC} -name \*.orig -delete
73
	@${FIND} ${WRKSRC} -name \*.orig -delete
93
74
94
post-install:
75
post-install-APACHE-on:
95
.if ${PORT_OPTIONS:MAPACHE}
96
	@${MKDIR} ${STAGEDIR}${CONFDIR}
76
	@${MKDIR} ${STAGEDIR}${CONFDIR}
97
	@if [ -d "${STAGEDIR}${CONFDIR}" ]; then \
77
	@if [ -d "${STAGEDIR}${CONFDIR}" ]; then \
98
	  ${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
78
	  ${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
Lines 105-111 Link Here
105
	  ${ECHO_MSG} "" ; \
85
	  ${ECHO_MSG} "" ; \
106
	  ${FALSE} ; \
86
	  ${FALSE} ; \
107
	fi
87
	fi
108
.endif
109
88
110
.include "${.CURDIR}/bsd.foswiki.mk"
89
.include "${.CURDIR}/bsd.foswiki.mk"
111
.include <bsd.port.mk>
90
.include <bsd.port.mk>
(-)bsd.foswiki.mk (-7 lines)
Lines 50-62 Link Here
50
		${XARGS} ${TOUCH} && \
50
		${XARGS} ${TOUCH} && \
51
		${TAR} cjvf ${DISTNAME}.tar.bz2 ${DISTNAME}
51
		${TAR} cjvf ${DISTNAME}.tar.bz2 ${DISTNAME}
52
52
53
create-plist:	extract
54
	@${FIND} -s ${WRKSRC} -not -type d |\
55
		${SED} -e 's|^${WRKSRC}|%%FWDIR%%|' > ${PLIST}
56
	@${FIND} -ds ${WRKSRC} -type d -not -name ${DISTNAME} | \
57
		${SED} -e "s,^${WRKSRC},@dirrm %%FWDIR%%," >> ${PLIST}
58
	@${ECHO_CMD} '@dirrm %%FWDIR%%' >> ${PLIST}
59
60
do-install:
53
do-install:
61
	@${INSTALL} -d ${STAGEDIR}${FWDIR}/
54
	@${INSTALL} -d ${STAGEDIR}${FWDIR}/
62
	@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${FWDIR}/
55
	@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${FWDIR}/
(-)files/pkg-message-apache.in (-4 / +4 lines)
Lines 4-18 Link Here
4
4
5
To complete the installation, please:
5
To complete the installation, please:
6
6
7
- Copy %%CONFDIR%%/foswiki.conf.sample to
7
- Copy %%FOSCONFDIR%%/foswiki.conf.sample to
8
  %%CONFDIR%%/foswiki.conf 
8
  %%FOSCONFDIR%%/foswiki.conf 
9
9
10
- Review the contents of %%CONFDIR%%/foswiki.conf
10
- Review the contents of %%FOSCONFDIR%%/foswiki.conf
11
  to ensure they match your local security policies, and modify the
11
  to ensure they match your local security policies, and modify the
12
  file if necessary.
12
  file if necessary.
13
13
14
- If you want to configure Foswiki from a remote machine, search for the
14
- If you want to configure Foswiki from a remote machine, search for the
15
  following in %%CONFDIR%%/foswiki.conf:
15
  following in %%FOSCONFDIR%%/foswiki.conf:
16
16
17
  <FilesMatch "^configure.*">
17
  <FilesMatch "^configure.*">
18
      SetHandler cgi-script
18
      SetHandler cgi-script
(-)pkg-plist (+1 lines)
Lines 1-3 Link Here
1
%%APACHE%%%%CONFDIR%%/foswiki.conf.sample
1
%%WWWDIR%%/AUTHORS
2
%%WWWDIR%%/AUTHORS
2
%%WWWDIR%%/COPYING
3
%%WWWDIR%%/COPYING
3
%%WWWDIR%%/COPYRIGHT
4
%%WWWDIR%%/COPYRIGHT

Return to bug 206323