- Update to 0.97.2

PR:		ports/130584
Submitted by:	Bjorn Konig <bkoenig@alpha-tierchen.de>	(maintainer)

4 files changed, 34 insertions, 27 deletions

diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 4db9490..0afb211 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	classpath
-PORTVERSION=	0.93
-PORTREVISION=	3
+PORTVERSION=	0.97.2
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		${MASTER_SITE_SAVANNAH}
@@ -17,18 +16,32 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	A GNU project to create a free Java class library
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		jikes:${PORTSDIR}/java/jikes
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
+USE_JAVA=	yes
+JAVA_VERSION=	1.5+
 USE_XORG=	x11 ice xtst xaw xproto xext
 USE_LDCONFIG=	yes
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
-CONFIGURE_ARGS=	--enable-jni --with-jikes --disable-alsa --disable-dssi --disable-plugin
+CONFIGURE_ARGS=	--enable-jni --disable-alsa --disable-dssi --disable-plugin
 USE_GMAKE=	yes
 
-INFO=		hacking tools vmintegration
+MAN1=		gappletviewer.1 \
+		gjar.1 \
+		gjarsigner.1 \
+		gjavah.1 \
+		gcjh.1 \
+		gkeytool.1 \
+		gnative2ascii.1 \
+		gorbd.1 \
+		grmid.1 \
+		grmiregistry.1 \
+		gserialver.1 \
+		gtnameserv.1
+
+INFO=		cp-hacking cp-tools cp-vmintegration
 
 CONFLICTS=	sablevm-classpath-*
 
@@ -75,8 +88,4 @@ PLIST_SUB+=		QT4=""
 PLIST_SUB+=		QT4="@comment "
 .endif
 
-post-extract:
-	@${REINPLACE_CMD} -e 's,^\(include_HEADERS = \)jni.h jni_md.h \(.*\),\1\2,' \
-		${WRKSRC}/include/Makefile.in
-
 .include <bsd.port.post.mk>
diff --git a/java/classpath/distinfo b/java/classpath/distinfo
index bb2615b..e7ca031 100644
--- a/java/classpath/distinfo
+++ b/java/classpath/distinfo
@@ -1,3 +1,3 @@
-MD5 (classpath-0.93.tar.gz) = ffa9e9cac31c5acbf0ea9eff9efa923d
-SHA256 (classpath-0.93.tar.gz) = df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945
-SIZE (classpath-0.93.tar.gz) = 9534222
+MD5 (classpath-0.97.2.tar.gz) = 6a35347901ace03c31cc49751b338f31
+SHA256 (classpath-0.97.2.tar.gz) = 001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4
+SIZE (classpath-0.97.2.tar.gz) = 10318014
diff --git a/java/classpath/files/patch-native_jni_native-lib_cpnet.h b/java/classpath/files/patch-native_jni_native-lib_cpnet.h
deleted file mode 100644
index efce85c..0000000
--- a/java/classpath/files/patch-native_jni_native-lib_cpnet.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- native/jni/native-lib/cpnet.h.orig	2006-09-08 10:59:57.000000000 +0200
-+++ native/jni/native-lib/cpnet.h	2008-03-31 18:47:54.000000000 +0200
-@@ -41,9 +41,11 @@
- #include <jni.h>
- #include <jcl.h>
- #include <string.h>
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in_systm.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
- 
- typedef struct {
diff --git a/java/classpath/pkg-plist b/java/classpath/pkg-plist
index c8e4fc0..8d6abf5 100644
--- a/java/classpath/pkg-plist
+++ b/java/classpath/pkg-plist
@@ -1,15 +1,19 @@
 bin/gappletviewer
+bin/gjavah
 bin/gjar
 bin/gjarsigner
 bin/gkeytool
 bin/gnative2ascii
 bin/gorbd
+bin/grmic
 bin/grmid
 bin/grmiregistry
 bin/gserialver
 bin/gtnameserv
 include/jawt.h
 include/jawt_md.h
+include/jni.h
+include/jni_md.h
 %%GCONF%%lib/classpath/libgconfpeer.la
 %%GCONF%%lib/classpath/libgconfpeer.so
 %%GTK2%%lib/classpath/libgtkpeer.so
@@ -20,6 +24,9 @@ lib/classpath/libjavaio.so.0
 lib/classpath/libjavalang.la
 lib/classpath/libjavalang.so
 lib/classpath/libjavalang.so.0
+lib/classpath/libjavalangmanagement.la
+lib/classpath/libjavalangmanagement.so
+lib/classpath/libjavalangmanagement.so.0
 lib/classpath/libjavalangreflect.la
 lib/classpath/libjavalangreflect.so
 lib/classpath/libjavalangreflect.so.0
@@ -85,13 +92,16 @@ lib/security/classpath.security
 %%DATADIR%%/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
 %%DATADIR%%/examples/gnu/classpath/examples/awt/AnimationApplet.java
 %%DATADIR%%/examples/gnu/classpath/examples/awt/Demo.java
+%%DATADIR%%/examples/gnu/classpath/examples/awt/HintingDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/datatransfer/Demo.java
 %%DATADIR%%/examples/gnu/classpath/examples/html/Demo.java
+%%DATADIR%%/examples/gnu/classpath/examples/icons/aicas.png
 %%DATADIR%%/examples/gnu/classpath/examples/icons/back.png
 %%DATADIR%%/examples/gnu/classpath/examples/icons/badge.png
 %%DATADIR%%/examples/gnu/classpath/examples/icons/big-fullscreen.png
 %%DATADIR%%/examples/gnu/classpath/examples/icons/big-home.png
 %%DATADIR%%/examples/gnu/classpath/examples/icons/big-warning.png
+%%DATADIR%%/examples/gnu/classpath/examples/icons/palme.gif
 %%DATADIR%%/examples/gnu/classpath/examples/icons/reload.png
 %%DATADIR%%/examples/gnu/classpath/examples/icons/stock-copy.png
 %%DATADIR%%/examples/gnu/classpath/examples/icons/stock-cut.png
@@ -125,6 +135,7 @@ lib/security/classpath.security
 %%DATADIR%%/examples/gnu/classpath/examples/management/TestThread.java
 %%DATADIR%%/examples/gnu/classpath/examples/midi/Demo.java
 %%DATADIR%%/examples/gnu/classpath/examples/print/Demo.java
+%%DATADIR%%/examples/gnu/classpath/examples/sound/AudioPlayerSample.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/BrowserEditorKit.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/ButtonDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/ComboBoxDemo.java
@@ -159,6 +170,7 @@ lib/security/classpath.security
 %%DATADIR%%/glibj.zip
 %%DATADIR%%/tools.zip
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/swing
+@dirrm %%DATADIR%%/examples/gnu/classpath/examples/sound
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/print
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/midi
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/management