diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2011-06-04 22:38:01 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2011-06-04 22:38:01 +0000 |
| commit | 16af45bc28554ba3faa24e44a0b647e39e5f1138 (patch) | |
| tree | ec591765b03dcfbced7f267d2d3ef1d7c02c4584 /devel | |
| parent | fd48ccbc42485bc10f91f3efbb2594c70bf6c15e (diff) | |
| download | ports-16af45bc28554ba3faa24e44a0b647e39e5f1138.tar.gz ports-16af45bc28554ba3faa24e44a0b647e39e5f1138.zip | |
Notes
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gvfs/Makefile | 20 | ||||
| -rw-r--r-- | devel/gvfs/pkg-plist | 6 |
2 files changed, 17 insertions, 9 deletions
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index d64857958d5f..36465443dd3e 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -17,10 +17,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME virtual file system LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \ - hal.1:${PORTSDIR}/sysutils/hal \ soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \ gnome-keyring:${PORTSDIR}/security/libgnome-keyring -RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount USE_BZIP2= yes USE_GNOME= glib20 gnomehack gnomeprefix intlhack gconf2 @@ -34,8 +32,9 @@ CONFIGURE_ARGS= --disable-obexftp OPTIONS= FUSE "Enable fuse" off \ AVAHI "Enable AVAHI" on \ SAMBA "Enable Samba" on \ - GPHOTO2 "Enable Gphoto 2 camera support" on \ - CDDA "Enable CDDA" on + GPHOTO2 "Enable Gphoto 2 camera support (required HAL)" on \ + CDDA "Enable CDDA (required HAL)" on \ + HAL "Enable HAL" on .include <bsd.port.pre.mk> @@ -56,7 +55,7 @@ CONFIGURE_ARGS+= --disable-samba PLIST_SUB+= SMB="@comment " .endif -.if defined(WITH_CDDA) +.if defined(WITH_CDDA) && !defined(WITHOUT_HAL) LIB_DEPENDS+= cdio_paranoia.0:${PORTSDIR}/sysutils/libcdio PLIST_SUB+= CDDA="" .else @@ -64,7 +63,7 @@ CONFIGURE_ARGS+= --disable-cdda PLIST_SUB+= CDDA="@comment " .endif -.if defined(WITH_GPHOTO2) +.if defined(WITH_GPHOTO2) && !defined(WITHOUT_HAL) LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 PLIST_SUB+= GPHOTO2="" .else @@ -80,4 +79,13 @@ CONFIGURE_ARGS+=--disable-avahi PLIST_SUB+= AVAHI="@comment " .endif +.if defined(WITH_HAL) +LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +RUN_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount +PLIST_SUB+= HAL="" +.else +CONFIGURE_ARGS+=--disable-hal +PLIST_SUB+= HAL="@comment " +.endif + .include <bsd.port.post.mk> diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index 67ac27994256..bbc4ad1a7c89 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -32,7 +32,7 @@ lib/libgvfscommon.so lib/libgvfscommon.so.0 %%FUSE%%libexec/gvfs-fuse-daemon %%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor -libexec/gvfs-hal-volume-monitor +%%HAL%%libexec/gvfs-hal-volume-monitor libexec/gvfsd libexec/gvfsd-archive libexec/gvfsd-burn @@ -53,7 +53,7 @@ libexec/gvfsd-trash share/dbus-1/services/gvfs-daemon.service share/dbus-1/services/gvfs-metadata.service %%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service -share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service +%%HAL%%share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service share/gvfs/mounts/archive.mount share/gvfs/mounts/burn.mount %%CDDA%%share/gvfs/mounts/cdda.mount @@ -71,7 +71,7 @@ share/gvfs/mounts/sftp.mount %%SMB%%share/gvfs/mounts/smb.mount share/gvfs/mounts/trash.mount %%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor -share/gvfs/remote-volume-monitors/hal.monitor +%%HAL%%share/gvfs/remote-volume-monitors/hal.monitor share/locale/af/LC_MESSAGES/gvfs.mo share/locale/ar/LC_MESSAGES/gvfs.mo share/locale/as/LC_MESSAGES/gvfs.mo |