Fri Mar 1 09:54:12 2013 UTC ()
Ensure EMUL_PLATFORMS is defined before including bsd.prefs.mk


(jperkin)
diff -r1.19 -r1.20 pkgsrc/lang/sun-jre6/Makefile.common
cvs diff -r1.19 -r1.20 pkgsrc/lang/sun-jre6/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/Makefile.common 2013/02/28 18:29:13 1.19
+++ pkgsrc/lang/sun-jre6/Attic/Makefile.common 2013/03/01 09:54:12 1.20
@@ -1,43 +1,45 @@ @@ -1,43 +1,45 @@
1# $NetBSD: Makefile.common,v 1.19 2013/02/28 18:29:13 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.20 2013/03/01 09:54:12 jperkin Exp $
2# used by lang/sun-jre6/Makefile 2# used by lang/sun-jre6/Makefile
3# used by lang/sun-jdk6/Makefile 3# used by lang/sun-jdk6/Makefile
4 4
5CATEGORIES= lang java 5CATEGORIES= lang java
6COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME} 6COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
7EXTRACT_SUFX= .bin 7EXTRACT_SUFX= .bin
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.oracle.com/technetwork/java/index.html 10HOMEPAGE= http://www.oracle.com/technetwork/java/index.html
11DOWNLOAD= http://www.oracle.com/technetwork/java/javase/downloads/index.html 11DOWNLOAD= http://www.oracle.com/technetwork/java/javase/downloads/index.html
12ARCHIVE= http://www.oracle.com/technetwork/java/archive-139210.html 12ARCHIVE= http://www.oracle.com/technetwork/java/archive-139210.html
13 13
14RESTRICTED= Redistribution of repackaged binaries not permitted 14RESTRICTED= Redistribution of repackaged binaries not permitted
15NO_SRC_ON_CDROM=${RESTRICTED} 15NO_SRC_ON_CDROM=${RESTRICTED}
16NO_SRC_ON_FTP= ${RESTRICTED} 16NO_SRC_ON_FTP= ${RESTRICTED}
17NO_BIN_ON_CDROM=${RESTRICTED} 17NO_BIN_ON_CDROM=${RESTRICTED}
18NO_BIN_ON_FTP= ${RESTRICTED} 18NO_BIN_ON_FTP= ${RESTRICTED}
19 19
20USE_TOOLS+= pax 20USE_TOOLS+= pax
21 21
 22EMUL_PLATFORMS= linux-i386 linux-x86_64
 23
22.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
23 25
24.if ${OPSYS} == "SunOS" 26.if ${OPSYS} == "SunOS"
25DIST_OS= solaris 27DIST_OS= solaris
26EMUL_ARCH= ${MACHINE_ARCH} # XXX: re-use EMUL_ARCH as it is simpler 28EMUL_ARCH= ${MACHINE_ARCH} # XXX: re-use EMUL_ARCH as it is simpler
 29EMUL_PLATFORMS= # empty, uses native binaries
27EXTRACT_SUFX= .sh 30EXTRACT_SUFX= .sh
28.else 31.else
29DIST_OS= linux 32DIST_OS= linux
30EMUL_PLATFORMS= linux-i386 linux-x86_64 
31EMUL_MODULES.linux= compat locale x11 33EMUL_MODULES.linux= compat locale x11
32.endif 34.endif
33 35
34DIST_ARCH.i386= i586 36DIST_ARCH.i386= i586
35DIST_ARCH.x86_64= x64 37DIST_ARCH.x86_64= x64
36 38
37.if defined(DIST_ARCH.${EMUL_ARCH}) 39.if defined(DIST_ARCH.${EMUL_ARCH})
38DIST_ARCH= ${DIST_ARCH.${EMUL_ARCH}} 40DIST_ARCH= ${DIST_ARCH.${EMUL_ARCH}}
39.else 41.else
40DIST_ARCH= ${EMUL_ARCH} 42DIST_ARCH= ${EMUL_ARCH}
41.endif 43.endif
42 44
43JAVA_ARCH.i386= i386 45JAVA_ARCH.i386= i386