From 4efcc997227145e0a9cf9d762dbab64033f62b2c Mon Sep 17 00:00:00 2001 From: naddy Date: Tue, 12 Oct 2004 20:46:22 +0000 Subject: [PATCH] - Stop installing man pages in man dirs. Use @mandir instead to avoid conflicts with JRE and future JDKs. - Add flavor descriptions to DESCR*. - Add missing lib depend via MODULES devel/gettext. - Comment the native_threads dir creation that was added in a recent commit. From: Kurt Miller --- devel/jdk/1.3/Makefile | 12 ++------ devel/jdk/1.3/pkg/DESCR | 11 ++++++++ devel/jdk/1.3/pkg/DESCR-jre | 11 ++++++++ devel/jdk/1.3/pkg/PLIST | 55 ++++++++++++++----------------------- devel/jdk/1.3/pkg/PLIST-jre | 24 ++++++---------- 5 files changed, 55 insertions(+), 58 deletions(-) diff --git a/devel/jdk/1.3/Makefile b/devel/jdk/1.3/Makefile index 91d101c5a21..6f90cbc4e8f 100644 --- a/devel/jdk/1.3/Makefile +++ b/devel/jdk/1.3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2004/08/14 21:50:38 naddy Exp $ +# $OpenBSD: Makefile,v 1.7 2004/10/12 20:46:22 naddy Exp $ # $FreeBSD: ports/java/jdk12/Makefile,v 1.11 2002/08/19 20:47:04 glewis Exp $ # Requires existing JDK 1.3 to build @@ -66,6 +66,8 @@ LIB_DEPENDS= glib.1::devel/glib \ gtk.1.2::x11/gtk+ \ nspr4.1::devel/nspr +MODULES= devel/gettext + MAKE_ENV+= LIBG_HDRS="${LOCALBASE}/include/glib-1.2" \ GTK_HDRS="${LOCALBASE}/include/gtk-1.2" \ LIBIDL_HDRS= \ @@ -104,11 +106,6 @@ JDKIMAGEDIR= ${WRKDIR}/j2sdk1.3.1/build/bsd-${ARCH}/jdk-image-${ARCH} JDKIMAGEDIR_G= ${WRKDIR}/j2sdk1.3.1/build/bsd-${ARCH}/jdk-debug-image-${ARCH} JREIMAGEDIR= ${WRKDIR}/j2sdk1.3.1/build/bsd-${ARCH}/jre-image-${ARCH} CACERTSDIR= ${WRKDIR}/j2sdk1.3.1/src/share/lib/security -MANPAGEDIR= ${JDKIMAGEDIR}/man/man1 - -MANPAGES= appletviewer.1 extcheck.1 jar.1 jarsigner.1 java.1 javac.1 \ - javadoc.1 javah.1 javap.1 jdb.1 keytool.1 native2ascii.1 \ - rmic.1 rmid.1 rmiregistry.1 serialver.1 tnameserv.1 SYSCTL= ${SUDO} sysctl -w kern.emul.linux @@ -135,8 +132,5 @@ do-install: cd ${JREIMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${JREHOME} -xf - cd ${PREFIX}/${JDKHOME}/include && ln -s openbsd/* . cd ${PREFIX}/${JDKHOME}/include-old && ln -s openbsd/* . -.for i in ${MANPAGES} - ${INSTALL_MAN} ${MANPAGEDIR}/$i ${PREFIX}/man/man1/${i:T:R}.1 -.endfor .include diff --git a/devel/jdk/1.3/pkg/DESCR b/devel/jdk/1.3/pkg/DESCR index c5bb71fe2c6..5d69698bc21 100644 --- a/devel/jdk/1.3/pkg/DESCR +++ b/devel/jdk/1.3/pkg/DESCR @@ -6,3 +6,14 @@ testing programs written in the Java programming language and running on the Java platform. These tools are designed to be used from the command line. Except for the appletviewer, these tools do not provide a graphical user interface. + +Flavors: + native_bootstrap + Bootstrap the jdk using a previously built and installed + devel/jdk/1.3 package. NOTE: if this flavor is used without a + previously installed devel/jdk/1.3 package, the port will + build the jdk twice! + + no_plugin + The Mozilla plugin is not built. If the plugin is not needed + this flavor reduces runtime dependencies. diff --git a/devel/jdk/1.3/pkg/DESCR-jre b/devel/jdk/1.3/pkg/DESCR-jre index b65a49d99a5..e76da1ff4e0 100644 --- a/devel/jdk/1.3/pkg/DESCR-jre +++ b/devel/jdk/1.3/pkg/DESCR-jre @@ -7,3 +7,14 @@ necessary to run programs written in the Java programming language. It is not a development environment and does not contain development tools such as compilers and debuggers. For development tools, use the Java 2 SDK, Standard Edition. + +Flavors: + native_bootstrap + Bootstrap the jdk using a previously built and installed + devel/jdk/1.3 package. NOTE: if this flavor is used without a + previously installed devel/jdk/1.3 package, the port will + build the jdk twice! + + no_plugin + The Mozilla plugin is not built. If the plugin is not needed + this flavor reduces runtime dependencies. diff --git a/devel/jdk/1.3/pkg/PLIST b/devel/jdk/1.3/pkg/PLIST index bb99de110a8..dbf821f01c7 100644 --- a/devel/jdk/1.3/pkg/PLIST +++ b/devel/jdk/1.3/pkg/PLIST @@ -1,7 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.4 2004/09/26 11:19:08 espie Exp $ +@comment $OpenBSD: PLIST,v 1.5 2004/10/12 20:46:22 naddy Exp $ @option no-default-conflict @conflict jdk->=1.3,<1.4 -@conflict jre->=1.3,<1.4 ${JDKHOME}/ ${JDKHOME}/COPYRIGHT ${JDKHOME}/LICENSE @@ -816,7 +815,7 @@ ${JDKHOME}/jre/bin/${MACHINE_ARCH}/green_threads/serialver ${JDKHOME}/jre/bin/${MACHINE_ARCH}/green_threads/serialver_g ${JDKHOME}/jre/bin/${MACHINE_ARCH}/green_threads/tnameserv ${JDKHOME}/jre/bin/${MACHINE_ARCH}/green_threads/tnameserv_g -${JDKHOME}/jre/bin/${MACHINE_ARCH}/native_threads/ +@comment ${JDKHOME}/jre/bin/${MACHINE_ARCH}/native_threads/ ${JDKHOME}/jre/bin/java ${JDKHOME}/jre/bin/keytool ${JDKHOME}/jre/bin/policytool @@ -933,36 +932,24 @@ ${JDKHOME}/lib/${MACHINE_ARCH}/libjdwp.so ${JDKHOME}/lib/ir.idl ${JDKHOME}/lib/orb.idl ${JDKHOME}/lib/tools.jar -@comment ${JDKHOME}/man/ -@comment ${JDKHOME}/man/man1/ -@comment @man ${JDKHOME}/man/man1/appletviewer.1 -@comment @man ${JDKHOME}/man/man1/extcheck.1 -@comment @man ${JDKHOME}/man/man1/jar.1 -@comment @man ${JDKHOME}/man/man1/jarsigner.1 -@comment @man ${JDKHOME}/man/man1/java.1 -@comment @man ${JDKHOME}/man/man1/javac.1 -@comment @man ${JDKHOME}/man/man1/javadoc.1 -@comment @man ${JDKHOME}/man/man1/javah.1 -@comment @man ${JDKHOME}/man/man1/javap.1 -@comment @man ${JDKHOME}/man/man1/jdb.1 -@comment @man ${JDKHOME}/man/man1/keytool.1 -@comment @man ${JDKHOME}/man/man1/native2ascii.1 -@comment @man ${JDKHOME}/man/man1/rmic.1 -@comment @man ${JDKHOME}/man/man1/rmid.1 -@comment @man ${JDKHOME}/man/man1/rmiregistry.1 -@comment @man ${JDKHOME}/man/man1/serialver.1 -@comment @man ${JDKHOME}/man/man1/tnameserv.1 +@mandir ${JDKHOME}/man/ +${JDKHOME}/man/man1/ +@man ${JDKHOME}/man/man1/appletviewer.1 +@man ${JDKHOME}/man/man1/extcheck.1 +@man ${JDKHOME}/man/man1/jar.1 +@man ${JDKHOME}/man/man1/jarsigner.1 +@man ${JDKHOME}/man/man1/java.1 +@man ${JDKHOME}/man/man1/javac.1 +@man ${JDKHOME}/man/man1/javadoc.1 +@man ${JDKHOME}/man/man1/javah.1 +@man ${JDKHOME}/man/man1/javap.1 +@man ${JDKHOME}/man/man1/jdb.1 +@man ${JDKHOME}/man/man1/keytool.1 +@man ${JDKHOME}/man/man1/native2ascii.1 +@man ${JDKHOME}/man/man1/rmic.1 +@man ${JDKHOME}/man/man1/rmid.1 +@man ${JDKHOME}/man/man1/rmiregistry.1 +@man ${JDKHOME}/man/man1/serialver.1 +@man ${JDKHOME}/man/man1/tnameserv.1 ${JDKHOME}/src.jar -@man man/man1/appletviewer.1 -@man man/man1/extcheck.1 -@man man/man1/jar.1 -@man man/man1/jarsigner.1 -@man man/man1/javac.1 -@man man/man1/javadoc.1 -@man man/man1/javah.1 -@man man/man1/javap.1 -@man man/man1/jdb.1 -@man man/man1/native2ascii.1 -@man man/man1/rmic.1 -@man man/man1/serialver.1 !%%no_plugin%% diff --git a/devel/jdk/1.3/pkg/PLIST-jre b/devel/jdk/1.3/pkg/PLIST-jre index 0e888e08904..800431b7f9c 100644 --- a/devel/jdk/1.3/pkg/PLIST-jre +++ b/devel/jdk/1.3/pkg/PLIST-jre @@ -1,7 +1,6 @@ -@comment $OpenBSD: PLIST-jre,v 1.3 2004/09/18 10:55:04 espie Exp $ +@comment $OpenBSD: PLIST-jre,v 1.4 2004/10/12 20:46:22 naddy Exp $ @option no-default-conflict -@conflict jdk->=1.3,1.4 -@conflict jre->=1.3,1.4 +@conflict jre->=1.3,<1.4 ${JREHOME}/ ${JREHOME}/CHANGES ${JREHOME}/COPYRIGHT @@ -123,17 +122,12 @@ ${JREHOME}/lib/security/java.policy ${JREHOME}/lib/security/java.security ${JREHOME}/lib/sunrsasign.jar ${JREHOME}/lib/tzmappings -@comment ${JREHOME}/man/ -@comment ${JREHOME}/man/man1/ -@comment @man ${JREHOME}/man/man1/java.1 -@comment @man ${JREHOME}/man/man1/keytool.1 -@comment @man ${JREHOME}/man/man1/rmid.1 -@comment @man ${JREHOME}/man/man1/rmiregistry.1 -@comment @man ${JREHOME}/man/man1/tnameserv.1 +@mandir ${JREHOME}/man/ +${JREHOME}/man/man1/ +@man ${JREHOME}/man/man1/java.1 +@man ${JREHOME}/man/man1/keytool.1 +@man ${JREHOME}/man/man1/rmid.1 +@man ${JREHOME}/man/man1/rmiregistry.1 +@man ${JREHOME}/man/man1/tnameserv.1 ${JREHOME}/plugin/ -@man man/man1/java.1 -@man man/man1/keytool.1 -@man man/man1/rmid.1 -@man man/man1/rmiregistry.1 -@man man/man1/tnameserv.1 !%%no_plugin%%