Sun Nov 23 13:43:40 2008 UTC ()
Pull in hal, bump PKGREVISION


(jmcneill)
diff -r1.70 -r1.71 pkgsrc/sysutils/gnome-vfs/Makefile
diff -r1.12 -r1.13 pkgsrc/sysutils/gnome-vfs/Makefile.common

cvs diff -r1.70 -r1.71 pkgsrc/sysutils/gnome-vfs/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/gnome-vfs/Makefile 2008/08/15 01:41:42 1.70
+++ pkgsrc/sysutils/gnome-vfs/Makefile 2008/11/23 13:43:40 1.71
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2008/08/15 01:41:42 dsainty Exp $
+# $NetBSD: Makefile,v 1.71 2008/11/23 13:43:40 jmcneill Exp $
+
+PKGREVISION=		1
 
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome-vfs-module-2.0.pc.in

cvs diff -r1.12 -r1.13 pkgsrc/sysutils/gnome-vfs/Makefile.common (expand / switch to context diff)
--- pkgsrc/sysutils/gnome-vfs/Makefile.common 2008/10/16 12:30:16 1.12
+++ pkgsrc/sysutils/gnome-vfs/Makefile.common 2008/11/23 13:43:40 1.13
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2008/10/16 12:30:16 drochner Exp $
+# $NetBSD: Makefile.common,v 1.13 2008/11/23 13:43:40 jmcneill Exp $
 #
 
 GNOME_VFS_VERSION=	2.24.0
@@ -45,7 +45,8 @@
 .endfor
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-vfs
-PKG_SUPPORTED_OPTIONS+=	inet6 gssapi
+PKG_SUPPORTED_OPTIONS+=	inet6 gssapi hal
+PKG_SUGGESTED_OPTIONS+=	hal
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == NetBSD
@@ -66,6 +67,14 @@
 CONFIGURE_ENV+=		KRB5_CONFIG=${SH_KRB5_CONFIG}
 .else
 CONFIGURE_ENV+=		ac_cv_path_KRB5_CONFIG=none
+.endif
+
+.if !empty(PKG_OPTIONS:Mhal)
+DEPENDS+=	gnome-mount>=0.8:../../sysutils/gnome-mount
+.include "../../sysutils/hal/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-hal
+.else
+CONFIGURE_ARGS+=	--disable-hal
 .endif
 
 # XXX Work-around for a problem in the configure script which checks for