From owner-svn-ports-all@FreeBSD.ORG Sun May 25 05:22:44 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org 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 AA81FEF2; Sun, 25 May 2014 05:22:44 +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 982162E96; Sun, 25 May 2014 05:22:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4P5MiT2033534; Sun, 25 May 2014 05:22:44 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4P5Mict033533; Sun, 25 May 2014 05:22:44 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201405250522.s4P5Mict033533@svn.freebsd.org> From: Martin Wilke Date: Sun, 25 May 2014 05:22:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355120 - head/www/geronimo 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:22:44 -0000 Author: miwi Date: Sun May 25 05:22:44 2014 New Revision: 355120 URL: http://svnweb.freebsd.org/changeset/ports/355120 QAT: https://qat.redports.org/buildarchive/r355120/ Log: - Stage support PR: 190115 Modified: head/www/geronimo/Makefile Modified: head/www/geronimo/Makefile ============================================================================== --- head/www/geronimo/Makefile Sun May 25 05:22:04 2014 (r355119) +++ head/www/geronimo/Makefile Sun May 25 05:22:44 2014 (r355120) @@ -21,7 +21,6 @@ SUB_FILES= pkg-deinstall OPTIONS_DEFINE= TOMCAT7 TOMCAT7_DESC= Use Tomcat instead of default Jetty -NO_STAGE= yes .include .if ${PORT_OPTIONS:MTOMCAT7} @@ -77,10 +76,11 @@ post-patch: @${REINPLACE_CMD} -e '/^activemq.data/s|= |= ${APP_HOME}/|' ${WRKSRC}/var/config/config-substitutions.properties do-install: - ${MKDIR} ${APP_HOME} && ${CHOWN} ${GERONIMO_USER}:${GERONIMO_GROUP} ${APP_HOME} + ${MKDIR} ${STAGEDIR}${APP_HOME} && ${CHOWN} ${GERONIMO_USER}:${GERONIMO_GROUP} ${STAGEDIR}${APP_HOME} @(cd ${WRKSRC} && ${FIND} . |\ - ${CPIO} -pdmu -R ${GERONIMO_USER}:${GERONIMO_GROUP} ${APP_HOME}) - ${INSTALL} -o ${GERONIMO_USER} -g ${GERONIMO_GROUP} -m 0644 /dev/null ${GERONIMO_OUT} + ${CPIO} -pdmu -R ${GERONIMO_USER}:${GERONIMO_GROUP} ${STAGEDIR}${APP_HOME}) + ${INSTALL} -o ${GERONIMO_USER} -g ${GERONIMO_GROUP} -m 0644 /dev/null ${STAGEDIR}${GERONIMO_OUT} + post-install: @${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}." @${FIND} -s ${WRKSRC} -not -type d | \