From owner-svn-ports-all@FreeBSD.ORG Sat May 24 20:04:43 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99EC4442; Sat, 24 May 2014 20:04:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 7A4A9292F; Sat, 24 May 2014 20:04:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OK4hp7079645; Sat, 24 May 2014 20:04:43 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OK4h8G079643; Sat, 24 May 2014 20:04:43 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201405242004.s4OK4h8G079643@svn.freebsd.org> From: Olli Hauer Date: Sat, 24 May 2014 20:04:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355076 - head/www/jspwiki X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 20:04:43 -0000 Author: ohauer Date: Sat May 24 20:04:42 2014 New Revision: 355076 URL: http://svnweb.freebsd.org/changeset/ports/355076 QAT: https://qat.redports.org/buildarchive/r355076/ Log: - add stage support - simplify install target, owner/group is set via pkg-plist - port use NO_BUILD=yes, so BUILD_DEPENDS= is not needed - use @sample macro - bump PORTREVISION Modified: head/www/jspwiki/Makefile head/www/jspwiki/pkg-plist Modified: head/www/jspwiki/Makefile ============================================================================== --- head/www/jspwiki/Makefile Sat May 24 19:22:01 2014 (r355075) +++ head/www/jspwiki/Makefile Sat May 24 20:04:42 2014 (r355076) @@ -3,7 +3,7 @@ PORTNAME= jspwiki PORTVERSION= 2.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www java MASTER_SITES= http://www.ecyrd.com/~jalkanen/JSPWiki/${PORTVERSION}/ DISTNAME= JSPWiki-${PORTVERSION}-bin @@ -26,25 +26,20 @@ PORTDOCS= ChangeLog README ReleaseNotes PLIST_SUB= TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||} +OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= AS OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 OPTIONS_DEFAULT= TOMCAT6 -NO_STAGE= yes - -OPTIONS_DEFINE= DOCS - .include .if ${PORT_OPTIONS:MTOMCAT6} TOMCATVER= apache-tomcat-6.0 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 .endif .if ${PORT_OPTIONS:MTOMCAT7} TOMCATVER= apache-tomcat-7.0 -BUILD_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 .endif @@ -53,25 +48,14 @@ post-extract: @${MKDIR} ${WRKDIR}/${WEBAPP} @${TAR} xf ${WRKDIR}/${PORTNAME}/JSPWiki.war -C ${WRKDIR}/${WEBAPP} .for file in jspwiki.policy jspwiki.properties web.xml - @${MV} ${WRKDIR}/${WEBAPP}/WEB-INF/${file} ${WRKDIR}/${WEBAPP}/WEB-INF/${file}.example + @${MV} ${WRKDIR}/${WEBAPP}/WEB-INF/${file} ${WRKDIR}/${WEBAPP}/WEB-INF/${file}.sample .endfor do-install: - ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${WEBAPPDIR}/${WEBAPP} - @(cd ${WRKDIR}/${WEBAPP} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${WEBAPP}) - @for file in jspwiki.policy jspwiki.properties web.xml ; do \ - if [ ! -e "${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file}" ]; then \ - ${ECHO_MSG} " Installing local configuration file: ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file"; \ - ${CP} ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$${file}.example ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file; \ - else \ - ${ECHO_MSG} " Preserving local configuration file: ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file"; \ - fi; \ - done - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/${PORTNAME}/|} ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${WEBAPP} + (cd ${WRKDIR}/${WEBAPP} && ${COPYTREE_SHARE} . ${STAGEDIR}${WEBAPPDIR}/${WEBAPP}) + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/${PORTNAME}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/jspwiki/pkg-plist ============================================================================== --- head/www/jspwiki/pkg-plist Sat May 24 19:22:01 2014 (r355075) +++ head/www/jspwiki/pkg-plist Sat May 24 20:04:42 2014 (r355076) @@ -1,6 +1,5 @@ -@unexec if cmp -s %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties.example; then rm -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties; else echo If permanently deleting this package, %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties must be removed manually; fi -@unexec if cmp -s %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy.example; then rm -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy; else echo If permanently deleting this package, %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy must be removed manually; fi -@unexec if cmp -s %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml.example; then rm -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml; else echo If permanently deleting this package, %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml must be removed manually; fi +@owner www +@group www %%TOMCATDIR%%/webapps/JSPWiki/Captcha.jsp %%TOMCATDIR%%/webapps/JSPWiki/Comment.jsp %%TOMCATDIR%%/webapps/JSPWiki/CookieError.jsp @@ -32,10 +31,8 @@ %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/dtd/web-app_2_3.dtd %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/geronimo-web.xml %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/groupdatabase.xml -%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy.example -@exec if [ ! -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy ]; then cp %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy.example %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy; fi -%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties.example -@exec if [ ! -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties ]; then cp %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties.example %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties; fi +@sample %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy.sample +@sample %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties.sample %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.tld %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jstl-fmt.tld %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/lib/JSPWiki.jar @@ -67,8 +64,7 @@ %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/lib/xmlrpc.jar %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/oscache.tld %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/userdatabase.xml -%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml.example -@exec if [ ! -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml ]; then cp %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml.example %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml; fi +@sample %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml.sample %%TOMCATDIR%%/webapps/JSPWiki/Wiki.jsp %%TOMCATDIR%%/webapps/JSPWiki/Workflow.jsp %%TOMCATDIR%%/webapps/JSPWiki/admin/Admin.jsp @@ -213,28 +209,31 @@ %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart/skin.css %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart/skin.js %%TOMCATDIR%%/webapps/JSPWiki/templates/raw/ViewTemplate.jsp -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/raw -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart/images -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/PlainVanilla 1024x768 -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/PlainVanilla +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/META-INF +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/classes +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/dtd +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/lib +@dirrmtry %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/admin +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/applets +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/error +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/images +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/scripts/fckeditor +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/scripts +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/admin +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/editors +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/images @dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/OrderedList/images @dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/OrderedList +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/PlainVanilla +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/PlainVanilla 1024x768 +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart/images +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart @dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/images -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/editors -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/admin @dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default +@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/raw @dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/scripts/fckeditor -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/scripts -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/images -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/error -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/applets -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/admin -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/lib -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/dtd -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/classes -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF -@dirrm %%TOMCATDIR%%/webapps/JSPWiki/META-INF -@dirrm %%TOMCATDIR%%/webapps/JSPWiki +@dirrmtry %%TOMCATDIR%%/webapps/JSPWiki +@comment reset owner for docs and examples +@owner root +@group wheel