Index: Makefile
===================================================================
--- Makefile	(revision 352221)
+++ Makefile	(working copy)
@@ -64,8 +64,10 @@
 .else
 PORTREVISION=	0
 CUPS_SUFFIX=	-base
-OPTIONS_DEFINE=	GNUTLS LIBPAPER PHP PYTHON PAM DBUS LIBUSB XDG_OPEN AVAHI MDNSRESPONDER ICONS
+OPTIONS_DEFINE=	GNUTLS LIBPAPER PHP PYTHON PAM DBUS LIBUSB XDG_OPEN ICONS
 OPTIONS_DEFAULT=	LIBPAPER MDNSRESPONDER ICONS
+OPTIONS_SINGLE=		MDNS
+OPTIONS_SINGLE_MDNS=	AVAHI MDNSRESPONDER
 NO_OPTIONS_SORT=	yes
 .endif

@@ -150,23 +152,19 @@
 LIB_DEPENDS+=		libpaper.so:${PORTSDIR}/print/libpaper
 .endif

-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MMDNSRESPONDER}
-.if ${PORT_OPTIONS:MAVAHI}
-IGNORE=			You must select one and only one option to build for Zeroconf
-.endif
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
+.if${PORT_OPTIONS:MMDNSRESPONDER}
 LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include
-PLIST_SUB+=		WITH_MDNSRESPONDER=""
-.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MAVAHI}
+PLIST_SUB+=		WITH_MDNSRESPONDER="" WITH_AVAHI="@comment "
+.else
 CONFIGURE_ARGS+=	--enable-dnssd \
 			--with-dnssd-libs=${LOCALBASE}/lib/
 LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/avahi-libdns
 CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include/avahi-compat-libdns_sd/
-BROKEN=			missing function, see http://www.avahi.org/ticket/303
-.else
-CONFIGURE_ARGS+=	--disable-dnssd
-PLIST_SUB+=		WITH_MDNSRESPONDER="@comment "
+PLIST_SUB+=		WITH_AVAHI="" WITH_MDNSRESPONDER="@comment "
 .endif
+.endif

 .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=	--enable-pam
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 352221)
+++ pkg-plist	(working copy)
@@ -48,7 +48,7 @@
 bin/cancel
 bin/cupstestdsc
 bin/cupstestppd
-@comment bin/ippfind
+%%WITH_AVAHI%%bin/ippfind
 bin/ipptool
 bin/lp
 bin/lpoptions
@@ -85,6 +85,7 @@
 libexec/cups/backend/usb
 %%WITH_MDNSRESPONDER%%libexec/cups/backend/dnssd
 %%WITH_MDNSRESPONDER%%libexec/cups/backend/mdns
+%%WITH_AVAHI%%libexec/cups/backend/dnssd
 libexec/cups/cgi-bin/admin.cgi
 libexec/cups/cgi-bin/classes.cgi
 libexec/cups/cgi-bin/help.cgi
@@ -102,7 +103,7 @@
 man/man1/cancel.1.gz
 man/man1/cupstestdsc.1.gz
 man/man1/cupstestppd.1.gz
-@comment man/man1/ippfind.1.gz
+%%WITH_AVAHI%%man/man1/ippfind.1.gz
 man/man1/ipptool.1.gz
 man/man1/lp.1.gz
 man/man1/lpoptions.1.gz