diff options
| -rw-r--r-- | www/apache-jserv/Makefile | 6 | ||||
| -rw-r--r-- | www/apache-jserv/distinfo | 2 | ||||
| -rw-r--r-- | www/apache-jserv/files/patch-af | 26 |
3 files changed, 7 insertions, 27 deletions
diff --git a/www/apache-jserv/Makefile b/www/apache-jserv/Makefile index 39826791a8d9..cc78a84f53a4 100644 --- a/www/apache-jserv/Makefile +++ b/www/apache-jserv/Makefile @@ -6,10 +6,10 @@ # PORTNAME= apache-jserv -PORTVERSION= 1.1 +PORTVERSION= 1.1.1 CATEGORIES= www java MASTER_SITES= http://java.apache.org/jserv/dist/ -DISTNAME= ApacheJServ-1.1 +DISTNAME= ApacheJServ-1.1.1 MAINTAINER= greg@greg.rim.or.jp @@ -37,7 +37,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX}\ --with-gnu-ld\ --enable-compressed-jar\ --enable-EAPI -.if defined (USE_JIKES) +.if defined (WITH_JIKES) CONFIGURE_ARGS+=--with-javac=${LOCALBASE}/bin/jikes .endif diff --git a/www/apache-jserv/distinfo b/www/apache-jserv/distinfo index 40dedd122981..db0840f26c2e 100644 --- a/www/apache-jserv/distinfo +++ b/www/apache-jserv/distinfo @@ -1 +1 @@ -MD5 (ApacheJServ-1.1.tar.gz) = 0a34cc05670dd44eac1a5d6f785ab5af +MD5 (ApacheJServ-1.1.1.tar.gz) = 24c01699784948d5a2ec4804aad7a3ab diff --git a/www/apache-jserv/files/patch-af b/www/apache-jserv/files/patch-af index 69c4bf4f09c9..e7901830f97f 100644 --- a/www/apache-jserv/files/patch-af +++ b/www/apache-jserv/files/patch-af @@ -1,26 +1,6 @@ ---- src/java/org/apache/java/lang/AdaptiveClassLoader.java.orig Tue Feb 8 18:37:01 2000 -+++ src/java/org/apache/java/lang/AdaptiveClassLoader.java Tue Feb 8 20:33:18 2000 -@@ -661,7 +661,18 @@ - ZipEntry entry = zipfile.getEntry(name); - - if (entry != null) { -- return zipfile.getInputStream(entry); -+ InputStream stream = zipfile.getInputStream(entry); -+ byte data[] = new byte[(int)entry.getSize()]; -+ for(int i = 0 ; i < data.length ;) { -+ int size = stream.read(data, i, data.length - i); -+ if(size < 0) { -+ stream.close(); -+ return null; -+ } -+ i += size; -+ } -+ stream.close(); -+ return new ByteArrayInputStream(data); - } else { - return null; - } -@@ -671,6 +682,7 @@ +--- src/java/org/apache/java/lang/AdaptiveClassLoader.java.orig Sun Mar 12 06:34:42 2000 ++++ src/java/org/apache/java/lang/AdaptiveClassLoader.java Fri May 19 00:10:41 2000 +@@ -723,6 +723,7 @@ if ( zipfile != null ) { try { zipfile.close(); |