diff options
author | tv <tv@pkgsrc.org> | 2004-10-11 14:07:36 +0000 |
---|---|---|
committer | tv <tv@pkgsrc.org> | 2004-10-11 14:07:36 +0000 |
commit | 85570525d2f753935b5972715896d2699a0a218d (patch) | |
tree | 711d158e3ac7582c005d38a75d627b0c33fb1fcd /lang | |
parent | 8e82497f83584f40b651209e86e2ff5dd3715f8a (diff) | |
download | pkgsrc-85570525d2f753935b5972715896d2699a0a218d.tar.gz |
Fix the "jre" symlink in the various Sun-based JDK packages; it was wrong
for quite some time after the ${PREFIX}/java migration. Since pkgsrc now
has proper symlink handling in pkg_install, this can now be a simple
PLIST entry rather than an @exec/@unexec pair.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/blackdown-jdk13/Makefile | 4 | ||||
-rw-r--r-- | lang/blackdown-jdk13/PLIST | 3 | ||||
-rw-r--r-- | lang/jdk/Makefile | 4 | ||||
-rw-r--r-- | lang/jdk/PLIST | 3 | ||||
-rw-r--r-- | lang/sun-jdk13/Makefile | 4 | ||||
-rw-r--r-- | lang/sun-jdk13/PLIST | 5 | ||||
-rw-r--r-- | lang/sun-jdk14/Makefile | 4 | ||||
-rw-r--r-- | lang/sun-jdk14/PLIST | 5 | ||||
-rw-r--r-- | lang/win32-jdk/PLIST | 5 |
9 files changed, 16 insertions, 21 deletions
diff --git a/lang/blackdown-jdk13/Makefile b/lang/blackdown-jdk13/Makefile index ca7e273a067..2a5bd7716b5 100644 --- a/lang/blackdown-jdk13/Makefile +++ b/lang/blackdown-jdk13/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.19 2004/07/01 10:56:10 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2004/10/11 14:07:36 tv Exp $ # BASENAME= j2sdk DISTNAME= ${EXTNAME}-${BLACKDOWN_ARCH} PKGNAME= blackdown-jdk13-1 -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= Linux port of the Blackdown Java(tm) Runtime Environment DEPENDS= blackdown-jre13>=1:../../lang/blackdown-jre13 diff --git a/lang/blackdown-jdk13/PLIST b/lang/blackdown-jdk13/PLIST index 9998011eb2b..c6c3ed57364 100644 --- a/lang/blackdown-jdk13/PLIST +++ b/lang/blackdown-jdk13/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2004/07/01 10:56:10 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2004/10/11 14:07:36 tv Exp $ java/blackdown-1.3.1/README.html java/blackdown-1.3.1/bin/HtmlConverter java/blackdown-1.3.1/bin/${BLACKDOWN_ARCH}/green_threads/appletviewer @@ -594,7 +594,6 @@ java/blackdown-1.3.1/include/jvmdi.h java/blackdown-1.3.1/include/jvmpi.h java/blackdown-1.3.1/include/linux/jawt_md.h java/blackdown-1.3.1/include/linux/jni_md.h -@exec ${LN} -sf . %D/jre java/blackdown-1.3.1/jre java/blackdown-1.3.1/lib/dt.jar java/blackdown-1.3.1/lib/htmlconverter.jar diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index 875572b2688..339ef9b35cf 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.40 2004/07/29 00:50:59 tv Exp $ +# $NetBSD: Makefile,v 1.41 2004/10/11 14:07:37 tv Exp $ # VERSION= 1.1.8 PKGNAME= jdk-${VERSION} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= lang java MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/ \ ftp://ftp.de.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/ diff --git a/lang/jdk/PLIST b/lang/jdk/PLIST index 4e6d795bbd7..2a0cd9e50e7 100644 --- a/lang/jdk/PLIST +++ b/lang/jdk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/07/29 00:50:59 tv Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/10/11 14:07:37 tv Exp $ bin/jdk11-appletviewer bin/jdk11-jar bin/jdk11-java @@ -475,7 +475,6 @@ java/jdk-1.1.8/include/verify.h java/jdk-1.1.8/include/wrap.h java/jdk-1.1.8/include/zip.h java/jdk-1.1.8/index.html -@exec ${LN} -sf . %D/jre java/jdk-1.1.8/jre java/jdk-1.1.8/lib/appletviewer.properties.default java/jdk-1.1.8/lib/awt.properties.default diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile index 81c6e4e850d..b8209a753f7 100644 --- a/lang/sun-jdk13/Makefile +++ b/lang/sun-jdk13/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2004/10/05 22:09:23 tv Exp $ +# $NetBSD: Makefile,v 1.31 2004/10/11 14:07:37 tv Exp $ DISTNAME= j2sdk-1_3_1_12-linux-i586 PKGNAME= sun-jdk13-1.0.12 -PKGREVISION= 1 +PKGREVISION= 2 MASTER_SITES= # empty COMMENT= Sun's Java(tm) Development Kit 1.3.1 diff --git a/lang/sun-jdk13/PLIST b/lang/sun-jdk13/PLIST index 1a1627934ae..51874296224 100644 --- a/lang/sun-jdk13/PLIST +++ b/lang/sun-jdk13/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/10/05 22:09:23 tv Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/10/11 14:07:37 tv Exp $ bin/sun13-appletviewer bin/sun13-extcheck bin/sun13-idlj @@ -590,8 +590,7 @@ java/sun-1.3.1/include/jvmdi.h java/sun-1.3.1/include/jvmpi.h java/sun-1.3.1/include/linux/jawt_md.h java/sun-1.3.1/include/linux/jni_md.h -@exec ${LN} -sf java/sun-1.3.1 %D/java/sun-1.3.1/jre -@unexec ${RM} -f %D/java/sun-1.3.1/jre +java/sun-1.3.1/jre java/sun-1.3.1/lib/dt.jar java/sun-1.3.1/lib/htmlconverter.jar java/sun-1.3.1/lib/i386/libdt_socket.so diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile index eb35b8718ff..b3241624048 100644 --- a/lang/sun-jdk14/Makefile +++ b/lang/sun-jdk14/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2004/10/05 22:09:23 tv Exp $ +# $NetBSD: Makefile,v 1.21 2004/10/11 14:07:38 tv Exp $ DISTNAME= j2sdk-1_4_2_05-linux-i586 PKGNAME= sun-jdk14-2.5 -PKGREVISION= 1 +PKGREVISION= 2 MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.2 diff --git a/lang/sun-jdk14/PLIST b/lang/sun-jdk14/PLIST index adda84cdf27..88196e5285a 100644 --- a/lang/sun-jdk14/PLIST +++ b/lang/sun-jdk14/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/10/05 22:09:23 tv Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/10/11 14:07:38 tv Exp $ bin/sun14-appletviewer bin/sun14-extcheck bin/sun14-idlj @@ -881,8 +881,7 @@ java/sun-1.4/include/jvmdi.h java/sun-1.4/include/jvmpi.h java/sun-1.4/include/linux/jawt_md.h java/sun-1.4/include/linux/jni_md.h -@exec ${LN} -sf java/sun-1.4 %D/java/sun-1.4/jre -@unexec ${RM} -f %D/java/sun-1.4/jre +java/sun-1.4/jre java/sun-1.4/lib/dt.jar java/sun-1.4/lib/htmlconverter.jar java/sun-1.4/lib/ir.idl diff --git a/lang/win32-jdk/PLIST b/lang/win32-jdk/PLIST index 0c549a6e9d3..441fbf2d485 100644 --- a/lang/win32-jdk/PLIST +++ b/lang/win32-jdk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/11 13:37:10 tv Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/10/11 14:07:38 tv Exp $ bin/win32-appletviewer bin/win32-extcheck bin/win32-idlj @@ -44,6 +44,5 @@ java/win32/bin/rmiregistry java/win32/bin/serialver java/win32/bin/servertool java/win32/bin/tnameserv -@exec ${LN} -sf . %D/java/win32/jre -@unexec ${RM} -f %D/java/win32/jre +java/win32/jre @dirrm java/win32/bin |