From owner-svn-ports-all@freebsd.org Mon Aug 31 12:16:26 2015 Return-Path: Delivered-To: svn-ports-all@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 F0DE69C2D6F; Mon, 31 Aug 2015 12:16:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.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 E04B3C1B; Mon, 31 Aug 2015 12:16:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7VCGQwP065483; Mon, 31 Aug 2015 12:16:26 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7VCGQ0T065481; Mon, 31 Aug 2015 12:16:26 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508311216.t7VCGQ0T065481@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 31 Aug 2015 12:16:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395667 - head/net/activemq 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.20 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: Mon, 31 Aug 2015 12:16:27 -0000 Author: amdmi3 Date: Mon Aug 31 12:16:25 2015 New Revision: 395667 URL: https://svnweb.freebsd.org/changeset/ports/395667 Log: - Add LICENSE_FILE - Switch to options helpers - Switch to @sample Approved by: portmgr blanket Modified: head/net/activemq/Makefile head/net/activemq/pkg-plist Modified: head/net/activemq/Makefile ============================================================================== --- head/net/activemq/Makefile Mon Aug 31 12:11:24 2015 (r395666) +++ head/net/activemq/Makefile Mon Aug 31 12:16:25 2015 (r395667) @@ -10,6 +10,7 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Messaging and Integration Patterns provider LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe CPE_VENDOR= apache @@ -67,26 +68,12 @@ PLIST_SUB= MQUSER="${MQUSER}" \ OPTIONS_DEFINE= DOCS EXAMPLES -.include - post-patch: @${REINPLACE_CMD} -e 's|activemq.base}/data|activemq.logs}|g' ${WRKSRC}/conf/log4j.properties do-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ -.for f in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ -.endfor -.endif - @${MKDIR} ${STAGEDIR}${MQDATA} ${STAGEDIR}${MQDATA}/bin ${STAGEDIR}${ETCDIR} -.if ${PORT_OPTIONS:MEXAMPLES} - @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.endif - .for f in ${ETC_FILES} ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor @@ -107,4 +94,14 @@ do-install: @${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${MQDATA}/examples @${LN} -sf ${DOCSDIR} ${STAGEDIR}${MQDATA}/docs +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ +.for f in ${DOC_FILES} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ +.endfor + +do-install-EXAMPLES-on: + @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} + .include Modified: head/net/activemq/pkg-plist ============================================================================== --- head/net/activemq/pkg-plist Mon Aug 31 12:11:24 2015 (r395666) +++ head/net/activemq/pkg-plist Mon Aug 31 12:16:25 2015 (r395667) @@ -346,57 +346,23 @@ lib/activemq/webapps/styles/type-setting %%PORTDOCS%%%%DOCSDIR%%/user-guide.html @owner %%MQUSER%% @group %%MQGROUP%% -@unexec if cmp -s %D/%%ETCDIR%%/activemq.xml %D/%%ETCDIR%%/activemq.xml.sample ; then rm -f %D/%%ETCDIR%%/activemq.xml ; fi -%%ETCDIR%%/activemq.xml.sample -@exec if [ ! -f %B/activemq.xml ]; then cp -p %D/%F %B/activemq.xml; fi -@unexec if cmp -s %D/%%ETCDIR%%/credentials-enc.properties %D/%%ETCDIR%%/credentials-enc.properties.sample ; then rm -f %D/%%ETCDIR%%/credentials-enc.properties ; fi -%%ETCDIR%%/credentials-enc.properties.sample -@exec if [ ! -f %B/credentials-enc.properties ]; then cp -p %D/%F %B/credentials-enc.properties; fi -@unexec if cmp -s %D/%%ETCDIR%%/credentials.properties %D/%%ETCDIR%%/credentials.properties.sample ; then rm -f %D/%%ETCDIR%%/credentials.properties ; fi -%%ETCDIR%%/credentials.properties.sample -@exec if [ ! -f %B/credentials.properties ]; then cp -p %D/%F %B/credentials.properties; fi -@unexec if cmp -s %D/%%ETCDIR%%/jetty-realm.properties %D/%%ETCDIR%%/jetty-realm.properties.sample ; then rm -f %D/%%ETCDIR%%/jetty-realm.properties ; fi -%%ETCDIR%%/jetty-realm.properties.sample -@exec if [ ! -f %B/jetty-realm.properties ]; then cp -p %D/%F %B/jetty-realm.properties; fi -@unexec if cmp -s %D/%%ETCDIR%%/jetty.xml %D/%%ETCDIR%%/jetty.xml.sample ; then rm -f %D/%%ETCDIR%%/jetty.xml ; fi -%%ETCDIR%%/jetty.xml.sample -@exec if [ ! -f %B/jetty.xml ]; then cp -p %D/%F %B/jetty.xml; fi -@unexec if cmp -s %D/%%ETCDIR%%/jmx.access %D/%%ETCDIR%%/jmx.access.sample ; then rm -f %D/%%ETCDIR%%/jmx.access ; fi -%%ETCDIR%%/jmx.access.sample -@exec if [ ! -f %B/jmx.access ]; then cp -p %D/%F %B/jmx.access; fi -@unexec if cmp -s %D/%%ETCDIR%%/jmx.password %D/%%ETCDIR%%/jmx.password.sample ; then rm -f %D/%%ETCDIR%%/jmx.password ; fi -%%ETCDIR%%/jmx.password.sample -@exec if [ ! -f %B/jmx.password ]; then cp -p %D/%F %B/jmx.password; fi -@unexec if cmp -s %D/%%ETCDIR%%/log4j.properties %D/%%ETCDIR%%/log4j.properties.sample ; then rm -f %D/%%ETCDIR%%/log4j.properties ; fi -%%ETCDIR%%/log4j.properties.sample -@exec if [ ! -f %B/log4j.properties ]; then cp -p %D/%F %B/log4j.properties; fi -@unexec if cmp -s %D/%%ETCDIR%%/logging.properties %D/%%ETCDIR%%/logging.properties.sample ; then rm -f %D/%%ETCDIR%%/logging.properties ; fi -%%ETCDIR%%/logging.properties.sample -@exec if [ ! -f %B/logging.properties ]; then cp -p %D/%F %B/logging.properties; fi -@unexec if cmp -s %D/%%ETCDIR%%/broker-localhost.cert %D/%%ETCDIR%%/broker-localhost.cert.sample ; then rm -f %D/%%ETCDIR%%/broker-localhost.cert ; fi -%%ETCDIR%%/broker-localhost.cert.sample -@exec if [ ! -f %B/broker-localhost.cert ]; then cp -p %D/%F %B/broker-localhost.cert; fi -@unexec if cmp -s %D/%%ETCDIR%%/broker.ks %D/%%ETCDIR%%/broker.ks.sample ; then rm -f %D/%%ETCDIR%%/broker.ks ; fi -%%ETCDIR%%/broker.ks.sample -@exec if [ ! -f %B/broker.ks ]; then cp -p %D/%F %B/broker.ks; fi -@unexec if cmp -s %D/%%ETCDIR%%/broker.ts %D/%%ETCDIR%%/broker.ts.sample ; then rm -f %D/%%ETCDIR%%/broker.ts ; fi -%%ETCDIR%%/broker.ts.sample -@exec if [ ! -f %B/broker.ts ]; then cp -p %D/%F %B/broker.ts; fi -@unexec if cmp -s %D/%%ETCDIR%%/client.ks %D/%%ETCDIR%%/client.ks.sample ; then rm -f %D/%%ETCDIR%%/client.ks ; fi -%%ETCDIR%%/client.ks.sample -@exec if [ ! -f %B/client.ks ]; then cp -p %D/%F %B/client.ks; fi -@unexec if cmp -s %D/%%ETCDIR%%/client.ts %D/%%ETCDIR%%/client.ts.sample ; then rm -f %D/%%ETCDIR%%/client.ts ; fi -%%ETCDIR%%/client.ts.sample -@exec if [ ! -f %B/client.ts ]; then cp -p %D/%F %B/client.ts; fi -@unexec if cmp -s %D/%%ETCDIR%%/groups.properties %D/%%ETCDIR%%/groups.properties.sample ; then rm -f %D/%%ETCDIR%%/groups.properties ; fi -%%ETCDIR%%/groups.properties.sample -@exec if [ ! -f %B/groups.properties ]; then cp -p %D/%F %B/groups.properties; fi -@unexec if cmp -s %D/%%ETCDIR%%/login.config %D/%%ETCDIR%%/login.config.sample ; then rm -f %D/%%ETCDIR%%/login.config ; fi -%%ETCDIR%%/login.config.sample -@exec if [ ! -f %B/login.config ]; then cp -p %D/%F %B/login.config; fi -@unexec if cmp -s %D/%%ETCDIR%%/users.properties %D/%%ETCDIR%%/users.properties.sample ; then rm -f %D/%%ETCDIR%%/users.properties ; fi -%%ETCDIR%%/users.properties.sample -@exec if [ ! -f %B/users.properties ]; then cp -p %D/%F %B/users.properties; fi +@sample %%ETCDIR%%/activemq.xml.sample +@sample %%ETCDIR%%/credentials-enc.properties.sample +@sample %%ETCDIR%%/credentials.properties.sample +@sample %%ETCDIR%%/jetty-realm.properties.sample +@sample %%ETCDIR%%/jetty.xml.sample +@sample %%ETCDIR%%/jmx.access.sample +@sample %%ETCDIR%%/jmx.password.sample +@sample %%ETCDIR%%/log4j.properties.sample +@sample %%ETCDIR%%/logging.properties.sample +@sample %%ETCDIR%%/broker-localhost.cert.sample +@sample %%ETCDIR%%/broker.ks.sample +@sample %%ETCDIR%%/broker.ts.sample +@sample %%ETCDIR%%/client.ks.sample +@sample %%ETCDIR%%/client.ts.sample +@sample %%ETCDIR%%/groups.properties.sample +@sample %%ETCDIR%%/login.config.sample +@sample %%ETCDIR%%/users.properties.sample @owner root @group wheel %%PORTEXAMPLES%%%%EXAMPLESDIR%%/amqp/java/pom.xml