Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 May 2014 05:22:44 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r355120 - head/www/geronimo
Message-ID:  <201405250522.s4P5Mict033533@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
 
 .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 | \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405250522.s4P5Mict033533>