Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/java/classpath/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- Makefile	15 Dec 2007 18:32:33 -0000	1.28
+++ Makefile	17 Mar 2008 22:17:40 -0000
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	classpath
-PORTVERSION=	0.92
-PORTREVISION=	2
+PORTVERSION=	0.97.1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		${MASTER_SITE_SAVANNAH}
@@ -17,7 +16,8 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GNU project to create a free Java class library
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		javavm:${PORTSDIR}/java/javavmwrapper
 
 USE_LDCONFIG=	yes
 USE_JAVA=	yes
@@ -27,10 +27,11 @@
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} `${PKG_CONFIG} gtk+-2.0 --cflags`" \
 		LDFLAGS="`${PKG_CONFIG} gtk+-2.0 --libs`"
-CONFIGURE_ARGS=	--enable-jni --with-jikes --disable-gtk-peer --disable-plugin
+CONFIGURE_ARGS=	--enable-jni --with-jikes --disable-gtk-peer --disable-plugin \
+		--with-vm=${PREFIX}/bin/javavm
 USE_GMAKE=	yes
 
-INFO=		hacking tools vmintegration
+INFO=		cp-hacking cp-tools cp-vmintegration
 
 CONFLICTS=	sablevm-classpath-*
 
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/java/classpath/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo	15 Nov 2006 18:05:33 -0000	1.10
+++ distinfo	17 Mar 2008 19:26:13 -0000
@@ -1,3 +1,3 @@
-MD5 (classpath-0.92.tar.gz) = 4603ef3e593713d94788b919bc0b6c75
-SHA256 (classpath-0.92.tar.gz) = 8bc678263b40635623995826a3c1f0ea177dba9cc29bfe6572cc8acdb182b0d0
-SIZE (classpath-0.92.tar.gz) = 9161101
+MD5 (classpath-0.97.1.tar.gz) = 35e81f0e0055a8b8a7a879077cf2b3c6
+SHA256 (classpath-0.97.1.tar.gz) = 6d03fc6ee0e33a32d6bf9c4b1114505ac568ba17e7c7eef6c76918e53174b7c5
+SIZE (classpath-0.97.1.tar.gz) = 10275689
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/java/classpath/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	25 Nov 2006 14:45:15 -0000	1.3
+++ pkg-plist	17 Mar 2008 22:13:43 -0000
@@ -10,13 +10,15 @@
 include/jni_md.h
 lib/classpath/libgconfpeer.la
 lib/classpath/libgconfpeer.so
-lib/classpath/libgconfpeer.so.0
 lib/classpath/libjavaio.la
 lib/classpath/libjavaio.so
 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
@@ -32,8 +34,7 @@
 lib/logging.properties
 lib/security/classpath.security
 @dirrm lib/classpath
-@dirrm lib/security
-%%DATADIR%%/README
+@dirrmtry lib/security
 %%DATADIR%%/examples/Makefile.java2d
 %%DATADIR%%/examples/Makefile.jawt
 %%DATADIR%%/examples/README
@@ -58,6 +59,17 @@
 %%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java
 %%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java
 %%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/BrowserEditorKit.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/forms.html
+%%DATADIR%%/examples/gnu/classpath/examples/swing/frame1.html
+%%DATADIR%%/examples/gnu/classpath/examples/swing/frame2.html
+%%DATADIR%%/examples/gnu/classpath/examples/swing/frame3.html
+%%DATADIR%%/examples/gnu/classpath/examples/swing/frame4.html
+%%DATADIR%%/examples/gnu/classpath/examples/swing/frames.html
+%%DATADIR%%/examples/gnu/classpath/examples/swing/tables.html
+%%DATADIR%%/examples/gnu/classpath/examples/swing/textstyles.html
+%%DATADIR%%/examples/gnu/classpath/examples/swing/welcome.html
+%%DATADIR%%/examples/gnu/classpath/examples/sound/AudioPlayerSample.java
 %%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/README.html
 %%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java
 %%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java
@@ -77,10 +89,15 @@
 %%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java
 %%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java
 %%DATADIR%%/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
+%%DATADIR%%/examples/gnu/classpath/examples/awt/HintingDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/awt/AnimationApplet.java
 %%DATADIR%%/examples/gnu/classpath/examples/awt/Demo.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/reload.png
+%%DATADIR%%/examples/gnu/classpath/examples/icons/palme.gif
 %%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
@@ -141,6 +158,7 @@
 %%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