CVS commit: pkgsrc/lang

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

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

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

Log Message:
openjdk*: switch the build dependency from cups-base to libcups


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.98 -r1.99 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.19 pkgsrc/lang/openjdk11/Makefile:1.20
--- pkgsrc/lang/openjdk11/Makefile:1.19 Sat May  9 00:09:15 2020
+++ pkgsrc/lang/openjdk11/Makefile      Sun May 17 01:07:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/05/09 00:09:15 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2020/05/17 01:07:03 tnn Exp $
 
 DISTNAME=      openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -172,7 +172,7 @@ do-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 # Headers from CUPS are required to build the native implementation of
 # sun.print.* which is used by java.awt.print.
-BUILDLINK_DEPMETHOD.cups-base?=        build
-.include "../../print/cups-base/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libcups?=  build
+.include "../../print/libcups/buildlink3.mk"
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.98 pkgsrc/lang/openjdk8/Makefile:1.99
--- pkgsrc/lang/openjdk8/Makefile:1.98  Sat May  9 20:47:26 2020
+++ pkgsrc/lang/openjdk8/Makefile       Sun May 17 01:07:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2020/05/09 20:47:26 tnn Exp $
+# $NetBSD: Makefile,v 1.99 2020/05/17 01:07:03 tnn Exp $
 
 DISTNAME=      openjdk-jdk8u-${GITHUB_TAG}
 PKGNAME=       openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
@@ -261,7 +261,7 @@ MAKE_ENV+=  STRIP=${PREFIX}/bin/gstrip
 .include "../../graphics/freetype2/buildlink3.mk"
 # Headers from CUPS are required to build the native implementation of
 # sun.print.* which is used by java.awt.print.
-BUILDLINK_DEPMETHOD.cups-base?=        build
-.include "../../print/cups-base/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libcups?=  build
+.include "../../print/libcups/buildlink3.mk"
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"