From owner-svn-ports-head@freebsd.org Mon Jan 18 16:04:24 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3694AA86600; Mon, 18 Jan 2016 16:04:24 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED7A81E04; Mon, 18 Jan 2016 16:04:23 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0IG4MUe013824; Mon, 18 Jan 2016 16:04:22 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0IG4Mhj013820; Mon, 18 Jan 2016 16:04:22 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601181604.u0IG4Mhj013820@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 18 Jan 2016 16:04:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406592 - in head/www/foswiki: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2016 16:04:24 -0000 Author: pawel Date: Mon Jan 18 16:04:22 2016 New Revision: 406592 URL: https://svnweb.freebsd.org/changeset/ports/406592 Log: - Remove create-plist target using deprecated @dirrm - Add NO_ARCH - Don't prefix options descriptions with Installs, this makes them folllow global naming standards - Convert to options helpers - Use FOSCONFDIR for files substitutions, CONFDIR is set earlier and defaults to /etc, now pkg-message have correct paths - Fix plist when APACHE=on PR: 206323 Submitted by: myself Approved by: maintainer Modified: head/www/foswiki/Makefile head/www/foswiki/bsd.foswiki.mk head/www/foswiki/files/pkg-message-apache.in head/www/foswiki/pkg-plist Modified: head/www/foswiki/Makefile ============================================================================== --- head/www/foswiki/Makefile Mon Jan 18 16:03:34 2016 (r406591) +++ head/www/foswiki/Makefile Mon Jan 18 16:04:22 2016 (r406592) @@ -19,21 +19,17 @@ RUN_DEPENDS= p5-Error>=0.15:${PORTSDIR}/ USES= cpe perl5 tar:tgz NO_BUILD= yes +NO_ARCH= yes OPTIONS_DEFINE= OPTINT OPTOTH APACHE OPTIONS_DEFAULT= OPTINT OPTOTH -OPTINT_DESC= Install Perl modules for intl character support -OPTOTH_DESC= Install other optional Perl modules -APACHE_DESC= Install Apache web server and sample config file - -.include - -.if ${PORT_OPTIONS:MOPTINT} -RUN_DEPENDS+= p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon -.endif +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 -.if ${PORT_OPTIONS:MOPTOTH} -RUN_DEPENDS+= p5-Apache-Htpasswd>=0:${PORTSDIR}/security/p5-Apache-Htpasswd \ +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 \ 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 \ @@ -44,28 +40,14 @@ RUN_DEPENDS+= p5-Apache-Htpasswd>=0:${PO 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 -.endif - -.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 +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 SUB_FILES+= LocalSite.cfg PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} @@ -91,8 +73,7 @@ post-patch: LocalLib.cfg @${FIND} ${WRKSRC} -name \*.orig -delete -post-install: -.if ${PORT_OPTIONS:MAPACHE} +post-install-APACHE-on: @${MKDIR} ${STAGEDIR}${CONFDIR} @if [ -d "${STAGEDIR}${CONFDIR}" ]; then \ ${INSTALL_DATA} ${WRKSRC}/foswiki_httpd_conf.txt \ @@ -105,7 +86,6 @@ post-install: ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi -.endif .include "${.CURDIR}/bsd.foswiki.mk" .include Modified: head/www/foswiki/bsd.foswiki.mk ============================================================================== --- head/www/foswiki/bsd.foswiki.mk Mon Jan 18 16:03:34 2016 (r406591) +++ head/www/foswiki/bsd.foswiki.mk Mon Jan 18 16:04:22 2016 (r406592) @@ -50,13 +50,6 @@ make-dist: ${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}/ Modified: head/www/foswiki/files/pkg-message-apache.in ============================================================================== --- head/www/foswiki/files/pkg-message-apache.in Mon Jan 18 16:03:34 2016 (r406591) +++ head/www/foswiki/files/pkg-message-apache.in Mon Jan 18 16:04:22 2016 (r406592) @@ -4,15 +4,15 @@ file. To complete the installation, please: -- Copy %%CONFDIR%%/foswiki.conf.sample to - %%CONFDIR%%/foswiki.conf +- Copy %%FOSCONFDIR%%/foswiki.conf.sample to + %%FOSCONFDIR%%/foswiki.conf -- Review the contents of %%CONFDIR%%/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 %%CONFDIR%%/foswiki.conf: + following in %%FOSCONFDIR%%/foswiki.conf: SetHandler cgi-script Modified: head/www/foswiki/pkg-plist ============================================================================== --- head/www/foswiki/pkg-plist Mon Jan 18 16:03:34 2016 (r406591) +++ head/www/foswiki/pkg-plist Mon Jan 18 16:04:22 2016 (r406592) @@ -1,3 +1,4 @@ +%%APACHE%%%%CONFDIR%%/foswiki.conf.sample %%WWWDIR%%/AUTHORS %%WWWDIR%%/COPYING %%WWWDIR%%/COPYRIGHT