[pkgsrc/trunk]: pkgsrc/www/apache-tomcat7 Bump PKGREVISION.

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4466b0128e4
branches:  trunk
changeset: 603420:e4466b0128e4
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sun May 06 08:08:16 2012 +0000

description:
Bump PKGREVISION.

* Required java is 6 or later
* Remove unnecessary CLASSPATH definition in tomcat.sh
Thank you, tnozaki@.

diffstat:

 www/apache-tomcat7/Makefile        |  5 +++--
 www/apache-tomcat7/files/tomcat.sh |  4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r a30c35562806 -r e4466b0128e4 www/apache-tomcat7/Makefile
--- a/www/apache-tomcat7/Makefile       Sun May 06 06:08:05 2012 +0000
+++ b/www/apache-tomcat7/Makefile       Sun May 06 08:08:16 2012 +0000
@@ -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 @@
 NO_BUILD=      yes
 USE_LANGUAGES= # none
 USE_JAVA=      run
-USE_JAVA2=     1.5
+USE_JAVA2=     6
 USE_TOOLS+=    pax
 
 PKG_DESTDIR_SUPPORT=   destdir
diff -r a30c35562806 -r e4466b0128e4 www/apache-tomcat7/files/tomcat.sh
--- a/www/apache-tomcat7/files/tomcat.sh        Sun May 06 06:08:05 2012 +0000
+++ b/www/apache-tomcat7/files/tomcat.sh        Sun May 06 08:08:16 2012 +0000
@@ -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 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}