diff options
author | jlam <jlam@pkgsrc.org> | 2007-07-31 19:19:56 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2007-07-31 19:19:56 +0000 |
commit | 5c68895846b9b748f17ea6fa65e73d4c73d09e76 (patch) | |
tree | 7b483b71b0a63e100d3062476b6b5cb4575acda0 /lang | |
parent | fb6d025b532436156766148b1a904405a3830056 (diff) | |
download | pkgsrc-5c68895846b9b748f17ea6fa65e73d4c73d09e76.tar.gz |
Rename the PLIST.<arch> fragments to PLIST.${EMUL_PLATFORM} so that
if the i386 versions of the JDK are built in x86_64, then the i386
PLIST is used.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/blackdown-jdk13/PLIST.linux-i386 (renamed from lang/blackdown-jdk13/PLIST.i386) | 2 | ||||
-rw-r--r-- | lang/blackdown-jre13/Makefile | 7 | ||||
-rw-r--r-- | lang/blackdown-jre13/PLIST.linux-i386 (renamed from lang/blackdown-jre13/PLIST.i386) | 2 | ||||
-rw-r--r-- | lang/sun-jre15/PLIST.linux-i386 (renamed from lang/sun-jre15/PLIST.i386) | 2 | ||||
-rw-r--r-- | lang/sun-jre15/PLIST.linux-x86_64 (renamed from lang/sun-jre15/PLIST.x86_64) | 2 |
5 files changed, 5 insertions, 10 deletions
diff --git a/lang/blackdown-jdk13/PLIST.i386 b/lang/blackdown-jdk13/PLIST.linux-i386 index 9ee03760ba4..ff8684abb17 100644 --- a/lang/blackdown-jdk13/PLIST.i386 +++ b/lang/blackdown-jdk13/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.i386,v 1.2 2004/07/01 10:56:11 wiz Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/31 19:19:56 jlam Exp $ java/blackdown-1.3.1/demo/jfc/SwingSet2/resources/ant.html java/blackdown-1.3.1/demo/jfc/SwingSet2/resources/bug.html java/blackdown-1.3.1/demo/jfc/SwingSet2/resources/images/About.jpg diff --git a/lang/blackdown-jre13/Makefile b/lang/blackdown-jre13/Makefile index 892a599f51d..fd9bbaea70a 100644 --- a/lang/blackdown-jre13/Makefile +++ b/lang/blackdown-jre13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2007/07/29 05:19:27 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2007/07/31 19:19:57 jlam Exp $ # BD_BASENAME= j2re @@ -17,11 +17,6 @@ DISTNAME= ${BD_BASENAME}-${RELVERSION}-RC1-linux-arm EXTRACT_SUFX= .tar.bz2 .endif -PLIST_SRC= ${PKGDIR}/PLIST -.if ${BLACKDOWN_ARCH} == "i386" -PLIST_SRC+= ${PKGDIR}/PLIST.i386 -.endif - REQD_DIRS= ${JVM_HOME} REQD_DIRS+= ${JVM_HOME}/lib REQD_DIRS+= ${JVM_HOME}/lib/${BLACKDOWN_ARCH} diff --git a/lang/blackdown-jre13/PLIST.i386 b/lang/blackdown-jre13/PLIST.linux-i386 index de931827aef..68b9676c79c 100644 --- a/lang/blackdown-jre13/PLIST.i386 +++ b/lang/blackdown-jre13/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.i386,v 1.2 2004/07/01 10:56:11 wiz Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/31 19:19:58 jlam Exp $ java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/client/Xusage.txt java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/client/libjvm.so java/blackdown-1.3.1/lib/${BLACKDOWN_ARCH}/libsunwjit.so diff --git a/lang/sun-jre15/PLIST.i386 b/lang/sun-jre15/PLIST.linux-i386 index 1ccca61f0d2..85280599a2c 100644 --- a/lang/sun-jre15/PLIST.i386 +++ b/lang/sun-jre15/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.i386,v 1.2 2007/01/12 18:23:39 tv Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/31 19:19:59 jlam Exp $ bin/sun15-java bin/sun15-javaws bin/sun15-keytool diff --git a/lang/sun-jre15/PLIST.x86_64 b/lang/sun-jre15/PLIST.linux-x86_64 index 8272f252a9b..e9cd6ccedee 100644 --- a/lang/sun-jre15/PLIST.x86_64 +++ b/lang/sun-jre15/PLIST.linux-x86_64 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.x86_64,v 1.2 2007/01/12 18:23:39 tv Exp $ +@comment $NetBSD: PLIST.linux-x86_64,v 1.1 2007/07/31 19:20:00 jlam Exp $ bin/sun15-java bin/sun15-javaws bin/sun15-keytool |