ports/153327: devel/gvfs WITH_AVAHI option

[moonshade at pnhz.kz]

>Number:         153327
>Category:       ports
>Synopsis:       devel/gvfs WITH_AVAHI option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 21 03:40:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        FreeBSD 8.1-RELEASE-p1 amd64
>Organization:
>Environment:


System: FreeBSD 8.1-RELEASE-p1 #0: Tue Oct 26 16:51:08 ALMT 2010
    moonshade at abyss.pnhz.kz:/usr/obj/data/FreeBSD/src/8.1-RELEASE/src/sys/GENERIC



>Description:


Makes avahi optional for devel/gvfs


>How-To-Repeat:





>Fix:


--- gvfs-without_avahi begins here ---
--- Makefile.orig	2010-09-14 09:53:40.000000000 +0000
+++ Makefile	2010-09-14 10:04:36.000000000 +0000
@@ -20,7 +20,7 @@
     		hal.1:${PORTSDIR}/sysutils/hal \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		gnome-keyring:${PORTSDIR}/security/gnome-keyring \
-		avahi-client.3:${PORTSDIR}/net/avahi-app
+
 RUN_DEPENDS=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
 
 USE_BZIP2=	yes
@@ -35,7 +35,8 @@
 OPTIONS=	FUSE "Enable fuse" off \
 		SAMBA "Enable Samba" on \
 		GPHOTO2 "Enable Gphoto 2 camera support" on \
-		CDDA "Enable CDDA" on
+		CDDA "Enable CDDA" on \
+		AVAHI "Enable AVAHI" on
 
 .include <bsd.port.pre.mk>
 
@@ -72,6 +73,14 @@
 PLIST_SUB+=	GPHOTO2="@comment "
 .endif
 
+.if defined(WITH_AVAHI)
+LIB_DEPENDS+=	avahi-client.3:${PORTSDIR}/net/avahi-app
+PLIST_SUB+=	AVAHI=""
+.else
+CONFIGURE_ARGS+=	--disable-avahi
+PLIST_SUB+=	AVAHI="@comment "
+.endif
+
 .if ${OSVERSION} < 602112
 CONFIGURE_ARGS+=	--disable-archive
 PLIST_SUB+=	ARCHIVE="@comment "
--- pkg-plist.orig	2010-09-14 09:53:48.000000000 +0000
+++ pkg-plist	2010-09-14 10:18:18.000000000 +0000
@@ -24,9 +24,9 @@
 lib/gio/modules/libgioremote-volume-monitor.so
 lib/gio/modules/libgvfsdbus.la
 lib/gio/modules/libgvfsdbus.so
-lib/libgvfscommon-dnssd.la
-lib/libgvfscommon-dnssd.so
-lib/libgvfscommon-dnssd.so.0
+%%AVAHI%%lib/libgvfscommon-dnssd.la
+%%AVAHI%%lib/libgvfscommon-dnssd.so
+%%AVAHI%%lib/libgvfscommon-dnssd.so.0
 lib/libgvfscommon.la
 lib/libgvfscommon.so
 lib/libgvfscommon.so.0
@@ -39,7 +39,7 @@
 %%CDDA%%libexec/gvfsd-cdda
 libexec/gvfsd-computer
 libexec/gvfsd-dav
-libexec/gvfsd-dnssd
+%%AVAHI%%libexec/gvfsd-dnssd
 libexec/gvfsd-ftp
 %%GPHOTO2%%libexec/gvfsd-gphoto2
 libexec/gvfsd-http
@@ -59,8 +59,8 @@
 %%CDDA%%share/gvfs/mounts/cdda.mount
 share/gvfs/mounts/computer.mount
 share/gvfs/mounts/dav.mount
-share/gvfs/mounts/dav+sd.mount
-share/gvfs/mounts/dns-sd.mount
+%%AVAHI%%share/gvfs/mounts/dav+sd.mount
+%%AVAHI%%share/gvfs/mounts/dns-sd.mount
 share/gvfs/mounts/ftp.mount
 %%GPHOTO2%%share/gvfs/mounts/gphoto2.mount
 share/gvfs/mounts/http.mount
--- gvfs-without_avahi ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: