Fri Nov 23 11:46:24 2012 UTC ()
Bump PKGREVISION.

Avoided hardcoded UID/GID using a simple post-install script.


(fhajny)
diff -r0 -r1.1 pkgsrc/www/apache-tomcat7/INSTALL
diff -r1.6 -r1.7 pkgsrc/www/apache-tomcat7/Makefile
File Added: pkgsrc/www/apache-tomcat7/INSTALL
#!@SH@
#
# $NetBSD: INSTALL,v 1.1 2012/11/23 11:46:24 fhajny Exp $

case "${STAGE}" in
POST-INSTALL)
	${CHOWN} -R @TOMCAT_USER@:@TOMCAT_GROUP@ ${PKG_PREFIX}/share/tomcat/webapps
	;;
esac
cvs diff -r1.6 -r1.7 pkgsrc/www/apache-tomcat7/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache-tomcat7/Makefile 2012/10/06 12:05:24 1.6
+++ pkgsrc/www/apache-tomcat7/Makefile 2012/11/23 11:46:24 1.7
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2012/10/06 12:05:24 ryoon Exp $ 1# $NetBSD: Makefile,v 1.7 2012/11/23 11:46:24 fhajny Exp $
2# 2#
3 3
4DISTNAME= apache-tomcat-${TOMCAT_VER} 4DISTNAME= apache-tomcat-${TOMCAT_VER}
 5PKGREVISION= 1
