ports/189927: [patch] Add staging support to www/axis

Joseph Benden joe at thrallingpenguin.com
Sun May 18 21:20:00 UTC 2014


>Number:         189927
>Category:       ports
>Synopsis:       [patch] Add staging support to www/axis
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 18 21:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Joseph Benden
>Release:        FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014     root at lucy:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Adds staging support to www/axis.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/axis/Makefile b/www/axis/Makefile
index 758a2f1..86c28a8 100644
--- a/www/axis/Makefile
+++ b/www/axis/Makefile
@@ -16,7 +16,6 @@ OPTIONS_SINGLE=	AS
 OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
 OPTIONS_DEFAULT=	TOMCAT6
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT6}
@@ -50,17 +49,17 @@ PORTEXAMPLES=	*
 
 do-install:
 .for i in ${SYSTEM_JARS}
-	${INSTALL_DATA} ${WRKSRC}/lib/${i} ${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/${i} ${STAGEDIR}${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}/{} \;
+	cd ${WRKSRC}/webapps && ${FIND} axis -type d -exec ${INSTALL} -d -g ${GROUP} -o ${USER} -m 755 ${STAGEDIR}${WEBAPPDIR}/{} \;
+	cd ${WRKSRC}/webapps && ${FIND} axis -type f -exec ${INSTALL} -g ${GROUP} -o ${USER} -m 444 {} ${STAGEDIR}${WEBAPPDIR}/{} \;
 .if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC}/docs && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
-	cd ${WRKSRC}/docs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	cd ${WRKSRC}/docs && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \;
+	cd ${WRKSRC}/docs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${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}/{} \;
+	cd ${WRKSRC}/samples && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \;
+	cd ${WRKSRC}/samples && ${FIND} . -type f -not -name '*.class' -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;
 .endif
 
 .include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list