[pkgsrc/trunk]: pkgsrc/lang/jdk Make bl3-ready -- do not set PREFIX, use path...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/643f116bfec9
branches:  trunk
changeset: 477368:643f116bfec9
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jul 01 00:00:43 2004 +0000

description:
Make bl3-ready -- do not set PREFIX, use paths relative to "real" PREFIX.

diffstat:

 lang/jdk/MESSAGE    |    10 +-
 lang/jdk/Makefile   |    24 +-
 lang/jdk/PLIST      |  1154 +++++++++++++++++++++++++-------------------------
 lang/jdk/PLIST-aout |    54 +-
 lang/jdk/PLIST-elf  |    88 +-
 5 files changed, 666 insertions(+), 664 deletions(-)

diffs (truncated from 1409 to 300 lines):

diff -r d6f5a0b58760 -r 643f116bfec9 lang/jdk/MESSAGE
--- a/lang/jdk/MESSAGE  Wed Jun 30 23:51:21 2004 +0000
+++ b/lang/jdk/MESSAGE  Thu Jul 01 00:00:43 2004 +0000
@@ -1,15 +1,15 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/10/13 07:29:32 jlam Exp $
+$NetBSD: MESSAGE,v 1.4 2004/07/01 00:00:43 wiz Exp $
 
 You may want to read
 
-       ${PREFIX}/README
+       ${JVM_HOME}/README
 
 for details about running this jdk.  In a nutshell you may want to set the
 following in your shell environment:
 
-        CLASSPATH to ${PREFIX}/lib/classes.zip:.
-        JAVA_HOME to ${PREFIX}
-       PATH to include ${PREFIX}/bin
+        CLASSPATH to ${JVM_HOME}/lib/classes.zip:.
+        JAVA_HOME to ${JVM_HOME}
+       PATH to include ${JVM_HOME}/bin
 
 ===========================================================================
diff -r d6f5a0b58760 -r 643f116bfec9 lang/jdk/Makefile
--- a/lang/jdk/Makefile Wed Jun 30 23:51:21 2004 +0000
+++ b/lang/jdk/Makefile Thu Jul 01 00:00:43 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/02/23 22:10:48 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2004/07/01 00:00:43 wiz Exp $
 #
 
 VERSION=       1.1.8
@@ -16,7 +16,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-JVM_HOME=      ${LOCALBASE}/java/jdk-${VERSION}
+JVM_HOME=      ${PREFIX}/java/jdk-${VERSION}
 
 .if ${OBJECT_FMT} == "ELF"
 DISTNAME=      jdk${VERSION}-rc1-elf
@@ -29,12 +29,13 @@
 .endif
 PLIST_SRC+=    ${PKGDIR}/PLIST
 
+MESSAGE_SUBST+=        JVM_HOME=${JVM_HOME:Q}
+
 CHECK_SHLIBS=  no
 
-USE_BUILDLINK2=        yes
+NO_BUILDLINK=  yes
 USE_PKGINSTALL=        yes
 NO_BUILD=      yes
-NO_MTREE=      yes     # since we change PREFIX below
 
 ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86
 RESTRICTED=    "No redistribution of the Java(tm) Development Kit"
@@ -43,7 +44,7 @@
 NO_SRC_ON_FTP=         ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 
-OWN_DIRS=      ${PREFIX} ${PREFIX}/lib ${PREFIX}/lib/security
+OWNDIRS+=      ${JVM_HOME} ${JVM_HOME}/lib ${JVM_HOME}/lib/security
 SFILES=                appletviewer.properties         awt.properties
 SFILES+=       content-types.properties        font.properties
 SFILES+=       font.properties.ISO8859_15_FDIS font.properties.cs
@@ -57,7 +58,7 @@
 SFILES+=       security/java.security
 SUPPORT_FILES= # empty
 .for FILE in ${SFILES}
-SUPPORT_FILES+=        ${PREFIX}/lib/${FILE}.default ${PREFIX}/lib/${FILE}
+SUPPORT_FILES+=        ${JVM_HOME}/lib/${FILE}.default ${JVM_HOME}/lib/${FILE}
 .endfor
 
 do-configure:
@@ -68,7 +69,7 @@
 .if ${OBJECT_FMT} == "ELF"
 # This gross hack normalizes the shlib names so that automatic
 # shared library handling will work.
