svn commit: r368762 - head/www/geronimo

[Antoine Brodin]

Author: antoine
Date: Sun Sep 21 14:34:59 2014
New Revision: 368762
URL: http://svnweb.freebsd.org/changeset/ports/368762
QAT: https://qat.redports.org/buildarchive/r368762/

Log:
  Allow staging as a regular user
  Bump portrevision as files were not packaged with intended owner

Modified:
  head/www/geronimo/Makefile

Modified: head/www/geronimo/Makefile
==============================================================================
--- head/www/geronimo/Makefile	Sun Sep 21 14:31:31 2014	(r368761)
+++ head/www/geronimo/Makefile	Sun Sep 21 14:34:59 2014	(r368762)
@@ -3,6 +3,7 @@
 
 PORTNAME=	geronimo
 DISTVERSION=	3.0-beta-1
+PORTREVISION=	1
 CATEGORIES=	www devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	geronimo/${DISTVERSION}
@@ -45,7 +46,7 @@ WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-bin//}
 JAR_FILE=	bin/server.jar
 LATEST_LINK=	${APP_SHORTNAME}
-PLIST_FILES=	${GERONIMO_OUT:S,^${PREFIX}/,,}
+PLIST_FILES=	"@(${GERONIMO_USER},${GERONIMO_GROUP},) ${GERONIMO_OUT:S,^${PREFIX}/,,}"
 
 SUB_LIST=	GERONIMO_HOME=${APP_HOME} \
 		APP_SHORTNAME=${APP_SHORTNAME} \
@@ -76,16 +77,18 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^activemq.data/s|= |= ${APP_HOME}/|' ${WRKSRC}/var/config/config-substitutions.properties
 
 do-install:
-	${MKDIR} ${STAGEDIR}${APP_HOME} && ${CHOWN} ${GERONIMO_USER}:${GERONIMO_GROUP} ${STAGEDIR}${APP_HOME}
+	${MKDIR} ${STAGEDIR}${APP_HOME}
 	@(cd ${WRKSRC} && ${FIND} . |\
-		 ${CPIO} -pdmu -R ${GERONIMO_USER}:${GERONIMO_GROUP} ${STAGEDIR}${APP_HOME})
-	${INSTALL} -o ${GERONIMO_USER} -g ${GERONIMO_GROUP} -m 0644 /dev/null ${STAGEDIR}${GERONIMO_OUT}
+		 ${CPIO} -pdmu ${STAGEDIR}${APP_HOME})
+	${INSTALL} -m 0644 /dev/null ${STAGEDIR}${GERONIMO_OUT}
 
 post-install:
 	@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
+	@${ECHO_CMD} -e '@owner ${GERONIMO_USER}\n at group ${GERONIMO_GROUP}' >> ${TMPPLIST}
 	@${FIND} -s ${WRKSRC} -not -type d | \
 		 ${SED} -ne 's,^${WRKSRC},${APP_HOME:S,${PREFIX}/,,},p' >> ${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type d | \
 		 ${SED} -ne 's,^${WRKSRC}, at dirrm ${APP_HOME:S,${PREFIX}/,,},p' >> ${TMPPLIST}
+	@${ECHO_CMD} -e '@owner root\n at group wheel' >> ${TMPPLIST}
 
 .include <bsd.port.mk>