svn commit: r355075 - head/www/axis

Sat May 24 19:22:02 UTC 2014

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 at 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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .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 <bsd.port.post.mk>
+.include <bsd.port.mk>

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
+ at owner www
+ at 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
- at dirrm %%WEBAPPS%%/axis/WEB-INF/lib
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example6
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example5
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example4
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example3
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example2
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example1
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/transport/tcp
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/transport
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/swa
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/stock
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/proxy
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/perf
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/misc
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/message
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/math
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc/hello
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc/address
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/integrationGuide/example2
+%%JAVAJARDIR%%/axis.jar
+%%JAVAJARDIR%%/jaxrpc.jar
+%%JAVAJARDIR%%/saaj.jar
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/addr
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/attachments
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/bidbuy
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/echo
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/encoding
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/faults
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/handler
 @dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/integrationGuide/example1
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/integrationGuide/example2
 @dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/integrationGuide
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/handler
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/faults
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/encoding
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/echo
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/bidbuy
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/attachments
- at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/addr
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc/address
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc/hello
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/jaxrpc
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/math
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/message
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/misc
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/perf
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/proxy
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/stock
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/swa
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/transport/tcp
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/transport
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example1
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example2
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example3
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example4
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example5
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide/example6
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples/userguide
 @dirrm %%WEBAPPS%%/axis/WEB-INF/classes/samples
 @dirrm %%WEBAPPS%%/axis/WEB-INF/classes
+ at dirrm %%WEBAPPS%%/axis/WEB-INF/lib
 @dirrm %%WEBAPPS%%/axis/WEB-INF
 @dirrm %%WEBAPPS%%/axis
+ at comment reset owner for docs and examples
+ at owner root
+ at group wheel
