Update to 0.92.

PR:		103444
Submitted by:	Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
Approved by:	maintainer timeout (> 7 weeks)

3 files changed, 60 insertions, 57 deletions

diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 3bd730b58ea5..7e7b6a816d1a 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	classpath
-PORTVERSION=	0.90
+PORTVERSION=	0.92
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	rainer.alves@gmail.com
@@ -19,10 +20,14 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
 USE_JAVA=	yes
 USE_JIKES=	yes
+USE_GNOME=	gtk20 gdkpixbuf pkgconfig gconf2
 GNU_CONFIGURE=	yes
+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
 USE_GMAKE=	yes
 
-INFO=		hacking vmintegration
+INFO=		hacking tools vmintegration
 
 .include <bsd.port.mk>
diff --git a/java/classpath/distinfo b/java/classpath/distinfo
index 3c36481ad74d..2d70d4a93c58 100644
--- a/java/classpath/distinfo
+++ b/java/classpath/distinfo
@@ -1,3 +1,3 @@
-MD5 (classpath-0.90.tar.gz) = cf5aaaf07fe43567fa605b33165355d7
-SHA256 (classpath-0.90.tar.gz) = 4f2824c42062dea269e489c1acb2769c015bf78cdaa929ee75441d412f10a03b
-SIZE (classpath-0.90.tar.gz) = 7930836
+MD5 (classpath-0.92.tar.gz) = 4603ef3e593713d94788b919bc0b6c75
+SHA256 (classpath-0.92.tar.gz) = 8bc678263b40635623995826a3c1f0ea177dba9cc29bfe6572cc8acdb182b0d0
+SIZE (classpath-0.92.tar.gz) = 9161101
diff --git a/java/classpath/pkg-plist b/java/classpath/pkg-plist
index b5dec9eff6ec..d8ab1c80e7f9 100644
--- a/java/classpath/pkg-plist
+++ b/java/classpath/pkg-plist
@@ -1,7 +1,18 @@
+bin/gappletviewer
+bin/gjar
+bin/gjarsigner
+bin/gkeytool
+bin/gnative2ascii
+bin/gserialver
 include/jawt.h
 include/jawt_md.h
 include/jni.h
 include/jni_md.h
+lib/classpath/libgcjwebplugin.la
+lib/classpath/libgcjwebplugin.so
+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
@@ -22,6 +33,10 @@ lib/classpath/libjavautil.so
 lib/classpath/libjavautil.so.0
 lib/logging.properties
 lib/security/classpath.security
+@dirrm lib/classpath
+@dirrm lib/security
+%%DATADIR%%/README
+%%DATADIR%%/examples/Makefile.java2d
 %%DATADIR%%/examples/Makefile.jawt
 %%DATADIR%%/examples/README
 %%DATADIR%%/examples/examples.zip
@@ -63,9 +78,12 @@ lib/security/classpath.security
 %%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java
 %%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/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/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
@@ -82,72 +100,54 @@ lib/security/classpath.security
 %%DATADIR%%/examples/gnu/classpath/examples/icons/stock-save-as.png
 %%DATADIR%%/examples/gnu/classpath/examples/icons/stock-save.png
 %%DATADIR%%/examples/gnu/classpath/examples/icons/stock-spell-check.png
+%%DATADIR%%/examples/gnu/classpath/examples/java2d/J2dBenchmark.java
+%%DATADIR%%/examples/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java
+%%DATADIR%%/examples/gnu/classpath/examples/java2d/JNIOverhead.java
+%%DATADIR%%/examples/gnu/classpath/examples/java2d/bench.c
+%%DATADIR%%/examples/gnu/classpath/examples/java2d/bench.h
 %%DATADIR%%/examples/gnu/classpath/examples/jawt/DemoJAWT.c
 %%DATADIR%%/examples/gnu/classpath/examples/jawt/DemoJAWT.java
+%%DATADIR%%/examples/gnu/classpath/examples/management/TestBeans.java
+%%DATADIR%%/examples/gnu/classpath/examples/management/TestClassLoading.java
+%%DATADIR%%/examples/gnu/classpath/examples/management/TestCompilation.java
+%%DATADIR%%/examples/gnu/classpath/examples/management/TestGarbageCollector.java
+%%DATADIR%%/examples/gnu/classpath/examples/management/TestMemory.java
+%%DATADIR%%/examples/gnu/classpath/examples/management/TestMemoryManager.java
+%%DATADIR%%/examples/gnu/classpath/examples/management/TestMemoryPool.java
+%%DATADIR%%/examples/gnu/classpath/examples/management/TestOS.java
+%%DATADIR%%/examples/gnu/classpath/examples/management/TestRuntime.java
+%%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/swing/ButtonDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/ComboBoxDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/Demo.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/DemoDesktop.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/DemoFactory.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/FileChooserDemo.java
-%%DATADIR%%/examples/gnu/classpath/examples/swing/GNULookAndFeel.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/HtmlDemo.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/ListDemo.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/MetalThemeEditor.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/MiniDemo.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/ProgressBarDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/ScrollBarDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/SliderDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/SpinnerDemo.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/TabbedPaneDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/TableDemo.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/TextAreaDemo.java
 %%DATADIR%%/examples/gnu/classpath/examples/swing/TextFieldDemo.java
