If running native Linux, fail to install if the X11 libraries aren't

available "somehow" -- for X11_TYPE == "native", then just fail,
otherwise for X11_TYPE == "modular", then build the libX11 package to
satisfy the library requirements for "javaws" and "policytool".

This fixes pkg/36838 reported by Ondrej Tuma.

Bump the PKGREVISIONs for sun-jre14, sun-jre15, and sun-jre6.

6 files changed, 99 insertions, 9 deletions

diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index bf5cb162381..f9a55458c3d 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.44 2007/08/22 14:03:48 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2007/08/27 21:51:22 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=	j2re-1_4_2_14-linux-${DIST_ARCH}
 PKGNAME=	sun-jre14-2.14
-PKGREVISION=	2
+PKGREVISION=	3
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.4.2
@@ -56,6 +56,35 @@ END_MESSAGE=								\
 PLIST_SUBST+=	SUN_JRE14_USE_JCE="@comment "
 .endif
 
+# Some of the binaries require libX11, so ensure that requirement is
+# satisfied when the package is installed on the native OS.
+#
+.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})
+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
+.  endif
+
+PLIST_SUBST+=		LIBX11=
+
+.PHONY: create-library-symlinks
+post-install: create-library-symlinks
+create-library-symlinks:
+	${RUN}${LN} -fs ${LIBX11} ${JAVA_HOME}/lib/${EMUL_ARCH}
+.else
+PLIST_SUBST+=		LIBX11="@comment "
+.endif
+
 post-extract:
 	cd ${WRKSRC} && ${CHMOD} -R go-w .
 
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index a67202cc626..6da505ea296 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.47 2007/08/22 14:03:48 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2007/08/27 21:51:23 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=	jre-1_5_0_12-linux-${DIST_ARCH}
 PKGNAME=	sun-jre15-5.0.12
-PKGREVISION=	2
+PKGREVISION=	3
 MASTER_SITES=	# empty
 
 SHORT_NAME=	JRE
@@ -42,6 +42,35 @@ PLIST_SUBST+=	SUN_JRE15_USE_JCE=""
 PLIST_SUBST+=	SUN_JRE15_USE_JCE="@comment "
 .endif
 
+# Some of the binaries require libX11, so ensure that requirement is
+# satisfied when the package is installed on the native OS.
+#
+.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})
+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
+.  endif
+
+PLIST_SUBST+=		LIBX11=
+
+.PHONY: create-library-symlinks
+post-install: create-library-symlinks
+create-library-symlinks:
+	${RUN}${LN} -fs ${LIBX11} ${JAVA_HOME}/lib/${EMUL_ARCH}
+.else
+PLIST_SUBST+=		LIBX11="@comment "
+.endif
+
 post-extract:
 	${MKDIR} ${WRKSRC}/.systemPrefs
 	${TOUCH} ${WRKSRC}/.systemPrefs/.system.lock
diff --git a/lang/sun-jre15/PLIST.linux-i386 b/lang/sun-jre15/PLIST.linux-i386
index 1d7ab5d3052..eb2448ab24f 100644
--- a/lang/sun-jre15/PLIST.linux-i386
+++ b/lang/sun-jre15/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.4 2007/08/18 17:31:51 veego Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.5 2007/08/27 21:51:23 jlam Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -88,6 +88,7 @@ java/sun-1.5/lib/i386/gtkhelper
 java/sun-1.5/lib/i386/headless/libmawt.so
 java/sun-1.5/lib/i386/jvm.cfg.default
 java/sun-1.5/lib/i386/libJdbcOdbc.so
+${LIBX11}java/sun-1.5/lib/i386/libX11.so.6
 java/sun-1.5/lib/i386/libawt.so
 java/sun-1.5/lib/i386/libcmm.so
 java/sun-1.5/lib/i386/libdcpr.so
diff --git a/lang/sun-jre15/PLIST.linux-x86_64 b/lang/sun-jre15/PLIST.linux-x86_64
index 71cf38ddbc8..486dfcd8c19 100644
--- a/lang/sun-jre15/PLIST.linux-x86_64
+++ b/lang/sun-jre15/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.2 2007/08/08 16:59:11 abs Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.3 2007/08/27 21:51:24 jlam Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -34,6 +34,7 @@ java/sun-1.5/lib/amd64/gtkhelper
 java/sun-1.5/lib/amd64/headless/libmawt.so
 java/sun-1.5/lib/amd64/jvm.cfg.default
 java/sun-1.5/lib/amd64/libJdbcOdbc.so
+${LIBX11}java/sun-1.5/lib/amd64/libX11.so.6
 java/sun-1.5/lib/amd64/libawt.so
 java/sun-1.5/lib/amd64/libcmm.so
 java/sun-1.5/lib/amd64/libdcpr.so
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index ce93f76cd1e..bf5264d230b 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2007/08/22 14:03:49 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/08/27 21:51:24 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=	jre-6u1-linux-${DIST_ARCH}
 PKGNAME=	sun-jre6-6.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	# empty
 
 DOWNLOAD_NAME=	Java Runtime Environment (JRE) 6u1
@@ -43,6 +43,35 @@ PLIST_SUBST+=	SUN_JRE6_USE_JCE=""
 PLIST_SUBST+=	SUN_JRE6_USE_JCE="@comment "
 .endif
 
+# Some of the binaries require libX11, so ensure that requirement is
+# satisfied when the package is installed on the native OS.
+#
+.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})
+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
+.  endif
+
+PLIST_SUBST+=		LIBX11=
+
+.PHONY: create-library-symlinks
+post-install: create-library-symlinks
+create-library-symlinks:
+	${RUN}${LN} -fs ${LIBX11} ${JAVA_HOME}/lib/${EMUL_ARCH}
+.else
+PLIST_SUBST+=		LIBX11="@comment "
+.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 12b88ac7f3f..913591b9e83 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.2 2007/08/23 18:46:36 jlam Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.3 2007/08/27 21:51:24 jlam Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -144,6 +144,7 @@ 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
+${LIBX11}java/sun-6/lib/i386/libX11.so.6
 java/sun-6/lib/i386/libawt.so
 java/sun-6/lib/i386/libcmm.so
 java/sun-6/lib/i386/libdcpr.so