From 0d4d6365546de99b64e1406acf4834557201db64 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill>
Date: Sat, 20 Dec 2008 20:11:54 +0000
Subject: Add avahi and cdda support, bump PKGREVISION.

---
 sysutils/gvfs/Makefile | 24 ++++++++++++++++++++----
 sysutils/gvfs/PLIST    |  6 +++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'sysutils/gvfs')

diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index 13cecc8ad0d..929fa1d3458 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2008/11/24 15:09:02 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/12/20 20:11:54 jmcneill Exp $
 #
 
 DISTNAME=	gvfs-1.0.3
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.0/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,18 +23,33 @@ CONFIGURE_ARGS+=	--enable-http
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.gvfs
-PKG_SUPPORTED_OPTIONS+= hal
-PKG_SUGGESTED_OPTIONS+= hal
-PLIST_VARS+=		hal
+PKG_SUPPORTED_OPTIONS+= avahi hal
+PKG_SUGGESTED_OPTIONS+= avahi hal
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
 .include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-avahi
+PLIST.avahi=		yes
+.else
+CONFIGURE_ARGS+=	--disable-avahi
+.endif
+
 .if !empty(PKG_OPTIONS:Mhal)
+.include "../../misc/libcdio/buildlink3.mk"
 .include "../../sysutils/hal/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-hal
+CONFIGURE_ARGS+=	--enable-cdda
 PLIST.hal=		yes
 .else
 CONFIGURE_ARGS+=	--disable-hal
+CONFIGURE_ARGS+=	--disable-cdda
 .endif
 
+# Not yet; will cause the package to fail if fuse is not present
+#.include "../../mk/fuse.buildlink3.mk"
+
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.17.6
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/sysutils/gvfs/PLIST b/sysutils/gvfs/PLIST
index b38105542bc..7613359fa10 100644
--- a/sysutils/gvfs/PLIST
+++ b/sysutils/gvfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/11/23 03:28:50 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/12/20 20:11:54 jmcneill Exp $
 bin/gvfs-cat
 bin/gvfs-copy
 bin/gvfs-info
@@ -25,8 +25,10 @@ ${PLIST.hal}libexec/gvfs-hal-volume-monitor
 libexec/gvfsd
 libexec/gvfsd-archive
 libexec/gvfsd-burn
+${PLIST.hal}libexec/gvfsd-cdda
 libexec/gvfsd-computer
 libexec/gvfsd-dav
+${PLIST.avahi}libexec/gvfsd-dnssd
 libexec/gvfsd-ftp
 libexec/gvfsd-http
 libexec/gvfsd-localtest
@@ -39,8 +41,10 @@ share/dbus-1/services/gvfs-daemon.service
 ${PLIST.hal}share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
 share/gvfs/mounts/archive.mount
 share/gvfs/mounts/burn.mount
+${PLIST.hal}share/gvfs/mounts/cdda.mount
 share/gvfs/mounts/computer.mount
 share/gvfs/mounts/dav.mount
+${PLIST.avahi}share/gvfs/mounts/dns-sd.mount
 share/gvfs/mounts/ftp.mount
 share/gvfs/mounts/http.mount
 share/gvfs/mounts/localtest.mount
-- 
cgit v1.2.3