CVS commit: pkgsrc/lang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun May 17 01:17:19 UTC 2020

Modified Files:
        pkgsrc/lang/openjdk11: Makefile
        pkgsrc/lang/openjdk8: Makefile

Log Message:
openjdk*: catch up with cups changes in CONFIGURE_ARGS


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/lang/openjdk8/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.20 pkgsrc/lang/openjdk11/Makefile:1.21
--- pkgsrc/lang/openjdk11/Makefile:1.20 Sun May 17 01:07:03 2020
+++ pkgsrc/lang/openjdk11/Makefile      Sun May 17 01:17:19 2020
@@ -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-boot-jdk-jvmargs
 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

Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.99 pkgsrc/lang/openjdk8/Makefile:1.100
--- pkgsrc/lang/openjdk8/Makefile:1.99  Sun May 17 01:07:03 2020
+++ pkgsrc/lang/openjdk8/Makefile       Sun May 17 01:17:18 2020
@@ -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+=      --openjdk-target=${MACH
 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