[pkgsrc/trunk]: pkgsrc/lang openjdk*: catch up with cups changes in CONFIGURE...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bfc6aa225266
branches:  trunk
changeset: 431880:bfc6aa225266
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun May 17 01:17:18 2020 +0000

description:
openjdk*: catch up with cups changes in CONFIGURE_ARGS

diffstat:

 lang/openjdk11/Makefile |  4 ++--
 lang/openjdk8/Makefile  |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 374e564fce08 -r bfc6aa225266 lang/openjdk11/Makefile
--- a/lang/openjdk11/Makefile   Sun May 17 01:07:03 2020 +0000
+++ b/lang/openjdk11/Makefile   Sun May 17 01:17:18 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/05/17 01:07:03 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2020/05/17 01:17:19 tnn Exp $
 
 DISTNAME=      openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -47,7 +47,7 @@
 CONFIGURE_ARGS+=       --with-zlib=system
 CONFIGURE_ARGS+=       --with-giflib=bundled
 CONFIGURE_ARGS+=       --with-lcms=bundled
-CONFIGURE_ARGS+=       --with-cups-include=${BUILDLINK_PREFIX.cups-base}/include
+CONFIGURE_ARGS+=       --with-cups-include=${BUILDLINK_PREFIX.libcups}/include
 CONFIGURE_ARGS+=       --with-freetype=system
 CONFIGURE_ARGS+=       --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib
 CONFIGURE_ARGS+=       --with-freetype-include=${BUILDLINK_PREFIX.freetype2}/include
diff -r 374e564fce08 -r bfc6aa225266 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile    Sun May 17 01:07:03 2020 +0000
+++ b/lang/openjdk8/Makefile    Sun May 17 01:17:18 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2020/05/17 01:07:03 tnn Exp $
+# $NetBSD: Makefile,v 1.100 2020/05/17 01:17:18 tnn Exp $
 
 DISTNAME=      openjdk-jdk8u-${GITHUB_TAG}
 PKGNAME=       openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
@@ -54,7 +54,7 @@
 CONFIGURE_ARGS+=       --with-boot-jdk=${ALT_BOOTDIR}
 CONFIGURE_ARGS+=       --with-zlib=system
 CONFIGURE_ARGS+=       --with-giflib=bundled
-CONFIGURE_ARGS+=       --with-cups-include=${BUILDLINK_PREFIX.cups-base}/include
+CONFIGURE_ARGS+=       --with-cups-include=${BUILDLINK_PREFIX.libcups}/include
 CONFIGURE_ARGS+=       --with-freetype-lib=${BUILDLINK_PREFIX.freetype2}/lib
 CONFIGURE_ARGS+=       --with-freetype-include=${BUILDLINK_PREFIX.freetype2}/include
 CONFIGURE_ARGS+=       --disable-freetype-bundling