CVS commit: pkgsrc/print

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Oct  6 02:09:42 UTC 2022

Modified Files:
        pkgsrc/print/cups-base: Makefile
        pkgsrc/print/libcups: Makefile

Log Message:
{cups-base,libcups}: explicitly use gnutls

version 2.4.2 readded support for openssl and package detects and prefers
base system openssl over gnutls but ssl certificate handling is not working
correctly with it so use gnutls as in previous versions.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/print/cups-base/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/libcups/Makefile

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

Modified files:

Index: pkgsrc/print/cups-base/Makefile
diff -u pkgsrc/print/cups-base/Makefile:1.49 pkgsrc/print/cups-base/Makefile:1.50
--- pkgsrc/print/cups-base/Makefile:1.49        Thu Jul 14 23:46:25 2022
+++ pkgsrc/print/cups-base/Makefile     Thu Oct  6 02:09:42 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2022/07/14 23:46:25 dholland Exp $
+# $NetBSD: Makefile,v 1.50 2022/10/06 02:09:42 markd Exp $
 
 .include "../../print/cups/Makefile.common"
 
 PKGNAME=       cups-base-${CUPS_VERS}
-PKGREVISION=   1
+PKGREVISION=   2
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenPrinting/}
 
 MAINTAINER=    sbd%NetBSD.org@localhost
@@ -35,6 +35,7 @@ CONFIGURE_ARGS+=      --enable-libpaper
 CONFIGURE_ARGS+=       --without-bundledir
 CONFIGURE_ARGS+=       --without-icondir
 CONFIGURE_ARGS+=       --without-menudir
+CONFIGURE_ARGS+=       --with-tls=gnutls
 
 CONFIGURE_ENV+=                DSOFLAGS=${LDFLAGS:M*:Q}
 

Index: pkgsrc/print/libcups/Makefile
diff -u pkgsrc/print/libcups/Makefile:1.18 pkgsrc/print/libcups/Makefile:1.19
--- pkgsrc/print/libcups/Makefile:1.18  Thu Jul 14 23:46:26 2022
+++ pkgsrc/print/libcups/Makefile       Thu Oct  6 02:09:42 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2022/07/14 23:46:26 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2022/10/06 02:09:42 markd Exp $
 
 .include "../../print/cups/Makefile.common"
 
 PKGNAME=       libcups-${CUPS_VERS}
-PKGREVISION=   1
+PKGREVISION=   2
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenPrinting/}
 
 MAINTAINER=    sbd%NetBSD.org@localhost
@@ -33,6 +33,7 @@ CONFIGURE_ARGS+=      --with-serverbindir=${P
 CONFIGURE_ARGS+=       --with-components=libcups
 CONFIGURE_ARGS+=       --enable-libpaper
 CONFIGURE_ARGS+=       --with-exe-file-perm=0755
+CONFIGURE_ARGS+=       --with-tls=gnutls
 
 CONFIGURE_ENV+=                DSOFLAGS=${LDFLAGS:M*:Q}