Attachment #165703 for bug #206323





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:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon
OPTOTH_RUN_DEPENDS=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
.if ${PORT_OPTIONS:MOPTINT}
RUN_DEPENDS+=	p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon
.endif

.if ${PORT_OPTIONS:MOPTOTH}
RUN_DEPENDS+=	p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \
		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
		p5-CGI-Session>=4.40:${PORTSDIR}/www/p5-CGI-Session \

		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
		p5-HTML-Tree>=3.23:${PORTSDIR}/www/p5-HTML-Tree \
		p5-Net>=1.19:${PORTSDIR}/net/p5-Net
APACHE_USE=	APACHE_RUN=22+
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

.if ${PORT_OPTIONS:MAPACHE}
USE_APACHE_RUN?=22+
PLIST_SUB+=	NOAPACHE=""
PKGMESSAGE=	pkg-message-apache
SUB_FILES+=	pkg-message-apache

CONFDIR_REL=	${APACHEETCDIR}/Includes
CONFDIR=	${PREFIX}/${CONFDIR_REL}

PLIST_SUB+=	CONFDIR=${CONFDIR_REL}
.else
# Weirdness - need to include in this branch of the .if because
# it was included in the other one. The other branch needs the
# include performed after the USE_APACHE variable is set so
# APACHE_VERSION can be tested above.

PLIST_SUB+=	NOAPACHE="@comment "
PKGMESSAGE=	pkg-message-noapache
SUB_FILES+=	pkg-message-noapache
.endif

SUB_FILES+=	LocalSite.cfg
PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}


		LocalLib.cfg
	@${FIND} ${WRKSRC} -name \*.orig -delete

post-install-APACHE-on:
.if ${PORT_OPTIONS:MAPACHE}
	@${MKDIR} ${STAGEDIR}${CONFDIR}
	@if [ -d "${STAGEDIR}${CONFDIR}" ]; then \
	  ${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \

	  ${ECHO_MSG} "" ; \
	  ${FALSE} ; \
	fi
.endif

.include "${.CURDIR}/bsd.foswiki.mk"
.include <bsd.port.mk>




		${XARGS} ${TOUCH} && \
		${TAR} cjvf ${DISTNAME}.tar.bz2 ${DISTNAME}

create-plist:	extract
	@${FIND} -s ${WRKSRC} -not -type d |\
		${SED} -e 's|^${WRKSRC}|%%FWDIR%%|' > ${PLIST}
	@${FIND} -ds ${WRKSRC} -type d -not -name ${DISTNAME} | \
		${SED} -e "s,^${WRKSRC},@dirrm %%FWDIR%%," >> ${PLIST}
	@${ECHO_CMD} '@dirrm %%FWDIR%%' >> ${PLIST}

do-install:
	@${INSTALL} -d ${STAGEDIR}${FWDIR}/
	@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${FWDIR}/





To complete the installation, please:

- Copy %%FOSCONFDIR%%/foswiki.conf.sample to
  %%FOSCONFDIR%%/foswiki.conf 

- Review the contents of %%FOSCONFDIR%%/foswiki.conf
  to ensure they match your local security policies, and modify the
  file if necessary.

- If you want to configure Foswiki from a remote machine, search for the
  following in %%FOSCONFDIR%%/foswiki.conf:

  <FilesMatch "^configure.*">
      SetHandler cgi-script

Lines 1-3 Link Here

(-)pkg-plist (+1 lines)
		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

Lines 19-39 Link Here

(-)Makefile (-36 / +16 lines)
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_SUB_FILES_OFF= pkg-message-noapache
		50	APACHE_VARS_OFF= PKGMESSAGE=pkg-message-noapache
48		51
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	52	SUB_FILES+= LocalSite.cfg
71	PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}	53	PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
72		54
Lines 91-98 Link Here
91	LocalLib.cfg	73	LocalLib.cfg
92	@${FIND} ${WRKSRC} -name \*.orig -delete	74	@${FIND} ${WRKSRC} -name \*.orig -delete
93		75
94	post-install:	76	post-install-APACHE-on:
95	.if ${PORT_OPTIONS:MAPACHE}
96	@${MKDIR} ${STAGEDIR}${CONFDIR}	77	@${MKDIR} ${STAGEDIR}${CONFDIR}
97	@if [ -d "${STAGEDIR}${CONFDIR}" ]; then \	78	@if [ -d "${STAGEDIR}${CONFDIR}" ]; then \
98	${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \	79	${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \
Lines 105-111 Link Here
105	${ECHO_MSG} "" ; \	86	${ECHO_MSG} "" ; \
106	${FALSE} ; \	87	${FALSE} ; \
107	fi	88	fi
108	.endif
109		89
110	.include "${.CURDIR}/bsd.foswiki.mk"	90	.include "${.CURDIR}/bsd.foswiki.mk"
111	.include <bsd.port.mk>	91	.include <bsd.port.mk>

Lines 50-62 Link Here

(-)bsd.foswiki.mk (-7 lines)
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}/

Lines 4-18 Link Here

(-)files/pkg-message-apache.in (-4 / +4 lines)
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