diff options
| -rw-r--r-- | www/apache-tomcat6/Makefile | 40 | ||||
| -rw-r--r-- | www/apache-tomcat6/PLIST | 14 | ||||
| -rw-r--r-- | www/apache-tomcat6/distinfo | 8 |
3 files changed, 31 insertions, 31 deletions
diff --git a/www/apache-tomcat6/Makefile b/www/apache-tomcat6/Makefile index 2fcc5d29e02..778b36cd980 100644 --- a/www/apache-tomcat6/Makefile +++ b/www/apache-tomcat6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/06/19 13:00:28 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2010/09/19 14:32:04 spz Exp $ # DISTNAME= apache-tomcat-${TOMCAT_VER} @@ -22,7 +22,7 @@ PKG_DESTDIR_SUPPORT= destdir .include "../../mk/bsd.prefs.mk" -TOMCAT_VER= 6.0.24 +TOMCAT_VER= 6.0.29 TOMCAT_HOME= ${PREFIX}/share/tomcat EGDIR= ${PREFIX}/share/examples/tomcat DOCDIR= ${PREFIX}/share/doc/tomcat @@ -64,24 +64,24 @@ OWN_DIRS_PERMS+= ${TOMCAT_HOME}/${d} ${TOMCAT_USER} ${TOMCAT_GROUP} 0755 INSTALLATION_DIRS+= ${TOMCAT_HOME} ${EGDIR} ${DOCDIR} do-install: -. for d in ${WORK_DIRS} - ${RM} -rf ${WRKSRC}/${d} -. endfor - -. for f in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f} - ${RM} -f ${WRKSRC}/${f} -. endfor - -. for f in ${PRIVATE_EGFILES} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f} - ${RM} -f ${WRKSRC}/conf/${f} -. endfor - -. for f in ${PUBLIC_EGFILES} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f} - ${RM} -f ${WRKSRC}/conf/${f} -. endfor +.for d in ${WORK_DIRS} + ${RM} -rf ${WRKSRC}/${d} +.endfor + +.for f in ${DOCFILES} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f} + ${RM} -f ${WRKSRC}/${f} +.endfor + +.for f in ${PRIVATE_EGFILES} + ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f} + ${RM} -f ${WRKSRC}/conf/${f} +.endfor + +.for f in ${PUBLIC_EGFILES} + ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f} + ${RM} -f ${WRKSRC}/conf/${f} +.endfor ${FIND} ${WRKSRC} -name \*.exe -type f -print | ${XARGS} ${RM} -f ${FIND} ${WRKSRC} -name \*.bat -type f -print | ${XARGS} ${RM} -f diff --git a/www/apache-tomcat6/PLIST b/www/apache-tomcat6/PLIST index 81c3bb7df56..bb04436ddc0 100644 --- a/www/apache-tomcat6/PLIST +++ b/www/apache-tomcat6/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:17 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2010/09/19 14:32:04 spz Exp $ share/doc/tomcat/LICENSE -share/doc/tomcat/RELEASE-NOTES share/doc/tomcat/NOTICE +share/doc/tomcat/RELEASE-NOTES share/doc/tomcat/RUNNING.txt share/examples/rc.d/tomcat share/examples/tomcat/catalina.policy @@ -14,9 +14,9 @@ share/examples/tomcat/web.xml share/tomcat/bin/bootstrap.jar share/tomcat/bin/catalina-tasks.xml share/tomcat/bin/catalina.sh +share/tomcat/bin/commons-daemon-native.tar.gz share/tomcat/bin/commons-daemon.jar share/tomcat/bin/digest.sh -share/tomcat/bin/jsvc.tar.gz share/tomcat/bin/setclasspath.sh share/tomcat/bin/shutdown.sh share/tomcat/bin/startup.sh @@ -277,8 +277,8 @@ share/tomcat/webapps/examples/jsp/cal/cal2.jsp share/tomcat/webapps/examples/jsp/cal/cal2.jsp.html share/tomcat/webapps/examples/jsp/cal/calendar.html share/tomcat/webapps/examples/jsp/cal/login.html -share/tomcat/webapps/examples/jsp/chat/chat.jsp -share/tomcat/webapps/examples/jsp/chat/chat.jsp.html +share/tomcat/webapps/examples/jsp/chat/index.jsp +share/tomcat/webapps/examples/jsp/chat/index.jsp.html share/tomcat/webapps/examples/jsp/chat/login.jsp share/tomcat/webapps/examples/jsp/chat/login.jsp.html share/tomcat/webapps/examples/jsp/chat/post.jsp @@ -459,6 +459,8 @@ share/tomcat/webapps/host-manager/images/void.gif share/tomcat/webapps/host-manager/manager.xml share/tomcat/webapps/manager/401.jsp share/tomcat/webapps/manager/META-INF/context.xml +share/tomcat/webapps/manager/WEB-INF/jsp/sessionDetail.jsp +share/tomcat/webapps/manager/WEB-INF/jsp/sessionsList.jsp share/tomcat/webapps/manager/WEB-INF/web.xml share/tomcat/webapps/manager/images/add.gif share/tomcat/webapps/manager/images/asf-logo.gif @@ -469,7 +471,5 @@ share/tomcat/webapps/manager/images/fix.gif share/tomcat/webapps/manager/images/tomcat.gif share/tomcat/webapps/manager/images/update.gif share/tomcat/webapps/manager/images/void.gif -share/tomcat/webapps/manager/sessionDetail.jsp -share/tomcat/webapps/manager/sessionsList.jsp share/tomcat/webapps/manager/status.xsd share/tomcat/webapps/manager/xform.xsl diff --git a/www/apache-tomcat6/distinfo b/www/apache-tomcat6/distinfo index 544e4e24887..285a0913879 100644 --- a/www/apache-tomcat6/distinfo +++ b/www/apache-tomcat6/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2010/01/28 12:16:45 spz Exp $ +$NetBSD: distinfo,v 1.4 2010/09/19 14:32:04 spz Exp $ -SHA1 (apache-tomcat-6.0.24.tar.gz) = 545d06211e5fe1b09240cd891937ad36fd70bfc4 -RMD160 (apache-tomcat-6.0.24.tar.gz) = 3a4519d9ca0606747f54acf6085bfe0281f148e6 -Size (apache-tomcat-6.0.24.tar.gz) = 6104116 bytes +SHA1 (apache-tomcat-6.0.29.tar.gz) = d7f307ccc02e7309d61d7f35fa6e371a79733016 +RMD160 (apache-tomcat-6.0.29.tar.gz) = d5c4dceebefe15d863e4eaa0c943d182562cb283 +Size (apache-tomcat-6.0.29.tar.gz) = 6407210 bytes |