From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 18 23:40:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 912B2213 for ; Sun, 18 May 2014 23:40:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 6D44D26E1 for ; Sun, 18 May 2014 23:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4INe1TR098022 for ; Sun, 18 May 2014 23:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4INe16m098020; Sun, 18 May 2014 23:40:01 GMT (envelope-from gnats) Resent-Date: Sun, 18 May 2014 23:40:01 GMT Resent-Message-Id: <201405182340.s4INe16m098020@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joseph Benden Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 691991B3 for ; Sun, 18 May 2014 23:32:21 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 498E826AE for ; Sun, 18 May 2014 23:32:21 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4INWLJk025340 for ; Sun, 18 May 2014 23:32:21 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4INWLUo025335; Sun, 18 May 2014 23:32:21 GMT (envelope-from nobody) Message-Id: <201405182332.s4INWLUo025335@cgiserv.freebsd.org> Date: Sun, 18 May 2014 23:32:21 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189933: [patch] Add staging support to www/axis2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 23:40:01 -0000 >Number: 189933 >Category: ports >Synopsis: [patch] Add staging support to www/axis2 >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 23:40:01 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@lucy:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Adds staging support to www/axis2. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/axis2/Makefile b/www/axis2/Makefile index f6c57f3..e6dd309 100644 --- a/www/axis2/Makefile +++ b/www/axis2/Makefile @@ -21,8 +21,6 @@ OPTIONS_SINGLE= AS OPTIONS_SINGLE_AS= TOMCAT6 TOMCAT7 OPTIONS_DEFAULT= TOMCAT6 -NO_STAGE= yes - OPTIONS_DEFINE= EXAMPLES .include @@ -50,35 +48,28 @@ CONF_EXT= sample PORTEXAMPLES= * do-install: - ( ${MKDIR} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib && cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib) - ( ${MKDIR} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes && cd ${WRKSRC}/webapp/WEB-INF/classes && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes )$ - ( ${MKDIR} ${APPHOME}/webapps/${PORTNAME}/axis2-web && cd ${WRKSRC}/webapp/axis2-web && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/axis2-web ) - ( cd ${WRKSRC}/repository && ${COPYTREE_SHARE} \* ${APPHOME}/webapps/${PORTNAME}/WEB-INF ) - @${CHOWN} ${SHAREGRP}:${SHAREOWN} ${APPHOME}/webapps/${PORTNAME} - @${INSTALL} -d -g ${SHAREGRP} -o ${SHAREOWN} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf + ( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib && cd ${WRKSRC}/lib && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/lib) + ( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes && cd ${WRKSRC}/webapp/WEB-INF/classes && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/classes )$ + ( ${MKDIR} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/axis2-web && cd ${WRKSRC}/webapp/axis2-web && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/axis2-web ) + ( cd ${WRKSRC}/repository && ${COPYTREE_SHARE} \* ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF ) + @${CHOWN} ${SHAREGRP}:${SHAREOWN} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME} + @${INSTALL} -d -g ${SHAREGRP} -o ${SHAREOWN} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf @(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \ | while read a; do \ ${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \ - if [ ! -e "${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a" ]; then \ - ${ECHO_MSG} " Installing local configuration file: ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a"; \ - ${INSTALL_DATA} ${WRKSRC}/$$a.${CONF_EXT} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a; \ - else \ - ${ECHO_MSG} " Preserving local configuration file: ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a"; \ - fi; \ + ${ECHO_CMD} "@unexec if cmp -s ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a.${CONF_EXT}; then rm -f ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a; fi" >> ${TMPPLIST}; \ + ${ECHO_CMD} "@exec cp -n ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a.${CONF_EXT} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/$$a" >> ${TMPPLIST}; \ done - ${INSTALL_DATA} ${WRKSRC}/conf/*.${CONF_EXT} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf + ${INSTALL_DATA} ${WRKSRC}/conf/*.${CONF_EXT} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF/conf ${MV} ${WRKSRC}/webapp/WEB-INF/web.xml ${WRKSRC}/webapp/WEB-INF/web.xml.${CONF_EXT} - @if [ ! -e "${APPHOME}/webapps/axis2/WEB-INF/web.xml" ]; then \ - ${ECHO_MSG} " Installing local configuration file: ${APPHOME}/webapps/WEB-INF/web.xml"; \ - ${INSTALL_DATA} ${WRKSRC}/webapp/WEB-INF/web.xml.${CONF_EXT} ${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml; \ - else \ - ${ECHO_MSG} " Preserving local configuration file: ${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml"; \ - fi; - ${INSTALL_DATA} ${WRKSRC}/webapp/WEB-INF/web.xml.${CONF_EXT} ${APPHOME}/webapps/${PORTNAME}/WEB-INF + ${INSTALL_DATA} ${WRKSRC}/webapp/WEB-INF/web.xml.${CONF_EXT} ${STAGEDIR}${APPHOME}/webapps/${PORTNAME}/WEB-INF + ${ECHO_CMD} "${APPHOME}/webapps/${PORTNAME}/WEB-INF/web.xml.${CONF_EXT}" + ${ECHO_CMD} "@unexec if cmp -s ${APPHOME}/webapps/axis2/WEB-INF/web.xml ${APPHOME}/webapps/axis2/WEB-INF/web.xml.${CONF_EXT}; then rm -f ${APPHOME}/webapps/axis2/WEB-INF/web.xml; fi" >> ${TMPPLIST} + ${ECHO_CMD} "@exec cp -n ${APPHOME}/webapps/axis2/WEB-INF/web.xml.${CONF_EXT} ${APPHOME}/webapps/axis2/WEB-INF/web.xml" >> ${TMPPLIST} .if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/samples && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; - cd ${WRKSRC}/samples && ${FIND} . -type f -not -name '*.class' -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \; + ${MKDIR} ${STAGEDIR}${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 >Release-Note: >Audit-Trail: >Unformatted: