Sat Nov 19 17:13:10 2011 UTC ()
Set LICENSE.


(ryoon)
diff -r1.1.1.1 -r1.2 pkgsrc/www/apache-tomcat7/Makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/apache-tomcat7/Makefile (switch to unified diff)

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