Thu Oct 6 02:09:42 2022 UTC ()
{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.


(markd)
diff -r1.49 -r1.50 pkgsrc/print/cups-base/Makefile
diff -r1.18 -r1.19 pkgsrc/print/libcups/Makefile
cvs diff -r1.49 -r1.50 pkgsrc/print/cups-base/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups-base/Makefile 2022/07/14 23:46:25 1.49
+++ pkgsrc/print/cups-base/Makefile 2022/10/06 02:09:42 1.50
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.49 2022/07/14 23:46:25 dholland Exp $ 1# $NetBSD: Makefile,v 1.50 2022/10/06 02:09:42 markd Exp $
2 2
3.include "../../print/cups/Makefile.common" 3.include "../../print/cups/Makefile.common"
4 4
5PKGNAME= cups-base-${CUPS_VERS} 5PKGNAME= cups-base-${CUPS_VERS}
6PKGREVISION= 1 6PKGREVISION= 2
7MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/}
8 8
9MAINTAINER= sbd@NetBSD.org 9MAINTAINER= sbd@NetBSD.org
10COMMENT= Common UNIX Printing System 10COMMENT= Common UNIX Printing System
11 11
12GITHUB_PROJECT= cups 12GITHUB_PROJECT= cups
13GITHUB_RELEASE= v${PKGVERSION_NOREV} 13GITHUB_RELEASE= v${PKGVERSION_NOREV}
14 14
15CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 15CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
16 16
17WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 17WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
18UNLIMIT_RESOURCES= datasize memorysize 18UNLIMIT_RESOURCES= datasize memorysize
19USE_LANGUAGES= c c++ # pdftops is a C++ application 19USE_LANGUAGES= c c++ # pdftops is a C++ application
@@ -25,26 +25,27 @@ CONFIGURE_ARGS+= --localedir=${PREFIX}/$ @@ -25,26 +25,27 @@ CONFIGURE_ARGS+= --localedir=${PREFIX}/$
25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
26CONFIGURE_ARGS+= --localstatedir=${VARBASE} 26CONFIGURE_ARGS+= --localstatedir=${VARBASE}
27CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 27CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
28CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 28CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
29CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 29CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
30CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} 30CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER}
31CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} 31CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP}
32CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} 32CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
33CONFIGURE_ARGS+= --with-exe-file-perm=0755 33CONFIGURE_ARGS+= --with-exe-file-perm=0755
34CONFIGURE_ARGS+= --enable-libpaper 34CONFIGURE_ARGS+= --enable-libpaper
35CONFIGURE_ARGS+= --without-bundledir 35CONFIGURE_ARGS+= --without-bundledir
36CONFIGURE_ARGS+= --without-icondir 36CONFIGURE_ARGS+= --without-icondir
37CONFIGURE_ARGS+= --without-menudir 37CONFIGURE_ARGS+= --without-menudir
 38CONFIGURE_ARGS+= --with-tls=gnutls
38 39
39CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 40CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
40 41
41.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
42.include "options.mk" 43.include "options.mk"
43 44
44# Explicitly disable epoll on illumos, it is provided for Linux compat only. 45# Explicitly disable epoll on illumos, it is provided for Linux compat only.
45CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no 46CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no
46 47
47CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS 48CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
48 49
49LIBS+= ${BUILDLINK_LDADD.iconv} 50LIBS+= ${BUILDLINK_LDADD.iconv}
50 51
cvs diff -r1.18 -r1.19 pkgsrc/print/libcups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/libcups/Makefile 2022/07/14 23:46:26 1.18
+++ pkgsrc/print/libcups/Makefile 2022/10/06 02:09:42 1.19
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.18 2022/07/14 23:46:26 dholland Exp $ 1# $NetBSD: Makefile,v 1.19 2022/10/06 02:09:42 markd Exp $
2 2
3.include "../../print/cups/Makefile.common" 3.include "../../print/cups/Makefile.common"
4 4
5PKGNAME= libcups-${CUPS_VERS} 5PKGNAME= libcups-${CUPS_VERS}
6PKGREVISION= 1 6PKGREVISION= 2
7MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/}
8 8
9MAINTAINER= sbd@NetBSD.org 9MAINTAINER= sbd@NetBSD.org
10COMMENT= Common UNIX Printing System library 10COMMENT= Common UNIX Printing System library
11 11
12DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo 12DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo
13PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches 13PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches
14 14
15GITHUB_PROJECT= cups 15GITHUB_PROJECT= cups
16GITHUB_RELEASE= v${PKGVERSION_NOREV} 16GITHUB_RELEASE= v${PKGVERSION_NOREV}
17 17
18CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 18CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
19 19
@@ -23,26 +23,27 @@ USE_LANGUAGES= c c++ # pdftops is a C++ @@ -23,26 +23,27 @@ USE_LANGUAGES= c c++ # pdftops is a C++
23USE_LIBTOOL= yes 23USE_LIBTOOL= yes
24USE_PKGLOCALEDIR= yes 24USE_PKGLOCALEDIR= yes
25USE_TOOLS+= aclocal autoconf automake gmake pkg-config 25USE_TOOLS+= aclocal autoconf automake gmake pkg-config
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 27CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
29CONFIGURE_ARGS+= --localstatedir=${VARBASE} 29CONFIGURE_ARGS+= --localstatedir=${VARBASE}
30CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 30CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
31CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 31CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
32CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 32CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
33CONFIGURE_ARGS+= --with-components=libcups 33CONFIGURE_ARGS+= --with-components=libcups
34CONFIGURE_ARGS+= --enable-libpaper 34CONFIGURE_ARGS+= --enable-libpaper
35CONFIGURE_ARGS+= --with-exe-file-perm=0755 35CONFIGURE_ARGS+= --with-exe-file-perm=0755
 36CONFIGURE_ARGS+= --with-tls=gnutls
36 37
37CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 38CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
38 39
39.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
40.include "options.mk" 41.include "options.mk"
41 42
42BUILD_DEFS+= VARBASE 43BUILD_DEFS+= VARBASE
43 44
44# Explicitly disable epoll on illumos, it is provided for Linux compat only. 45# Explicitly disable epoll on illumos, it is provided for Linux compat only.
45CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no 46CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no
46 47
47CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS 48CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
48 49