From owner-svn-ports-all@FreeBSD.ORG Tue Jul 1 10:10:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D80B1858; Tue, 1 Jul 2014 10:10:36 +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 C4AB92D9F; Tue, 1 Jul 2014 10:10:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61AAa77085365; Tue, 1 Jul 2014 10:10:36 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61AAa1i085362; Tue, 1 Jul 2014 10:10:36 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201407011010.s61AAa1i085362@svn.freebsd.org> From: Bernhard Froehlich Date: Tue, 1 Jul 2014 10:10:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359974 - head/www/helma 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: Tue, 01 Jul 2014 10:10:36 -0000 Author: decke Date: Tue Jul 1 10:10:35 2014 New Revision: 359974 URL: http://svnweb.freebsd.org/changeset/ports/359974 QAT: https://qat.redports.org/buildarchive/r359974/ Log: - Stagify - Use @sample - Replace NOPORTDOCS - Use new syntax for optional run dependency - Bump PORTREVISION Modified: head/www/helma/Makefile head/www/helma/pkg-plist Modified: head/www/helma/Makefile ============================================================================== --- head/www/helma/Makefile Tue Jul 1 09:49:26 2014 (r359973) +++ head/www/helma/Makefile Tue Jul 1 10:10:35 2014 (r359974) @@ -33,17 +33,13 @@ PLIST_SUB= DBDIR="${DBDIR}" \ HELMA_GROUP="${HELMA_GROUP}" OPTIONS_DEFINE= MYSQL +OPTIONS_SUB= yes OPTIONS_DESC= "Install MySQL Connector for Java" -NO_STAGE= yes -.include -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif +MYSQL_RUN_DEPENDS= ${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java + +.include post-patch: @${REINPLACE_CMD} -e 's|JAVA_HOME=/usr/lib/j2sdk1.5-sun|JAVA_HOME=${JAVA_HOME}|' \ @@ -77,41 +73,38 @@ post-patch: ${WRKBASE}/server.properties do-install: - ${INSTALL_SCRIPT} ${FILESDIR}/helma.sh.in ${PREFIX}/bin/helma + ${INSTALL_SCRIPT} ${FILESDIR}/helma.sh.in ${STAGEDIR}${PREFIX}/bin/helma - ${MKDIR} ${WWWDIR} && \ - (cd ${WRKBASE} && ${COPYTREE_SHARE} "apps modules" ${WWWDIR} \ + ${MKDIR} ${STAGEDIR}${WWWDIR} && \ + (cd ${WRKBASE} && ${COPYTREE_SHARE} "apps modules" ${STAGEDIR}${WWWDIR} \ "! -name *.html ! -name helma-*.jar ! -name .jsdoc") && \ - ${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${WWWDIR} + ${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${STAGEDIR}${WWWDIR} - ${MKDIR} ${DATADIR} && \ - (cd ${WRKBASE} && ${COPYTREE_SHARE} "lib launcher.jar" ${DATADIR} \ + ${MKDIR} ${STAGEDIR}${DATADIR} && \ + (cd ${WRKBASE} && ${COPYTREE_SHARE} "lib launcher.jar" ${STAGEDIR}${DATADIR} \ "! -name *.html ! -name helma-*.jar ! -name .jsdoc") - ${MKDIR} ${LOGDIR} && \ - ${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${LOGDIR} + ${MKDIR} ${STAGEDIR}${LOGDIR} && \ + ${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${STAGEDIR}${LOGDIR} - ${MKDIR} ${DBDIR} && \ - ${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${DBDIR} + ${MKDIR} ${STAGEDIR}${DBDIR} && \ + ${CHOWN} -R ${HELMA_USER}:${HELMA_GROUP} ${STAGEDIR}${DBDIR} - ${MKDIR} ${ETCDIR}; \ + ${MKDIR} ${STAGEDIR}${ETCDIR}; \ for f in apps.properties db.properties server.properties scripts/helma.conf; do \ - ${INSTALL_DATA} ${WRKBASE}/$$f ${ETCDIR}/$${f##*/}.sample; \ - if [ ! -f ${ETCDIR}/$${f##*/} ]; then \ - ${CP} -p ${ETCDIR}/$${f##*/}.sample ${ETCDIR}/$${f##*/}; \ - fi; \ + ${INSTALL_DATA} ${WRKBASE}/$$f ${STAGEDIR}${ETCDIR}/$${f##*/}.sample; \ done -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} && \ - (cd ${WRKBASE} && ${COPYTREE_SHARE} "licenses license.txt README.txt" ${DOCSDIR}) +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} && \ + (cd ${WRKBASE} && ${COPYTREE_SHARE} "licenses license.txt README.txt" ${STAGEDIR}${DOCSDIR}) - ${MKDIR} ${DOCSDIR}/docs/api/jala && \ - (cd ${WRKBASE}/modules/jala/docs && ${COPYTREE_SHARE} \* ${DOCSDIR}/docs/api/jala) + ${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/api/jala && \ + (cd ${WRKBASE}/modules/jala/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/docs/api/jala) .endif .if ${PORT_OPTIONS:MMYSQL} - ${LN} -sf ${JAVALIBDIR}/mysql-connector-java.jar ${DATADIR}/lib/ext/mysql-connector-java.jar + ${LN} -sf ${JAVALIBDIR}/mysql-connector-java.jar ${STAGEDIR}${DATADIR}/lib/ext/mysql-connector-java.jar .endif .include Modified: head/www/helma/pkg-plist ============================================================================== --- head/www/helma/pkg-plist Tue Jul 1 09:49:26 2014 (r359973) +++ head/www/helma/pkg-plist Tue Jul 1 10:10:35 2014 (r359974) @@ -1,15 +1,8 @@ -@unexec if cmp -s %D/%%ETCDIR%%/apps.properties.sample %D/%%ETCDIR%%/apps.properties; then rm -f %D/%%ETCDIR%%/apps.properties; fi -%%ETCDIR%%/apps.properties.sample -@exec if [ ! -f %D/%%ETCDIR%%/apps.properties ] ; then cp -p %D/%%ETCDIR%%/apps.properties.sample %D/%%ETCDIR%%/apps.properties; fi -@unexec if cmp -s %D/%%ETCDIR%%/db.properties.sample %D/%%ETCDIR%%/db.properties; then rm -f %D/%%ETCDIR%%/db.properties; fi -%%ETCDIR%%/db.properties.sample -@exec if [ ! -f %D/%%ETCDIR%%/db.properties ] ; then cp -p %D/%%ETCDIR%%/db.properties.sample %D/%%ETCDIR%%/db.properties; fi -@unexec if cmp -s %D/%%ETCDIR%%/helma.conf.sample %D/%%ETCDIR%%/helma.conf; then rm -f %D/%%ETCDIR%%/helma.conf; fi -%%ETCDIR%%/helma.conf.sample -@exec if [ ! -f %D/%%ETCDIR%%/helma.conf ] ; then cp -p %D/%%ETCDIR%%/helma.conf.sample %D/%%ETCDIR%%/helma.conf; fi -@unexec if cmp -s %D/%%ETCDIR%%/server.properties.sample %D/%%ETCDIR%%/server.properties; then rm -f %D/%%ETCDIR%%/server.properties; fi -%%ETCDIR%%/server.properties.sample -@exec if [ ! -f %D/%%ETCDIR%%/server.properties ] ; then cp -p %D/%%ETCDIR%%/server.properties.sample %D/%%ETCDIR%%/server.properties; fi +@comment $FreeBSD: ports/www/helma/pkg-plist,v 1.2 2008/12/22 21:13:15 miwi Exp $ +@sample %%ETCDIR%%/apps.properties.sample +@sample %%ETCDIR%%/db.properties.sample +@sample %%ETCDIR%%/helma.conf.sample +@sample %%ETCDIR%%/server.properties.sample @unexec rm -rf "%%LOGDIR%%" 2> /dev/null || true @exec mkdir -p "%%LOGDIR%%" || true @exec chown -R %%HELMA_USER%%:%%HELMA_GROUP%% "%%LOGDIR%%"