1) Determine JAVA_ARCH and use that instead of EMUL_ARCH when referenceing

   installed files.  (This fixes a libX11.so.6 symlink creation bug).

2) Correct PLIST.linux-x86_64 now that the above symlink bug is fixed and
   use the ${PLIST.x11} plist var.

Should fix PR pkg/45283.

3 files changed, 15 insertions, 7 deletions

diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index eea1ac64769..a29647b32d7 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2011/08/16 22:11:42 abs Exp $
+# $NetBSD: Makefile,v 1.31 2011/08/25 10:32:52 sbd Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -32,7 +32,7 @@ CONF_FILES=	# empty
 CONF_FILES+=	${JAVA_HOME}/lib/${file}.default ${JAVA_HOME}/lib/${file}
 .endfor
 
-CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${EMUL_ARCH}/client/classes.jsa
+CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${JAVA_ARCH}/client/classes.jsa
 CHECK_SHLIBS_SUPPORTED=	NO
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sun-jre6
@@ -70,7 +70,7 @@ LIBX11=		${X11PREFIX}/lib/libX11.so.6
 .PHONY: create-library-symlinks
 post-install: create-library-symlinks
 create-library-symlinks:
-	${RUN}${LN} -fs ${LIBX11} ${DESTDIR}${JAVA_HOME}/lib/${EMUL_ARCH}
+	${RUN}${LN} -fs ${LIBX11} ${DESTDIR}${JAVA_HOME}/lib/${JAVA_ARCH}
 
 PLIST.x11=	yes
 .endif
diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common
index c4e88c4e3ba..e09c2b6f2c3 100644
--- a/lang/sun-jre6/Makefile.common
+++ b/lang/sun-jre6/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2011/08/16 22:11:42 abs Exp $
+# $NetBSD: Makefile.common,v 1.16 2011/08/25 10:32:52 sbd Exp $
 # used by lang/sun-jre6/Makefile
 # used by lang/sun-jdk6/Makefile
 
@@ -36,6 +36,14 @@ DIST_ARCH=		${DIST_ARCH.${EMUL_ARCH}}
 DIST_ARCH=		${EMUL_ARCH}
 .endif
 
+JAVA_ARCH.x86_64=	amd64
+
+.if defined(JAVA_ARCH.${EMUL_ARCH})
+JAVA_ARCH=		${JAVA_ARCH.${EMUL_ARCH}}
+.else
+JAVA_ARCH=		${EMUL_ARCH}
+.endif
+
 INTERACTIVE_STAGE=	fetch
 BUILD_DIRS=		# empty
 
@@ -44,7 +52,7 @@ BUILD_DIRS=		# empty
 JAVA_HOME=		${PREFIX}/java/sun-6
 JAVA_NAME=		sun6
 JAVA_UNLIMIT=		datasize
-JAVA_LD_LIBRARY_PATH=	${JAVA_HOME}/lib/${EMUL_ARCH}/jli
+JAVA_LD_LIBRARY_PATH=	${JAVA_HOME}/lib/${JAVA_ARCH}/jli
 
 MESSAGE_SUBST+=	JAVA_HOME=${JAVA_HOME:Q}
 
diff --git a/lang/sun-jre6/PLIST.linux-x86_64 b/lang/sun-jre6/PLIST.linux-x86_64
index b3f8970cd47..c9d9b1f8b45 100644
--- a/lang/sun-jre6/PLIST.linux-x86_64
+++ b/lang/sun-jre6/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.2 2011/08/24 04:01:27 sbd Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.3 2011/08/25 10:32:52 sbd Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -253,7 +253,7 @@ java/sun-6/lib/security/local_policy.jar
 java/sun-6/lib/security/trusted.libraries
 java/sun-6/lib/servicetag/jdk_header.png
 java/sun-6/lib/sound.properties.default
-java/sun-6/lib/x86_64
+${PLIST.x11}java/sun-6/lib/amd64/libX11.so.6
 java/sun-6/lib/zi/Africa/Abidjan
 java/sun-6/lib/zi/Africa/Accra
 java/sun-6/lib/zi/Africa/Addis_Ababa