[pkgsrc/trunk]: pkgsrc/lang/openjdk7 drop stray X11 runtime dependencies from...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/36f651961cb5
branches:  trunk
changeset: 646510:36f651961cb5
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Feb 10 00:26:49 2015 +0000

description:
drop stray X11 runtime dependencies from headless build

diffstat:

 lang/openjdk7/Makefile   |  10 +---------
 lang/openjdk7/PLIST      |   8 ++++----
 lang/openjdk7/options.mk |  13 ++++++++++++-
 3 files changed, 17 insertions(+), 14 deletions(-)

diffs (72 lines):

diff -r af96b2f1a61d -r 36f651961cb5 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Mon Feb 09 22:25:15 2015 +0000
+++ b/lang/openjdk7/Makefile    Tue Feb 10 00:26:49 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2015/02/09 00:42:17 tnn Exp $
+# $NetBSD: Makefile,v 1.91 2015/02/10 00:26:49 tnn Exp $
 
 DISTNAME=      openjdk-1.7.76-20150127
 PKGNAME=       openjdk7-1.7.76
@@ -256,13 +256,5 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.cups?=     build
 .include "../../print/cups15/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libXp?=    build
-.include "../../x11/libXp/buildlink3.mk"
-BUILDLINK_DEPMETHOD.libXt?=    build
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r af96b2f1a61d -r 36f651961cb5 lang/openjdk7/PLIST
--- a/lang/openjdk7/PLIST       Mon Feb 09 22:25:15 2015 +0000
+++ b/lang/openjdk7/PLIST       Tue Feb 10 00:26:49 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2015/02/08 23:40:09 tnn Exp $
+@comment $NetBSD: PLIST,v 1.21 2015/02/10 00:26:49 tnn Exp $
 bin/openjdk7-jar
 bin/openjdk7-java
 bin/openjdk7-javac
@@ -355,9 +355,9 @@
 java/openjdk7/jre/bin/servertool
 java/openjdk7/jre/bin/tnameserv
 java/openjdk7/jre/bin/unpack200
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
+${PLIST.native}${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt
+${PLIST.native}${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so
+${PLIST.native}${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
 java/openjdk7/jre/lib/${ARCH}/headless/libmawt.so
 java/openjdk7/jre/lib/${ARCH}/jexec
 java/openjdk7/jre/lib/${ARCH}/jli/libjli.so
diff -r af96b2f1a61d -r 36f651961cb5 lang/openjdk7/options.mk
--- a/lang/openjdk7/options.mk  Mon Feb 09 22:25:15 2015 +0000
+++ b/lang/openjdk7/options.mk  Tue Feb 10 00:26:49 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2015/02/08 23:40:09 tnn Exp $
+# $NetBSD: options.mk,v 1.8 2015/02/10 00:26:49 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openjdk7
 PKG_SUPPORTED_OPTIONS=         debug jre-jce jdk-zero-vm x11
@@ -36,6 +36,17 @@
 .include "../../x11/libXrender/buildlink3.mk"
 .else
 MAKE_ENV+=             BUILD_HEADLESS_ONLY=true
+# We apparently still need the Xlib headers to build headless. why?
+MAKE_ENV+=             ALT_X11_PATH=${X11BASE}
+BUILDLINK_DEPMETHOD.libX11?=   build
+.include "../../x11/libX11/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=    build
+.include "../../x11/libXt/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXrender?=build
+.include "../../x11/libXrender/buildlink3.mk"
+post-configure: remove-x11-classes
+remove-x11-classes:
+       rm ${WRKSRC}/jdk/src/solaris/classes/sun/awt/X11/*.java
 .endif
 
 #