Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 May 2014 20:04:50 GMT
From:      Joseph Benden <joe@thrallingpenguin.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/189897: [patch] Add staging support to www/jetty
Message-ID:  <201405172004.s4HK4oiw039310@cgiserv.freebsd.org>
Resent-Message-ID: <201405172010.s4HKA1ih017650@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         189897
>Category:       ports
>Synopsis:       [patch] Add staging support to www/jetty
>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:   Sat May 17 20:10: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/jetty.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/jetty/Makefile b/www/jetty/Makefile
index 67df931..a909379 100644
--- a/www/jetty/Makefile
+++ b/www/jetty/Makefile
@@ -49,7 +49,6 @@ SUB_FILES=	\
 		message \
 		message-advanced
 
-NO_STAGE=	yes
 do-build:
 
 post-build:
@@ -75,12 +74,12 @@ do-install:
 # Create user/group
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-	@${MKDIR} ${APP_HOME}
-	@cd ${WRKSRC} && ${FIND} -H * | ${EGREP} -v "^(bin/|bin$$)" | ${CPIO} -pdmuL -R ${RUNASUSER}:${GROUP} ${APP_HOME}
-	@${CHOWN} ${RUNASUSER}:${GROUP} ${PREFIX}/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${APP_HOME}
+	@cd ${WRKSRC} && ${FIND} -H * | ${EGREP} -v "^(bin/|bin$$)" | ${CPIO} -pdmuL -R ${RUNASUSER}:${GROUP} ${STAGEDIR}${APP_HOME}
+	@${CHOWN} ${RUNASUSER}:${GROUP} ${STAGEDIR}${PREFIX}/${PORTNAME}
 
 	@${ECHO_MSG} "===>    Installing into ${PREFIX}/sbin"
-	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${PREFIX}/sbin
+	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${STAGEDIR}${PREFIX}/sbin
 
 post-install:
 	@${ECHO_CMD}


>Release-Note:
>Audit-Trail:
>Unformatted:



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