summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmcneill <jmcneill>2008-11-23 03:28:50 +0000
committerjmcneill <jmcneill>2008-11-23 03:28:50 +0000
commit22582b4e0f6ae6b634647d2163dd9238009884b2 (patch)
tree874f19139668104ff35c1b9141c442db2ceec260
parentec829e50d1cc7c4080081e2049502341bd10446f (diff)
downloadpkgsrc-22582b4e0f6ae6b634647d2163dd9238009884b2.tar.gz
Pull in hal, bump PKGREVISION
-rw-r--r--sysutils/gvfs/Makefile18
-rw-r--r--sysutils/gvfs/PLIST5
2 files changed, 21 insertions, 2 deletions
diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index 2cc1d23e1b6..6169ff76298 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2008/10/24 21:48:44 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2008/11/23 03:28:50 jmcneill Exp $
#
DISTNAME= gvfs-1.0.2
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.0/}
EXTRACT_SUFX= .tar.bz2
@@ -19,6 +20,21 @@ CONFIGURE_ARGS+= --with-samba-includes=${LOCALBASE}/include
CONFIGURE_ARGS+= --with-samba-libs=${LOCALBASE}/lib/samba
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
+.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Mhal)
+.include "../../sysutils/hal/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-hal
+PLIST.hal= yes
+.else
+CONFIGURE_ARGS+= --disable-hal
+.endif
+
BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.24
.include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/gvfs/PLIST b/sysutils/gvfs/PLIST
index cfb41af2c98..b38105542bc 100644
--- a/sysutils/gvfs/PLIST
+++ b/sysutils/gvfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/10/16 13:59:39 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/11/23 03:28:50 jmcneill Exp $
bin/gvfs-cat
bin/gvfs-copy
bin/gvfs-info
@@ -21,6 +21,7 @@ lib/gio/modules/libgiogconf.la
lib/gio/modules/libgioremote-volume-monitor.la
lib/gio/modules/libgvfsdbus.la
lib/libgvfscommon.la
+${PLIST.hal}libexec/gvfs-hal-volume-monitor
libexec/gvfsd
libexec/gvfsd-archive
libexec/gvfsd-burn
@@ -35,6 +36,7 @@ libexec/gvfsd-smb
libexec/gvfsd-smb-browse
libexec/gvfsd-trash
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
share/gvfs/mounts/computer.mount
@@ -47,6 +49,7 @@ share/gvfs/mounts/sftp.mount
share/gvfs/mounts/smb-browse.mount
share/gvfs/mounts/smb.mount
share/gvfs/mounts/trash.mount
+${PLIST.hal}share/gvfs/remote-volume-monitors/hal.monitor
share/locale/ar/LC_MESSAGES/gvfs.mo
share/locale/be@latin/LC_MESSAGES/gvfs.mo
share/locale/bg/LC_MESSAGES/gvfs.mo