5CATEGORIES= www 6CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://tomcat.apache.org/ 10HOMEPAGE= http://tomcat.apache.org/
10COMMENT= Implementation of Java Servlet and JavaServer Pages technologies 11COMMENT= Implementation of Java Servlet and JavaServer Pages technologies
11LICENSE= apache-2.0 12LICENSE= apache-2.0
12 13
13CONFLICTS+= jakarta-tomcat55-[0-9]* 14CONFLICTS+= jakarta-tomcat55-[0-9]*
14CONFLICTS+= jakarta-tomcat-[0-9]* 15CONFLICTS+= jakarta-tomcat-[0-9]*
15 16
16NO_BUILD= yes 17NO_BUILD= yes
17USE_LANGUAGES= # none 18USE_LANGUAGES= # none
@@ -20,35 +21,34 @@ USE_JAVA2= 6 @@ -20,35 +21,34 @@ USE_JAVA2= 6
20USE_TOOLS+= pax 21USE_TOOLS+= pax
21 22
22PKG_DESTDIR_SUPPORT= destdir 23PKG_DESTDIR_SUPPORT= destdir
23 24
24.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
25 26
26TOMCAT_VER= 7.0.30 27TOMCAT_VER= 7.0.30
27TOMCAT_HOME= ${PREFIX}/share/tomcat 28TOMCAT_HOME= ${PREFIX}/share/tomcat
28EGDIR= ${PREFIX}/share/examples/tomcat 29EGDIR= ${PREFIX}/share/examples/tomcat
29DOCDIR= ${PREFIX}/share/doc/tomcat 30DOCDIR= ${PREFIX}/share/doc/tomcat
30RCD_SCRIPTS= tomcat 31RCD_SCRIPTS= tomcat
31TOMCAT_USER?= tomcat 32TOMCAT_USER?= tomcat
32TOMCAT_GROUP?= tomcat 33TOMCAT_GROUP?= tomcat
33USERGROUP_PHASE= pre-install 
34PKG_GROUPS= ${TOMCAT_GROUP} 34PKG_GROUPS= ${TOMCAT_GROUP}
35PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP} 35PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP}
36PKG_GROUPS_VARS+= TOMCAT_GROUP 36PKG_GROUPS_VARS+= TOMCAT_GROUP
37PKG_USERS_VARS+= TOMCAT_USER 37PKG_USERS_VARS+= TOMCAT_USER
38PKG_HOME.tomcat= ${TOMCAT_HOME} 38PKG_HOME.tomcat= ${TOMCAT_HOME}
39PKG_SHELL.tomcat= ${SH} 39PKG_SHELL.tomcat= ${SH}
40PKG_SYSCONFDIR.tomcat= ${TOMCAT_HOME}/conf 40PKG_SYSCONFDIR.tomcat= ${TOMCAT_HOME}/conf
41OWN_DIRS+= ${PKG_SYSCONFDIR.tomcat} 41OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR.tomcat} ${TOMCAT_USER} ${TOMCAT_GROUP} 0755
42FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} TOMCAT_HOME=${TOMCAT_HOME} \ 42FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} TOMCAT_HOME=${TOMCAT_HOME} \
43 TOMCAT_USER=${TOMCAT_USER} TOMCAT_GROUP=${TOMCAT_GROUP} 43 TOMCAT_USER=${TOMCAT_USER} TOMCAT_GROUP=${TOMCAT_GROUP}
44 44
45PRIVATE_EGFILES= server.xml tomcat-users.xml 45PRIVATE_EGFILES= server.xml tomcat-users.xml
46PUBLIC_EGFILES= catalina.policy catalina.properties \ 46PUBLIC_EGFILES= catalina.policy catalina.properties \
47 context.xml logging.properties web.xml 47 context.xml logging.properties web.xml
48DOCFILES= LICENSE NOTICE RELEASE-NOTES RUNNING.txt 48DOCFILES= LICENSE NOTICE RELEASE-NOTES RUNNING.txt
49WORK_DIRS= work temp logs 49WORK_DIRS= work temp logs
50 50
51.for f in ${PRIVATE_EGFILES} 51.for f in ${PRIVATE_EGFILES}
52CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR.tomcat}/${f} \ 52CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR.tomcat}/${f} \
53 ${TOMCAT_USER} ${TOMCAT_GROUP} 0640 53 ${TOMCAT_USER} ${TOMCAT_GROUP} 0640
54.endfor 54.endfor
@@ -86,20 +86,15 @@ do-install: @@ -86,20 +86,15 @@ do-install:
86 86
87 ${FIND} ${WRKSRC} -name \*.exe -type f -print | ${XARGS} ${RM} -f 87 ${FIND} ${WRKSRC} -name \*.exe -type f -print | ${XARGS} ${RM} -f
88 ${FIND} ${WRKSRC} -name \*.bat -type f -print | ${XARGS} ${RM} -f 88 ${FIND} ${WRKSRC} -name \*.bat -type f -print | ${XARGS} ${RM} -f
89 89
90 cd ${WRKSRC} && ${PAX} -rw -pm . ${DESTDIR}${TOMCAT_HOME} 90 cd ${WRKSRC} && ${PAX} -rw -pm . ${DESTDIR}${TOMCAT_HOME}
91 91
92 ${FIND} ${DESTDIR}${TOMCAT_HOME} -type d -print | \ 92 ${FIND} ${DESTDIR}${TOMCAT_HOME} -type d -print | \
93 ${XARGS} ${CHMOD} ${PKGDIRMODE} 93 ${XARGS} ${CHMOD} ${PKGDIRMODE}
94 ${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -print | \ 94 ${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -print | \
95 ${XARGS} ${CHMOD} ${SHAREMODE} 95 ${XARGS} ${CHMOD} ${SHAREMODE}
96 ${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -name \*.sh -print | \ 96 ${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -name \*.sh -print | \
97 ${XARGS} ${CHMOD} ${BINMODE} 97 ${XARGS} ${CHMOD} ${BINMODE}
98 98
99 ${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} \ 
100 ${DESTDIR}${TOMCAT_HOME}/webapps 
101 ${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} \ 
102 ${DESTDIR}${TOMCAT_HOME}/conf 
103 
104.include "../../mk/java-vm.mk" 99.include "../../mk/java-vm.mk"
105.include "../../mk/bsd.pkg.mk" 100.include "../../mk/bsd.pkg.mk"