diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-05-06 08:08:16 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-05-06 08:08:16 +0000 |
| commit | aac5ff24294157cf686ac6e2942f286f85e48fc9 (patch) | |
| tree | 44771a3ca1fb233e95a12573362376815e7af77d | |
| parent | 5acf15d3899f9fdec5baa32db90cf8ff916cc556 (diff) | |
| download | pkgsrc-aac5ff24294157cf686ac6e2942f286f85e48fc9.tar.gz | |
Bump PKGREVISION.
* Required java is 6 or later
* Remove unnecessary CLASSPATH definition in tomcat.sh
Thank you, tnozaki@.
| -rw-r--r-- | www/apache-tomcat7/Makefile | 5 | ||||
| -rw-r--r-- | www/apache-tomcat7/files/tomcat.sh | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/www/apache-tomcat7/Makefile b/www/apache-tomcat7/Makefile index 56eb9f22df5..7362dfd250c 100644 --- a/www/apache-tomcat7/Makefile +++ b/www/apache-tomcat7/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2012/03/05 11:18:17 abs Exp $ +# $NetBSD: Makefile,v 1.5 2012/05/06 08:08:16 ryoon Exp $ # DISTNAME= apache-tomcat-${TOMCAT_VER} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/} @@ -16,7 +17,7 @@ CONFLICTS+= jakarta-tomcat-[0-9]* NO_BUILD= yes USE_LANGUAGES= # none USE_JAVA= run -USE_JAVA2= 1.5 +USE_JAVA2= 6 USE_TOOLS+= pax PKG_DESTDIR_SUPPORT= destdir diff --git a/www/apache-tomcat7/files/tomcat.sh b/www/apache-tomcat7/files/tomcat.sh index 26b689a9cb6..3b56f8b7047 100644 --- a/www/apache-tomcat7/files/tomcat.sh +++ b/www/apache-tomcat7/files/tomcat.sh @@ -1,6 +1,6 @@ #! @RCD_SCRIPTS_SHELL@ # -# $NetBSD: tomcat.sh,v 1.1.1.1 2011/11/19 17:11:11 ryoon Exp $ +# $NetBSD: tomcat.sh,v 1.2 2012/05/06 08:08:16 ryoon Exp $ # # PROVIDE: tomcat # REQUIRE: DAEMON @@ -41,8 +41,6 @@ export CATALINA_HOME export TOMCAT_HOME export CATALINA_PID -CLASSPATH=${CLASSPATH}:${PREFIX}/lib/java/servlet.jar:${PREFIX}/lib/java/jaxp.jar:${PREFIX}/lib/java/parser.jar:${PREFIX}/lib/java/crimson.jar:${PREFIX}/lib/java/ant.jar - if [ -n "${tomcat_classpath}" ] then CLASSPATH=${CLASSPATH}:${tomcat_classpath} |