From owner-svn-ports-all@FreeBSD.ORG Sat May 24 19:22:01 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 E38CAA43; Sat, 24 May 2014 19:22:01 +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 CFC7D2629; Sat, 24 May 2014 19:22:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OJM1Pc061817; Sat, 24 May 2014 19:22:01 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OJM1uU061815; Sat, 24 May 2014 19:22:01 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201405241922.s4OJM1uU061815@svn.freebsd.org> From: Olli Hauer Date: Sat, 24 May 2014 19:22:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355075 - head/www/axis 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 19:22:02 -0000 Author: ohauer Date: Sat May 24 19:22:01 2014 New Revision: 355075 URL: http://svnweb.freebsd.org/changeset/ports/355075 QAT: https://qat.redports.org/buildarchive/r355075/ Log: - add stage support - add license - simplify install target, owner/group is set via pkg-plist - port use NO_BUILD=yes, so BUILD_DEPENDS= is not needed Modified: head/www/axis/Makefile head/www/axis/pkg-plist Modified: head/www/axis/Makefile ============================================================================== --- head/www/axis/Makefile Sat May 24 19:09:22 2014 (r355074) +++ head/www/axis/Makefile Sat May 24 19:22:01 2014 (r355075) @@ -12,26 +12,25 @@ DISTNAME= axis-bin-${PORTVERSION:S,.,_, MAINTAINER= ports@FreeBSD.org COMMENT= Java SOAP implementation by Apache -OPTIONS_SINGLE= AS +LICENSE= APACHE20 + +OPTIONS_SINGLE= AS OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 OPTIONS_DEFAULT= TOMCAT6 -NO_STAGE= yes -.include +.include .if ${PORT_OPTIONS:MTOMCAT6} WEBAPPDIR= ${PREFIX}/apache-tomcat-6.0/webapps -BUILD_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 RUN_DEPENDS+= ${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6 .endif .if ${PORT_OPTIONS:MTOMCAT7} WEBAPPDIR= ${PREFIX}/apache-tomcat-7.0/webapps -BUILD_DEPENDS+= ${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 RUN_DEPENDS+= ${LOCALBASE}/apache-tomcat-7.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7 .endif -NO_BUILD= YES +NO_BUILD= yes USE_JAVA= yes JAVA_VERSION= 1.6+ USER= www @@ -39,28 +38,21 @@ GROUP= www WRKSRC= ${WRKDIR}/axis-${PORTVERSION:S,.,_,g} -# -# Install procedure -# -SYSTEM_JARS= axis.jar jaxrpc.jar saaj.jar -PLIST_SUB+= WEBAPPS=${WEBAPPDIR:S|^${PREFIX}/||} USER=${USER} GROUP=${GROUP} - PORTDOCS= * PORTEXAMPLES= * +SYSTEM_JARS= axis.jar jaxrpc.jar saaj.jar +PLIST_SUB+= WEBAPPS=${WEBAPPDIR:S|^${PREFIX}/||} USER=${USER} GROUP=${GROUP} + do-install: -.for i in ${SYSTEM_JARS} - ${INSTALL_DATA} ${WRKSRC}/lib/${i} ${JAVAJARDIR} -.endfor - cd ${WRKSRC}/webapps && ${FIND} axis -type d -exec ${INSTALL} -d -g ${GROUP} -o ${USER} -m 755 ${WEBAPPDIR}/{} \; - cd ${WRKSRC}/webapps && ${FIND} axis -type f -exec ${INSTALL} -g ${GROUP} -o ${USER} -m 444 {} ${WEBAPPDIR}/{} \; -.if ${PORT_OPTIONS:MDOCS} - cd ${WRKSRC}/docs && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; - cd ${WRKSRC}/docs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - cd ${WRKSRC}/samples && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; - cd ${WRKSRC}/samples && ${FIND} . -type f -not -name '*.class' -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \; -.endif + ${INSTALL_DATA} ${SYSTEM_JARS:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${JAVAJARDIR} + @${MKDIR} ${STAGEDIR}${WEBAPPDIR} + (cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} axis ${STAGEDIR}${WEBAPPDIR}) + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/ "! -name *.class") -.include +.include Modified: head/www/axis/pkg-plist ============================================================================== --- head/www/axis/pkg-plist Sat May 24 19:09:22 2014 (r355074) +++ head/www/axis/pkg-plist Sat May 24 19:22:01 2014 (r355075) @@ -1,6 +1,5 @@ -%%JAVAJARDIR%%/axis.jar -%%JAVAJARDIR%%/jaxrpc.jar -%%JAVAJARDIR%%/saaj.jar +@owner www +@group www %%WEBAPPS%%/axis/EchoHeaders.jws %%WEBAPPS%%/axis/SOAPMonitorApplet.java %%WEBAPPS%%/axis/StockQuoteService.jws @@ -173,37 +172,43 @@ %%WEBAPPS%%/axis/i18nLib.jsp %%WEBAPPS%%/axis/index.html %%WEBAPPS%%/axis/index.jsp -@dirrm %%WEBAPPS%%/axis/WEB-INF/lib -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example6 -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example5 -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example4 -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example3 -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example2 -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example1 -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/transport/tcp -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/transport -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/swa -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/stock -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/proxy -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/perf -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/misc -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/message -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/math -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc/hello -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc/address -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/integrationGuide/example2 +%%JAVAJARDIR%%/axis.jar +%%JAVAJARDIR%%/jaxrpc.jar +%%JAVAJARDIR%%/saaj.jar +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/addr +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/attachments +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/bidbuy +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/echo +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/encoding +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/faults +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/handler @dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/integrationGuide/example1 +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/integrationGuide/example2 @dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/integrationGuide -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/handler -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/faults -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/encoding -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/echo -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/bidbuy -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/attachments -@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/addr +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc/address +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc/hello +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/math +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/message +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/misc +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/perf +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/proxy +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/stock +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/swa +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/transport/tcp +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/transport +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example1 +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example2 +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example3 +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example4 +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example5 +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example6 +@dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide @dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples @dirrm %%WEBAPPS%%/axis/WEB-INF/classes +@dirrm %%WEBAPPS%%/axis/WEB-INF/lib @dirrm %%WEBAPPS%%/axis/WEB-INF @dirrm %%WEBAPPS%%/axis +@comment reset owner for docs and examples +@owner root +@group wheel