Wed Nov 16 16:08:11 2022 UTC ()
When building without any mdns support on NetBSD (at least), configure
will still find the base mdnssd, and build and install ippfind
support. This will lead to a PLIST error -- as far as pkgsrc is
concerned, we did not enable it.

Tell configure explicitly to not add mdns support when we don't want any.

While here, group mdnssd and avahi as optional and mutually exclusive.


(hauke)
diff -r1.51 -r1.52 pkgsrc/print/cups-base/Makefile
diff -r1.6 -r1.7 pkgsrc/print/cups-base/options.mk
cvs diff -r1.51 -r1.52 pkgsrc/print/cups-base/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups-base/Makefile 2022/10/26 10:31:06 1.51
+++ pkgsrc/print/cups-base/Makefile 2022/11/16 16:08:11 1.52
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.51 2022/10/26 10:31:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.52 2022/11/16 16:08:11 hauke 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= 3 6PKGREVISION= 4
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
cvs diff -r1.6 -r1.7 pkgsrc/print/cups-base/options.mk (expand / switch to unified diff)

--- pkgsrc/print/cups-base/options.mk 2022/05/10 20:47:37 1.6
+++ pkgsrc/print/cups-base/options.mk 2022/11/16 16:08:11 1.7
@@ -1,74 +1,82 @@ @@ -1,74 +1,82 @@
1# $NetBSD: options.mk,v 1.6 2022/05/10 20:47:37 markd Exp $ 1# $NetBSD: options.mk,v 1.7 2022/11/16 16:08:11 hauke Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base 3PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base
4PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers 4PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers
5PKG_SUGGESTED_OPTIONS= dnssd kerberos 5PKG_SUGGESTED_OPTIONS= dnssd kerberos
6 6
7PLIST_VARS+= apple dbus dnssd dnssd-backend ippfind libusb pam 7PKG_OPTIONS_OPTIONAL_GROUPS= mdns
 8PKG_OPTIONS_GROUP.mdns= mdnssd
 9
 10PLIST_VARS+= apple dbus dnssd dnssd-backend ippfind libusb pam
8 11
9.if defined(PKG_OPTIONS.cups) 12.if defined(PKG_OPTIONS.cups)
10PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups} 13PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups}
11PKG_OPTIONS_DEPRECATED_WARNINGS+= \ 14PKG_OPTIONS_DEPRECATED_WARNINGS+= \
12 "Deprecated variable PKG_OPTIONS.cups used, use ${PKG_OPTIONS_VAR} instead." 15 "Deprecated variable PKG_OPTIONS.cups used, use ${PKG_OPTIONS_VAR} instead."
13.endif 16.endif
14 17
15.if ${OPSYS} == "Darwin" 18.if ${OPSYS} == "Darwin"
16PLIST.apple= yes 19PLIST.apple= yes
17PLIST.ippfind= yes 20PLIST.ippfind= yes
18.else 21.else
19# CUPS on Darwin does not support DBus and libusb 22# CUPS on Darwin does not support DBus and libusb
20PKG_SUPPORTED_OPTIONS+= avahi dbus 23PKG_SUPPORTED_OPTIONS+= dbus
21PKG_SUGGESTED_OPTIONS+= dbus 24PKG_OPTIONS_GROUP.mdns+= avahi
 25PKG_SUGGESTED_OPTIONS+= dbus
22# Neither DragonFly nor SunOS can build libusb1 26# Neither DragonFly nor SunOS can build libusb1
23. if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS" 27. if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS"
24PKG_SUPPORTED_OPTIONS+= libusb 28PKG_SUPPORTED_OPTIONS+= libusb
25PKG_SUGGESTED_OPTIONS+= libusb 29PKG_SUGGESTED_OPTIONS+= libusb
26. endif 30. endif
27.endif 31.endif
28 32
29.include "../../mk/bsd.options.mk" 33.include "../../mk/bsd.options.mk"
30 34
31MESSAGE_SRC= ${PKGDIR}/MESSAGE 35MESSAGE_SRC= ${PKGDIR}/MESSAGE
32 36
33.if !empty(PKG_OPTIONS:Macl) 37.if !empty(PKG_OPTIONS:Macl)
34CONFIGURE_ARGS+= --enable-acl 38CONFIGURE_ARGS+= --enable-acl
35.else 39.else
36CONFIGURE_ARGS+= --disable-acl 40CONFIGURE_ARGS+= --disable-acl
37.endif 41.endif
38 42
39.if !empty(PKG_OPTIONS:Mavahi) 43.if !empty(PKG_OPTIONS:Mavahi)
40.include "../../net/avahi/buildlink3.mk" 44.include "../../net/avahi/buildlink3.mk"
41CONFIGURE_ARGS+= --with-dnssd=avahi 45CONFIGURE_ARGS+= --with-dnssd=avahi
42PLIST.ippfind= yes 46PLIST.ippfind= yes
43PLIST.dnssd-backend= yes 47PLIST.dnssd-backend= yes
44.endif 48.endif
45 49
 50.if !empty(PKG_OPTIONS:Mdnssd)
 51.include "../../net/mDNSResponder/buildlink3.mk"
 52CONFIGURE_ARGS+= --with-dnssd=mdnsresponder
 53PLIST.dnssd= yes
 54PLIST.dnssd-backend= yes
 55PLIST.ippfind= yes
 56.endif
 57
 58.if empty(PKG_OPTIONS:Mavahi) && empty(PKG_OPTIONS:Mdnssd)
 59CONFIGURE_ARGS+= --with-dnssd=no
 60.endif
 61
46.if !empty(PKG_OPTIONS:Mdbus) 62.if !empty(PKG_OPTIONS:Mdbus)
47. include "../../sysutils/dbus/buildlink3.mk" 63. include "../../sysutils/dbus/buildlink3.mk"
48CONFIGURE_ARGS+= --enable-dbus 64CONFIGURE_ARGS+= --enable-dbus
49PLIST.dbus= yes 65PLIST.dbus= yes
50.else 66.else
51CONFIGURE_ARGS+= --disable-dbus 67CONFIGURE_ARGS+= --disable-dbus
52.endif 68.endif
53 69
54.if !empty(PKG_OPTIONS:Mdnssd) 
55.include "../../net/mDNSResponder/buildlink3.mk" 
56CONFIGURE_ARGS+= --with-dnssd=yes 
57PLIST.dnssd= yes 
58PLIST.dnssd-backend= yes 
59PLIST.ippfind= yes 
60.endif 
61 
62.if !empty(PKG_OPTIONS:Mkerberos) 70.if !empty(PKG_OPTIONS:Mkerberos)
63.include "../../mk/krb5.buildlink3.mk" 71.include "../../mk/krb5.buildlink3.mk"
64CONFIGURE_ARGS+= --enable-gssapi 72CONFIGURE_ARGS+= --enable-gssapi
65.else 73.else
66CONFIGURE_ARGS+= --disable-gssapi 74CONFIGURE_ARGS+= --disable-gssapi
67.endif 75.endif
68 76
69.if !empty(PKG_OPTIONS:Mlibusb) 77.if !empty(PKG_OPTIONS:Mlibusb)
70.include "../../devel/libusb1/buildlink3.mk" 78.include "../../devel/libusb1/buildlink3.mk"
71CONFIGURE_ARGS+= --enable-libusb 79CONFIGURE_ARGS+= --enable-libusb
72MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb 80MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb
73PLIST.libusb= yes 81PLIST.libusb= yes
74.else 82.else