diff options
| author | jmcneill <jmcneill> | 2008-11-23 13:43:40 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill> | 2008-11-23 13:43:40 +0000 |
| commit | 619ddcd186cfdd8ca05301c171aa352f67623429 (patch) | |
| tree | dde0e1ccad17b8632215ba8999703d90f5a09a06 /sysutils/gnome-vfs | |
| parent | 88bf58b38b16135bfc44a051f7f9d0a5c435bfb2 (diff) | |
| download | pkgsrc-619ddcd186cfdd8ca05301c171aa352f67623429.tar.gz | |
Pull in hal, bump PKGREVISION
Diffstat (limited to 'sysutils/gnome-vfs')
| -rw-r--r-- | sysutils/gnome-vfs/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/gnome-vfs/Makefile.common | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index 9a11aa8425a..588e21effbe 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -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 diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common index 5145b0ee496..38e64f32b47 100644 --- a/sysutils/gnome-vfs/Makefile.common +++ b/sysutils/gnome-vfs/Makefile.common @@ -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 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .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 @@ -68,6 +69,14 @@ CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG} 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 # statvfs(2) having SVR4 in mind. Solving this in the script itself could # be the right way to go, but it is out of the scope of a local patch; it |