- Update to 0.99.

- Reset maintainer to java (ports/164941).
- Convert to optionsNG.
- Honor NOPORTEXAMPLES.

4 files changed, 204 insertions, 168 deletions

diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 635db5a2bf5e..a5e87913d434 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -7,33 +7,40 @@
 #
 
 PORTNAME=	classpath
-PORTVERSION=	0.97.2
-PORTREVISION=	5
+PORTVERSION=	0.99
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	bkoenig@alpha-tierchen.de
+MAINTAINER=	java@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 \
+		${JAVALIBDIR}/antlr.jar:${PORTSDIR}/devel/antlr
 
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
+USE_LDCONFIG=	yes
+USE_PERL5_BUILD=yes
+USE_PKGCONFIG=	build
 USE_XORG=	x11 ice xtst xaw xproto xext
 WANT_GNOME=	yes
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
+
 CXXFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-jni --disable-alsa --disable-dssi --disable-plugin
-USE_GMAKE=	yes
+CONFIGURE_ARGS+=--with-antlr-jar=${JAVALIBDIR}/antlr.jar
+CONFIGURE_ARGS+=--with-jar=${JAR}
 
 MAN1=		gappletviewer.1 \
+		gcjh.1 \
 		gjar.1 \
 		gjarsigner.1 \
 		gjavah.1 \
-		gcjh.1 \
+		gjdoc.1 \
 		gkeytool.1 \
 		gnative2ascii.1 \
 		gorbd.1 \
@@ -46,14 +53,15 @@ INFO=		cp-hacking cp-tools cp-vmintegration
 
 CONFLICTS=	sablevm-classpath-*
 
-OPTIONS=	GCONF "Use GConf based preferences backend" OFF \
-		GTK2 "Enable Gtk+ AWT peer" ON \
-		CAIRO "Use Gtk+ Cairo based Graphics2D" OFF \
-		QT4 "Enable Qt AWT peer" OFF
+OPTIONS_DEFINE=	CAIRO GCONF GTK2 QT4
+OPTIONS_DEFAULT=GTK2
+CAIRO_DESC=	Use Gtk+ Cairo based Graphics2D
+GTK2_DESC=	Enable Gtk+ AWT peer
+QT4_DESC=	Enable Qt AWT peer
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GCONF)
+.if ${PORT_OPTIONS:MGCONF}
 USE_GNOME+=		gconf2
 CONFIGURE_ARGS+=	--enable-default-preferences-peer=gconf
 PLIST_SUB+=		GCONF=""
@@ -62,23 +70,23 @@ CONFIGURE_ARGS+=	--enable-default-preferences-peer=file --disable-gconf-peer
 PLIST_SUB+=		GCONF="@comment "
 .endif
 
-.if defined(WITHOUT_GTK2)
-CONFIGURE_ARGS+=	--disable-gtk-peer
-PLIST_SUB+=		GTK2="@comment "
-.if defined(WITH_CAIRO)
-IGNORE=you need to enable the Gtk+ AWT peer in order to use Cairo based Graphics2D.
-.endif
-.else
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=		gtk20
 PLIST_SUB+=		GTK2=""
-.if defined(WITH_CAIRO)
+.if ${PORT_OPTIONS:MCAIRO}
 CONFIGURE_ARGS+=	--enable-gtk-cairo
 .endif
+.else
+CONFIGURE_ARGS+=	--disable-gtk-peer
+PLIST_SUB+=		GTK2="@comment "
+.if ${PORT_OPTIONS:MCAIRO}
+IGNORE=you need to enable the Gtk+ AWT peer in order to use Cairo based Graphics2D.
+.endif
 .endif
 
-.if defined(WITH_QT4)
+.if ${PORT_OPTIONS:MQT4}
 CONFIGURE_ARGS+=	--enable-qt-peer
-.if defined(WITHOUT_GTK2)
+.if empty(PORT_OPTIONS:MGTK2)
 CONFIGURE_ARGS+=	--enable-default-toolkit=gnu.java.awt.peer.qt.QtToolkit
 .endif
 CONFIGURE_ENV+=		MOC="${LOCALBASE}/bin/moc-qt4"
@@ -88,4 +96,10 @@ PLIST_SUB+=		QT4=""
 PLIST_SUB+=		QT4="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.if ${PORT_OPTIONS:MEXAMPLES}
