If EMUL_IS_NATIVE (i.e. on Linux) several X libraries, alsa-lib and unixodbc

are needed.

Bump PKGREVISION.

3 files changed, 50 insertions, 17 deletions

diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 159e27df227..36a18c24785 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2012/02/17 08:16:14 obache Exp $
+# $NetBSD: Makefile,v 1.36 2012/04/27 04:27:16 sbd Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
 
 DISTNAME=	jre-6u31-linux-${DIST_ARCH}
 PKGNAME=	sun-jre6-6.0.31
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 LICENSE=	sun-jre6-license
@@ -42,7 +43,7 @@ PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 PLIST_SRC=	PLIST.linux-${EMUL_ARCH}
 
-PLIST_VARS+=	jce x11
+PLIST_VARS+=	jce native
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-6.zip
 PLIST.jce=	yes
@@ -53,28 +54,44 @@ PLIST.jce=	yes
 #
 .if defined(EMUL_IS_NATIVE)
 .  if ${X11_TYPE} == "native"
-.    if ${EMUL_ARCH} == "x86_64"
-LIBX11=		${X11PREFIX}/lib64/libX11.so.6
-.    else
-LIBX11=		${X11PREFIX}/lib/libX11.so.6
-.    endif
-.    if !exists(${LIBX11})
+X11_LIBDIR=	${X11BASE}/lib${LIBABISUFFIX}
+.    if !exists(${X11_LIBDIR}/libX11.so.6)
 PKG_FAIL_REASON+=	"${LIBX11} does not exist.  Please install the" \
 			"X11 library packages for your system."
 .    endif
 .  else
-.    include "../../x11/libX11/buildlink3.mk"
-LIBX11=		${X11PREFIX}/lib/libX11.so.6
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libXext/buildlink3.mk"
+.  include "../../x11/libXi/buildlink3.mk"
+.  include "../../x11/libXt/buildlink3.mk"
+.  include "../../x11/libXtst/buildlink3.mk"
+X11_LIBDIR=	${X11BASE}/lib
 .  endif
 
+.  include "../../audio/alsa-lib/buildlink3.mk"
+ALSA_LIBDIR=	${BUILDLINK_PREFIX.alsa-lib}/${BUILDLINK_LIBDIRS.alsa-lib}
+
+.  include "../../databases/unixodbc/buildlink3.mk"
+ODBC_LIBDIR=	${BUILDLINK_PREFIX.unixodbc}/${BUILDLINK_LIBDIRS.unixodbc}
+
+ARCH_LIBDIR=	${JAVA_HOME}/lib/${JAVA_ARCH}
 .PHONY: create-library-symlinks
 post-install: create-library-symlinks
 create-library-symlinks:
-	${RUN}${LN} -fs ${LIBX11} ${DESTDIR}${JAVA_HOME}/lib/${JAVA_ARCH}
-
-PLIST.x11=	yes
+	${RUN}${LN} -fs ${X11_LIBDIR}/libX11.so.6 ${DESTDIR}${ARCH_LIBDIR}
+	${RUN}${LN} -fs ${X11_LIBDIR}/libX11.so.6 ${DESTDIR}${ARCH_LIBDIR}/jli
+	${RUN}${LN} -fs ${X11_LIBDIR}/libXext.so.6 ${DESTDIR}${ARCH_LIBDIR}
+	${RUN}${LN} -fs ${X11_LIBDIR}/libXi.so.6 ${DESTDIR}${ARCH_LIBDIR}
+	${RUN}${LN} -fs ${X11_LIBDIR}/libXt.so.6 ${DESTDIR}${ARCH_LIBDIR}
+	${RUN}${LN} -fs ${X11_LIBDIR}/libXtst.so.6 ${DESTDIR}${ARCH_LIBDIR}
+	${RUN}${LN} -fs ${ALSA_LIBDIR}/libasound.so.2 ${DESTDIR}${ARCH_LIBDIR}
+	${RUN}${LN} -fs ${ODBC_LIBDIR}/libodbc.so ${DESTDIR}${ARCH_LIBDIR}
+	${RUN}${LN} -fs ${ODBC_LIBDIR}/libodbcinst.so ${DESTDIR}${ARCH_LIBDIR}
+
+PLIST.native=	yes
 .endif
 
+
 post-extract:
 	${MKDIR} ${WRKSRC}/.systemPrefs
 	${TOUCH} ${WRKSRC}/.systemPrefs/.system.lock
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index fd8869ce8fb..790dc1a5164 100644
--- a/lang/sun-jre6/PLIST.linux-i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.23 2012/02/17 08:16:14 obache Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.24 2012/04/27 04:27:16 sbd Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -155,7 +155,15 @@ java/sun-6/lib/i386/headless/libmawt.so
 java/sun-6/lib/i386/jli/libjli.so
 java/sun-6/lib/i386/jvm.cfg.default
 java/sun-6/lib/i386/libJdbcOdbc.so
-${PLIST.x11}java/sun-6/lib/i386/libX11.so.6
+${PLIST.native}java/sun-6/lib/i386/libX11.so.6
+${PLIST.native}java/sun-6/lib/i386/jli/libX11.so.6
+${PLIST.native}java/sun-6/lib/i386/libXext.so.6
+${PLIST.native}java/sun-6/lib/i386/libXi.so.6
+${PLIST.native}java/sun-6/lib/i386/libXt.so.6
+${PLIST.native}java/sun-6/lib/i386/libXtst.so.6
+${PLIST.native}java/sun-6/lib/i386/libasound.so.2
+${PLIST.native}java/sun-6/lib/i386/libodbc.so
+${PLIST.native}java/sun-6/lib/i386/libodbcinst.so
 java/sun-6/lib/i386/libawt.so
 java/sun-6/lib/i386/libcmm.so
 java/sun-6/lib/i386/libdcpr.so
diff --git a/lang/sun-jre6/PLIST.linux-x86_64 b/lang/sun-jre6/PLIST.linux-x86_64
index 19211151736..1691ccc410f 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.5 2012/02/17 08:16:14 obache Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.6 2012/04/27 04:27:16 sbd Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -255,7 +255,15 @@ 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
-${PLIST.x11}java/sun-6/lib/amd64/libX11.so.6
+${PLIST.native}java/sun-6/lib/amd64/libX11.so.6
+${PLIST.native}java/sun-6/lib/amd64/jli/libX11.so.6
+${PLIST.native}java/sun-6/lib/amd64/libXext.so.6
+${PLIST.native}java/sun-6/lib/amd64/libXi.so.6
+${PLIST.native}java/sun-6/lib/amd64/libXt.so.6
+${PLIST.native}java/sun-6/lib/amd64/libXtst.so.6
+${PLIST.native}java/sun-6/lib/amd64/libasound.so.2
+${PLIST.native}java/sun-6/lib/amd64/libodbc.so
+${PLIST.native}java/sun-6/lib/amd64/libodbcinst.so
 java/sun-6/lib/zi/Africa/Abidjan
 java/sun-6/lib/zi/Africa/Accra
 java/sun-6/lib/zi/Africa/Addis_Ababa