03.01.2015 17:27, Kurt Jaeger пишет:
> Hi!
>
>> I'm getting this while upgrading cups-base. Is this a known problem or
>> have I fat-fingered something?
>
> It's a known problem:
>
> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195743
>
> Someone needs to debug this 8-(
Yep, seems that cups-client also depends upon DNSSD/AVAHI. Please, try
the following patch. The patch should be applied to print/cups-base
and print/cups-client should be rebuild.
--
WBR, Boris Samorodov (bsam)
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve
Index: Makefile
===================================================================
--- Makefile (revision 376041)
+++ Makefile (working copy)
@@ -55,9 +55,12 @@
OPTIONS_DEFAULT= OPENSSL
OPTIONS_SUB= yes
.if defined(CUPS_CLIENT)
-PORTREVISION= 2
+PORTREVISION= 3
LICENSE= LGPL21
CUPS_SUFFIX= -client
+OPTIONS_RADIO= ZEROCONF
+OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER
+OPTIONS_DEFAULT+= MDNSRESPONDER
.elif defined(CUPS_IMAGE)
PORTREVISION= 2
CUPS_SUFFIX= -image
@@ -165,21 +168,6 @@
LIB_DEPENDS+= libpaper.so:${PORTSDIR}/print/libpaper
. endif
-. if ${PORT_OPTIONS:MMDNSRESPONDER}
-LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder
-CONFIGURE_ARGS+= --with-dnssd-includes=${LOCALBASE}/include
-CONFIGURE_ARGS+= --disable-avahi
-SUB_LIST+= ZEROCONF="mdnsd"
-. elif ${PORT_OPTIONS:MAVAHI}
-CONFIGURE_ARGS+= --enable-avahi
-LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app
-SUB_LIST+= ZEROCONF="avahi_daemon"
-. else
-CONFIGURE_ARGS+= --disable-dnssd
-CONFIGURE_ARGS+= --disable-avahi
-SUB_LIST+= ZEROCONF=""
-. endif
-
. if ${PORT_OPTIONS:MPAM}
CONFIGURE_ARGS+= --enable-pam
. else
@@ -211,6 +199,25 @@
SUB_FILES+= ulpt-cupsd.conf ulpt-cupsd.sh
.endif
+.if !defined(CUPS_IMAGE)
+. if ${PORT_OPTIONS:MMDNSRESPONDER}
+LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+CONFIGURE_ARGS+= --enable-dnssd
+CONFIGURE_ARGS+= --with-dnssd-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+= --disable-avahi
+SUB_LIST+= ZEROCONF="mdnsd"
+. elif ${PORT_OPTIONS:MAVAHI}
+CONFIGURE_ARGS+= --enable-avahi
+CONFIGURE_ARGS+= --disable-dnssd
+LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app
+SUB_LIST+= ZEROCONF="avahi_daemon"
+. else
+CONFIGURE_ARGS+= --disable-dnssd
+CONFIGURE_ARGS+= --disable-avahi
+SUB_LIST+= ZEROCONF=""
+. endif
+.endif
+
.if ${OSVERSION} < 1000036 && ${ARCH} == i386
LIBS+= -lssp_nonshared
.endif
_______________________________________________
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