+EXAMPLESDIR=		${DATADIR}/examples
+.else
+CONFIGURE_ARGS+=	--disable-examples
+.endif
+
+.include <bsd.port.mk>
diff --git a/java/classpath/distinfo b/java/classpath/distinfo
index 60d7eba90688..d96ba42ded10 100644
--- a/java/classpath/distinfo
+++ b/java/classpath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (classpath-0.97.2.tar.gz) = 001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4
-SIZE (classpath-0.97.2.tar.gz) = 10318014
+SHA256 (classpath-0.99.tar.gz) = f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8
+SIZE (classpath-0.99.tar.gz) = 11078232
diff --git a/java/classpath/files/patch-native__jni__java-io__java_io_VMConsole.c b/java/classpath/files/patch-native__jni__java-io__java_io_VMConsole.c
new file mode 100644
index 000000000000..b07b1bb270d8
--- /dev/null
+++ b/java/classpath/files/patch-native__jni__java-io__java_io_VMConsole.c
@@ -0,0 +1,21 @@
+--- native/jni/java-io/java_io_VMConsole.c.orig	2012-01-08 07:35:53.000000000 -0500
++++ native/jni/java-io/java_io_VMConsole.c	2012-09-13 17:35:29.000000000 -0400
+@@ -47,7 +47,7 @@
+ 
+ /*************************************************************************/
+ 
+-#define TERMIOS_ECHO_IFLAGS (IUCLC|IXON|IXOFF|IXANY)
++#define TERMIOS_ECHO_IFLAGS (IXON|IXOFF|IXANY)
+ #define TERMIOS_ECHO_LFLAGS (ECHO|ECHOE|ECHOK|ECHONL|TOSTOP)
+ 
+ /*
+@@ -78,6 +78,9 @@
+   tcgetattr (STDIN_FILENO, &new);
+ 
+   new.c_iflag &= ~TERMIOS_ECHO_IFLAGS;
++#ifdef IUCLC
++  new.c_iflag &= ~IUCLC;
++#endif
+   new.c_lflag &= ~TERMIOS_ECHO_LFLAGS;
+ 
+   tcsetattr (STDIN_FILENO, TCSANOW, &new);
diff --git a/java/classpath/pkg-plist b/java/classpath/pkg-plist
index 8d6abf5687dd..eaa8832a0052 100644
--- a/java/classpath/pkg-plist
+++ b/java/classpath/pkg-plist
@@ -2,6 +2,7 @@ bin/gappletviewer
 bin/gjavah
 bin/gjar
 bin/gjarsigner
+bin/gjdoc
 bin/gkeytool
 bin/gnative2ascii
 bin/gorbd
@@ -47,147 +48,147 @@ lib/logging.properties
 lib/security/classpath.security
 @dirrm lib/classpath
 @dirrm lib/security
-%%DATADIR%%/examples/Makefile.java2d
-%%DATADIR%%/examples/Makefile.jawt
-%%DATADIR%%/examples/README
-%%DATADIR%%/examples/examples.zip
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/NamingService/Demo.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/DemoServer.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/DemoServant.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/DemoTester.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/DirectTest.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/RequestTest.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPassHelper.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPassHolder.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturnHelper.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturnHolder.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNodeHelper.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNodeHolder.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java
-%%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/CORBA/swing/README.html
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/Player.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/State.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java
-%%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java
-%%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/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
-%%DATADIR%%/examples/gnu/classpath/examples/icons/stock-go-back.png
-%%DATADIR%%/examples/gnu/classpath/examples/icons/stock-go-down.png
-%%DATADIR%%/examples/gnu/classpath/examples/icons/stock-go-forward.png
-%%DATADIR%%/examples/gnu/classpath/examples/icons/stock-mic.png
-%%DATADIR%%/examples/gnu/classpath/examples/icons/stock-new.png
-%%DATADIR%%/examples/gnu/classpath/examples/icons/stock-open.png
-%%DATADIR%%/examples/gnu/classpath/examples/icons/stock-paste.png
-%%DATADIR%%/examples/gnu/classpath/examples/icons/stock-quit.png
-%%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/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
-%%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/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%%/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
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.java2d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.jawt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples.zip
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/NamingService/Demo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/DemoServer.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/DemoServant.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/DemoTester.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/DirectTest.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/RequestTest.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPassHelper.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPassHolder.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturnHelper.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturnHolder.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNodeHelper.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNodeHolder.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/README.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/Demo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/GameManager.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/IorReader.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/Player.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/State.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/X5Server.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/awt/AnimationApplet.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/awt/Demo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/awt/HintingDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/datatransfer/Demo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/html/Demo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/aicas.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/back.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/badge.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/big-fullscreen.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/big-home.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/big-warning.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/palme.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/reload.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-copy.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-cut.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-go-back.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-go-down.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-go-forward.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-mic.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-new.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-open.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-paste.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-quit.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-save-as.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-save.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-spell-check.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/J2dBenchmark.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/JNIOverhead.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/bench.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/bench.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/jawt/DemoJAWT.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/jawt/DemoJAWT.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestBeans.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestClassLoading.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestCompilation.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestGarbageCollector.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestMemory.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestMemoryManager.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestMemoryPool.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestOS.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestRuntime.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestThread.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/midi/Demo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/print/Demo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/sound/AudioPlayerSample.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/BrowserEditorKit.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ButtonDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ComboBoxDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/Demo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/DemoDesktop.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/DemoFactory.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/DocumentFilterDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/FileChooserDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/HtmlDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ListDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/MetalThemeEditor.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/MiniDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/NavigationFilterDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ProgressBarDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ScrollBarDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/SliderDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/SpinnerDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TabbedPaneDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TableDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TextAreaDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TextFieldDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TreeDemo.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/forms.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frame1.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frame2.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frame3.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frame4.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frames.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/tables.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/textstyles.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/welcome.html
 %%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
-@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
-@dirrm %%DATADIR%%/examples/gnu/classpath/examples/awt
-@dirrm %%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing/x5
-@dirrm %%DATADIR%%/examples/gnu/classpath/examples/CORBA/swing
-@dirrm %%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication
-@dirrm %%DATADIR%%/examples/gnu/classpath/examples/CORBA/SimpleCommunication
-@dirrm %%DATADIR%%/examples/gnu/classpath/examples/CORBA/NamingService
-@dirrm %%DATADIR%%/examples/gnu/classpath/examples/CORBA
-@dirrm %%DATADIR%%/examples/gnu/classpath/examples
-@dirrm %%DATADIR%%/examples/gnu/classpath
-@dirrm %%DATADIR%%/examples/gnu
-@dirrm %%DATADIR%%/examples
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/swing
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/sound
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/print
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/midi
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/management
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/jawt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/java2d
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/icons
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/html
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/datatransfer
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/awt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/NamingService
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%