From owner-svn-ports-all@FreeBSD.ORG Sun May 25 05:15:52 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 8288B843; Sun, 25 May 2014 05:15:52 +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 637112DDE; Sun, 25 May 2014 05:15:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4P5FqJB029015; Sun, 25 May 2014 05:15:52 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4P5FqX5029014; Sun, 25 May 2014 05:15:52 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201405250515.s4P5FqX5029014@svn.freebsd.org> From: Martin Wilke Date: Sun, 25 May 2014 05:15:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355113 - head/www/axis2 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: Sun, 25 May 2014 05:15:52 -0000 Author: miwi Date: Sun May 25 05:15:51 2014 New Revision: 355113 URL: http://svnweb.freebsd.org/changeset/ports/355113 QAT: https://qat.redports.org/buildarchive/r355113/ Log: - Stage support PR: 189933 Modified: head/www/axis2/Makefile Modified: head/www/axis2/Makefile ============================================================================== --- head/www/axis2/Makefile Sun May 25 05:14:51 2014 (r355112) +++ head/www/axis2/Makefile Sun May 25 05:15:51 2014 (r355113) @@ -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