-pre-install:
+post-patch:
        @(cd ${WRKSRC}/lib/i386/green_threads;                          \
        ${LN} -s libXm.so libXm.so.2;                                   \
        for X in lib*.so ;do                                            \
@@ -86,11 +87,8 @@
 
 do-install:
        ${RM} -f ${WRKSRC}/*.orig
-       ${INSTALL_PROGRAM_DIR} ${PREFIX}
-       cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}
-       ${RM} -f ${PREFIX}/bin/i386/green_threads/javac.orig
+       ${INSTALL_PROGRAM_DIR} ${JVM_HOME}
+       cd ${WRKSRC} && ${PAX} -rw . ${JVM_HOME}
+       ${RM} -f ${JVM_HOME}/bin/i386/green_threads/javac.orig
 
 .include "../../mk/bsd.pkg.mk"
-
-# This needs to be after bsd.pkg.mk
-PREFIX=                ${JVM_HOME}
diff -r d6f5a0b58760 -r 643f116bfec9 lang/jdk/PLIST
--- a/lang/jdk/PLIST    Wed Jun 30 23:51:21 2004 +0000
+++ b/lang/jdk/PLIST    Thu Jul 01 00:00:43 2004 +0000
@@ -1,576 +1,580 @@
-@comment $NetBSD: PLIST,v 1.5 2003/02/11 04:23:14 jlam Exp $
-CHANGES
-COPYRIGHT
-LICENSE
-README
-README.NetBSD
-bin/.java_wrapper
-bin/appletviewer
-bin/i386/green_threads/.extract_args
-bin/i386/green_threads/appletviewer
-bin/i386/green_threads/jar
-bin/i386/green_threads/java
-bin/i386/green_threads/java_g
-bin/i386/green_threads/javac
-bin/i386/green_threads/javac_g
-bin/i386/green_threads/javadoc
-bin/i386/green_threads/javah
-bin/i386/green_threads/javah_g
-bin/i386/green_threads/javakey
-bin/i386/green_threads/javap
-bin/i386/green_threads/javaverify
-bin/i386/green_threads/javaverify_g
-bin/i386/green_threads/jdb
-bin/i386/green_threads/jre
-bin/i386/green_threads/jre_g
-bin/i386/green_threads/native2ascii
-bin/i386/green_threads/rmic
-bin/i386/green_threads/rmiregistry
-bin/i386/green_threads/serialver
-bin/jar
-bin/java
-bin/java-rmi.cgi
-bin/java_g
-bin/javac
-bin/javac_g
-bin/javadoc
-bin/javah
-bin/javah_g
-bin/javakey
-bin/javap
-bin/javaverify
-bin/javaverify_g
-bin/jdb
-bin/jre
-bin/jre_g
-bin/native2ascii
-bin/rmic
-bin/rmiregistry
-bin/serialver
-demo/Animator/Animator.class
-demo/Animator/Animator.java
-demo/Animator/DescriptionFrame.class
-demo/Animator/ParseException.class
-demo/Animator/audio/0.au
-demo/Animator/audio/1.au
-demo/Animator/audio/2.au
-demo/Animator/audio/3.au
-demo/Animator/audio/4.au
-demo/Animator/audio/5.au
-demo/Animator/audio/6.au
-demo/Animator/audio/7.au
-demo/Animator/audio/8.au
-demo/Animator/audio/9.au
-demo/Animator/audio/spacemusic.au
-demo/Animator/example1.html
-demo/Animator/example2.html
-demo/Animator/example3.html
-demo/Animator/example4.html
-demo/Animator/images/Beans/T1.gif
-demo/Animator/images/Beans/T10.gif
-demo/Animator/images/Beans/T2.gif
-demo/Animator/images/Beans/T3.gif
-demo/Animator/images/Beans/T4.gif
-demo/Animator/images/Beans/T5.gif
-demo/Animator/images/Beans/T6.gif
-demo/Animator/images/Beans/T7.gif
-demo/Animator/images/Beans/T8.gif
-demo/Animator/images/Beans/T9.gif
-demo/Animator/images/SimpleAnimation/T1.gif
-demo/Animator/images/SimpleAnimation/T2.gif
-demo/Animator/images/loading-msg.gif
-demo/ArcTest/ArcCanvas.class
-demo/ArcTest/ArcControls.class
-demo/ArcTest/ArcTest.class
-demo/ArcTest/ArcTest.java
-demo/ArcTest/example1.html
-demo/BarChart/Chart.class
-demo/BarChart/Chart.java
-demo/BarChart/example1.html
-demo/Blink/Blink.class
-demo/Blink/Blink.java
-demo/Blink/example1.html
-demo/CardTest/CardPanel.class
-demo/CardTest/CardTest.class
-demo/CardTest/CardTest.java
-demo/CardTest/example1.html
-demo/Clock/Clock2.class
-demo/Clock/Clock2.java
-demo/Clock/example1.html
-demo/DitherTest/DitherCanvas.class
-demo/DitherTest/DitherControls.class
-demo/DitherTest/DitherTest.class
-demo/DitherTest/DitherTest.java
-demo/DitherTest/example1.html
-demo/DrawTest/DrawControls.class
-demo/DrawTest/DrawPanel.class
-demo/DrawTest/DrawTest.class
-demo/DrawTest/DrawTest.java
-demo/DrawTest/example1.html
-demo/Fractal/CLSFractal.class
-demo/Fractal/CLSFractal.java
-demo/Fractal/CLSRule.class
-demo/Fractal/CLSTurtle.class
-demo/Fractal/ContextLSystem.class
-demo/Fractal/example1.html
-demo/GraphLayout/Edge.class
-demo/GraphLayout/Graph.class
-demo/GraphLayout/Graph.java
-demo/GraphLayout/GraphPanel.class
-demo/GraphLayout/Node.class
-demo/GraphLayout/audio/computer.au
-demo/GraphLayout/audio/drip.au
-demo/GraphLayout/audio/gong.au
-demo/GraphLayout/example1.html
-demo/GraphLayout/example2.html
-demo/GraphLayout/example3.html
-demo/GraphLayout/example4.html
-demo/GraphicsTest/AppletFrame.class
-demo/GraphicsTest/AppletFrame.java
-demo/GraphicsTest/ArcCard.class
-demo/GraphicsTest/ArcDegreePanel.class
-demo/GraphicsTest/ArcPanel.class
-demo/GraphicsTest/ColorUtils.class
-demo/GraphicsTest/GraphicsCards.class
-demo/GraphicsTest/GraphicsPanel.class
-demo/GraphicsTest/GraphicsTest.class
-demo/GraphicsTest/GraphicsTest.java
-demo/GraphicsTest/OvalShape.class
-demo/GraphicsTest/PolygonShape.class
-demo/GraphicsTest/RectShape.class
-demo/GraphicsTest/RoundRectShape.class
-demo/GraphicsTest/Shape.class
-demo/GraphicsTest/ShapeTest.class
-demo/GraphicsTest/example1.html
-demo/ImageMap/AniArea.class
-demo/ImageMap/AniArea.java
-demo/ImageMap/ButtonFilter.class
-demo/ImageMap/ButtonFilter.java
-demo/ImageMap/ClickArea.class
-demo/ImageMap/ClickArea.java
-demo/ImageMap/DelayedSoundArea.class
-demo/ImageMap/DelayedSoundArea.java
-demo/ImageMap/HighlightArea.class
-demo/ImageMap/HighlightArea.java
-demo/ImageMap/HighlightFilter.class
-demo/ImageMap/HighlightFilter.java
-demo/ImageMap/HrefButtonArea.class
-demo/ImageMap/HrefButtonArea.java
-demo/ImageMap/ImageMap.class
-demo/ImageMap/ImageMap.java
-demo/ImageMap/ImageMapArea.class
-demo/ImageMap/ImageMapArea.java
-demo/ImageMap/LinkArea.class
-demo/ImageMap/LinkArea.java
-demo/ImageMap/NameArea.class
-demo/ImageMap/NameArea.java
-demo/ImageMap/RoundButtonFilter.class
-demo/ImageMap/RoundButtonFilter.java
-demo/ImageMap/RoundHrefButtonArea.class
-demo/ImageMap/RoundHrefButtonArea.java
-demo/ImageMap/SoundArea.class
-demo/ImageMap/SoundArea.java
-demo/ImageMap/TickerArea.class
-demo/ImageMap/TickerArea.java
-demo/ImageMap/audio/chirp1.au
-demo/ImageMap/audio/hi.au
-demo/ImageMap/example1.html
-demo/ImageMap/imagemapcheat.html
-demo/ImageMap/images/jim.graham.gif
-demo/ImageMap/sources.html
-demo/JumpingBox/MouseTrack.class
-demo/JumpingBox/MouseTrack.java
-demo/JumpingBox/example1.html
-demo/JumpingBox/sounds/adapt-or-die.au
-demo/JumpingBox/sounds/cannot.be.completed.au
-demo/JumpingBox/sounds/ip.au
-demo/JumpingBox/sounds/that.hurts.au
-demo/JumpingBox/sounds/thin.bell.au
-demo/JumpingBox/sounds/tiptoe.thru.the.tulips.au
-demo/MoleculeViewer/Atom.class
-demo/MoleculeViewer/Matrix3D.class
-demo/MoleculeViewer/Matrix3D.java
-demo/MoleculeViewer/XYZApp.class
-demo/MoleculeViewer/XYZApp.java
-demo/MoleculeViewer/XYZChemModel.class
-demo/MoleculeViewer/example1.html