From 5427f343f86224210a0844d018a5d2dad5a4f6da Mon Sep 17 00:00:00 2001 From: Ernst de Haan Date: Tue, 28 May 2002 09:28:11 +0000 Subject: [PATCH] Improved download URL. Prompted by: obrien Also now unregistering with javavm at deinstallation. --- java/linux-jdk14/Makefile | 2 +- java/linux-jdk14/pkg-plist | 1 + java/linux-sun-jdk14/Makefile | 2 +- java/linux-sun-jdk14/pkg-plist | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/linux-jdk14/Makefile b/java/linux-jdk14/Makefile index eb3a371c09b6..133b66518ee6 100644 --- a/java/linux-jdk14/Makefile +++ b/java/linux-jdk14/Makefile @@ -38,7 +38,7 @@ DL_JDK_VERSION= 1.4.0 INSTALL_JDK_VERSION= 1.4.0 ONLY_FOR_ARCHS= i386 TARGET_DIR?= ${PREFIX}/${PKGBASE}${PORTVERSION} -DOWNLOAD_URL?= http://java.sun.com/j2se/1.4/ +DOWNLOAD_URL?= http://java.sun.com/Download6?url=/Download6&config-file=j2sdk-1_4_0.config&platform=linux-i386 PORTTITLE= Java 2 Development Kit ${INSTALL_JDK_VERSION} for Linux .include diff --git a/java/linux-jdk14/pkg-plist b/java/linux-jdk14/pkg-plist index a78ed740fbc2..d2b27f1aeb02 100644 --- a/java/linux-jdk14/pkg-plist +++ b/java/linux-jdk14/pkg-plist @@ -1,3 +1,4 @@ +@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" %%T%%/jre/bin/java %%T%%/jre/bin/keytool %%T%%/jre/bin/policytool diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile index eb3a371c09b6..133b66518ee6 100644 --- a/java/linux-sun-jdk14/Makefile +++ b/java/linux-sun-jdk14/Makefile @@ -38,7 +38,7 @@ DL_JDK_VERSION= 1.4.0 INSTALL_JDK_VERSION= 1.4.0 ONLY_FOR_ARCHS= i386 TARGET_DIR?= ${PREFIX}/${PKGBASE}${PORTVERSION} -DOWNLOAD_URL?= http://java.sun.com/j2se/1.4/ +DOWNLOAD_URL?= http://java.sun.com/Download6?url=/Download6&config-file=j2sdk-1_4_0.config&platform=linux-i386 PORTTITLE= Java 2 Development Kit ${INSTALL_JDK_VERSION} for Linux .include diff --git a/java/linux-sun-jdk14/pkg-plist b/java/linux-sun-jdk14/pkg-plist index a78ed740fbc2..d2b27f1aeb02 100644 --- a/java/linux-sun-jdk14/pkg-plist +++ b/java/linux-sun-jdk14/pkg-plist @@ -1,3 +1,4 @@ +@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java" %%T%%/jre/bin/java %%T%%/jre/bin/keytool %%T%%/jre/bin/policytool