From 257a3fd325ea4b14044752ce64f21c0b5dd7404e Mon Sep 17 00:00:00 2001 From: Ernst de Haan Date: Thu, 21 Feb 2002 18:24:56 +0000 Subject: [PATCH] Improved the MASTER_SITES download locations. Also changed the RUN_DEPENDS for linux. It now checks for the existence of /compat/linux/lib/ld.so instead of the more obscure /compat/linux/usr/i486-linux-libc5/lib/libc.so.5, which does not even exist on my system, although I have installed linux_base. --- java/linux-blackdown-jdk12/Makefile | 10 ++++++---- java/linux-jdk/Makefile | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/java/linux-blackdown-jdk12/Makefile b/java/linux-blackdown-jdk12/Makefile index 43b33c571cc9..9e5041980d7a 100644 --- a/java/linux-blackdown-jdk12/Makefile +++ b/java/linux-blackdown-jdk12/Makefile @@ -8,14 +8,16 @@ PORTNAME= jdk PORTVERSION= 1.2.2 CATEGORIES= java devel -MASTER_SITES= ftp://iodynamics.com/pub/mirror/linux-jdk/JDK-1.2.2/i386/rc4/ \ - ftp://ftp.tux.org/pub/java/JDK-1.2.2/i386/rc4/ +MASTER_SITES= ftp://ftp.tux.org/pub/java/JDK-1.2.2/i386/rc4/ \ + http://www.metaverse.nl/~ernst/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= znerd PKGNAMEPREFIX= linux- -DISTNAME= jdk-1.2.2-RC4-linux-i386-glibc-2.1.2 +DISTNAME= ${PORTNAME}-${PORTVERSION}-RC4-linux-i386-glibc-2.1.2 MAINTAINER= znerd@FreeBSD.org -RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base \ +RUN_DEPENDS= /compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base \ javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License doesn\'t allow distribution with fee" diff --git a/java/linux-jdk/Makefile b/java/linux-jdk/Makefile index 43b33c571cc9..9e5041980d7a 100644 --- a/java/linux-jdk/Makefile +++ b/java/linux-jdk/Makefile @@ -8,14 +8,16 @@ PORTNAME= jdk PORTVERSION= 1.2.2 CATEGORIES= java devel -MASTER_SITES= ftp://iodynamics.com/pub/mirror/linux-jdk/JDK-1.2.2/i386/rc4/ \ - ftp://ftp.tux.org/pub/java/JDK-1.2.2/i386/rc4/ +MASTER_SITES= ftp://ftp.tux.org/pub/java/JDK-1.2.2/i386/rc4/ \ + http://www.metaverse.nl/~ernst/ \ + ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= znerd PKGNAMEPREFIX= linux- -DISTNAME= jdk-1.2.2-RC4-linux-i386-glibc-2.1.2 +DISTNAME= ${PORTNAME}-${PORTVERSION}-RC4-linux-i386-glibc-2.1.2 MAINTAINER= znerd@FreeBSD.org -RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base \ +RUN_DEPENDS= /compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base \ javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License doesn\'t allow distribution with fee"