+%%DATADIR%%/examples/gnu/classpath/examples/swing/TreeDemo.java
 %%DATADIR%%/glibj.zip
-%%DATADIR%%/tools/gnu/classpath/tools/AbstractMethodGenerator.java
-%%DATADIR%%/tools/gnu/classpath/tools/HelpPrinter.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/GRMIC.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/GRMIC.txt
-%%DATADIR%%/tools/gnu/classpath/tools/giop/IorParser.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/IorParser.txt
-%%DATADIR%%/tools/gnu/classpath/tools/giop/NameService.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/NameServicePersistent.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/NameServicePersistent.txt
-%%DATADIR%%/tools/gnu/classpath/tools/giop/NamingService.txt
-%%DATADIR%%/tools/gnu/classpath/tools/giop/README
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/CompilationError.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/Generator.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/GiopIo.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/HashFinder.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/MethodGenerator.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/templates/ImplTie.jav
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/templates/Stub.jav
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/templates/StubMethod.jav
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/templates/StubMethodVoid.jav
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/templates/Tie.jav
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/templates/TieMethod.jav
-%%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/templates/TieMethodVoid.jav
-%%DATADIR%%/tools/gnu/classpath/tools/giop/nameservice/PersistentContext.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/nameservice/PersistentContextMap.java
-%%DATADIR%%/tools/gnu/classpath/tools/giop/nameservice/PersistentMap.java
-%%DATADIR%%/tools/gnu/classpath/tools/rmi/RMIC.java
-%%DATADIR%%/tools/gnu/classpath/tools/rmi/RMIC.txt
-%%DATADIR%%/tools/gnu/classpath/tools/rmi/rmic/RmiMethodGenerator.java
-%%DATADIR%%/tools/gnu/classpath/tools/rmi/rmic/RmicCompiler.java
-%%DATADIR%%/tools/gnu/classpath/tools/rmi/rmic/WrapUnWrapper.java
-%%DATADIR%%/tools/gnu/classpath/tools/rmi/rmic/templates/Stub_12.jav
-%%DATADIR%%/tools/gnu/classpath/tools/rmi/rmic/templates/Stub_12Method.jav
-%%DATADIR%%/tools/gnu/classpath/tools/rmi/rmic/templates/Stub_12MethodVoid.jav
-%%DATADIR%%/tools/tools.zip
-@dirrm %%DATADIR%%/tools/gnu/classpath/tools/rmi/rmic/templates
-@dirrm %%DATADIR%%/tools/gnu/classpath/tools/rmi/rmic
-@dirrm %%DATADIR%%/tools/gnu/classpath/tools/rmi
-@dirrm %%DATADIR%%/tools/gnu/classpath/tools/giop/nameservice
-@dirrm %%DATADIR%%/tools/gnu/classpath/tools/giop/grmic/templates
-@dirrm %%DATADIR%%/tools/gnu/classpath/tools/giop/grmic
-@dirrm %%DATADIR%%/tools/gnu/classpath/tools/giop
-@dirrm %%DATADIR%%/tools/gnu/classpath/tools
-@dirrm %%DATADIR%%/tools/gnu/classpath
-@dirrm %%DATADIR%%/tools/gnu
-@dirrm %%DATADIR%%/tools
+%%DATADIR%%/tools.zip
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/swing
+@dirrm %%DATADIR%%/examples/gnu/classpath/examples/print
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/midi
+@dirrm %%DATADIR%%/examples/gnu/classpath/examples/management
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/jawt
+@dirrm %%DATADIR%%/examples/gnu/classpath/examples/java2d
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/icons
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/html
 @dirrm %%DATADIR%%/examples/gnu/classpath/examples/datatransfer
@@ -162,6 +162,4 @@ lib/security/classpath.security
 @dirrm %%DATADIR%%/examples/gnu/classpath
 @dirrm %%DATADIR%%/examples/gnu
 @dirrm %%DATADIR%%/examples
-@dirrm share/classpath
-@dirrm lib/security
-@dirrm lib/classpath
+@dirrm %%DATADIR%%