Date: Thu, 22 May 2014 16:07:21 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190115: [patch] Add staging support to www/geronimo Message-ID: <201405221607.s4MG7L60001401@cgiserv.freebsd.org> Resent-Message-ID: <201405221610.s4MGA0AE050764@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190115
>Category: ports
>Synopsis: [patch] Add staging support to www/geronimo
>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: Thu May 22 16:10: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@lucy:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Adds staging support to www/geronimo.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile
index ebc6d20..daf115d 100644
--- a/www/geronimo/Makefile
+++ b/www/geronimo/Makefile
@@ -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 | \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405221607.s4MG7L60001401>