summaryrefslogtreecommitdiff
path: root/lang/sun-jre6
diff options
context:
space:
mode:
authorjlam <jlam>2007-08-27 21:51:22 +0000
committerjlam <jlam>2007-08-27 21:51:22 +0000
commitf8a7c3da622fc90ba9c1b38d8953e0c515b4855b (patch)
treee45bd94c8b7babfdebe4ea0c195679c227190746 /lang/sun-jre6
parent8497bf440c93e40894fad821be5e1523ff2ed824 (diff)
downloadpkgsrc-f8a7c3da622fc90ba9c1b38d8953e0c515b4855b.tar.gz
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.
Diffstat (limited to 'lang/sun-jre6')
-rw-r--r--lang/sun-jre6/Makefile33
-rw-r--r--lang/sun-jre6/PLIST.linux-i3863
2 files changed, 33 insertions, 3 deletions
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