diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-06-05 06:51:28 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-06-05 06:51:28 +0800 |
| commit | 0539aa7075ca94d89eab4064c4acdbb77602ab48 (patch) | |
| tree | a439b93c69f8cda1035c5d4d0e027958ba835230 /devel | |
| parent | 2dbda72086f851f8738b378220d7bdd872fcc682 (diff) | |
| download | marcuscom-ports-0539aa7075ca94d89eab4064c4acdbb77602ab48.tar.gz marcuscom-ports-0539aa7075ca94d89eab4064c4acdbb77602ab48.tar.zst marcuscom-ports-0539aa7075ca94d89eab4064c4acdbb77602ab48.zip | |
Sync w/ FreeBSD ports tree that what I just committed recently.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16029 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gvfs/Makefile | 22 | ||||
| -rw-r--r-- | devel/gvfs/pkg-plist | 6 |
2 files changed, 18 insertions, 10 deletions
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 32464a7c8..5fb49e129 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.73 2011/04/27 19:33:06 kwm Exp $ +# $MCom: ports/devel/gvfs/Makefile,v 1.74 2011/05/24 19:46:39 kwm Exp $ # PORTNAME= gvfs @@ -16,10 +16,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 intltool @@ -33,8 +31,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 GLIB_SCHEMAS= org.gnome.system.gvfs.enums.xml @@ -58,7 +57,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 @@ -66,7 +65,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 @@ -83,4 +82,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.mk> diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index ce1612eab..07d6946fb 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -30,7 +30,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 %%DATADIR%%/mounts/archive.mount %%DATADIR%%/mounts/burn.mount %%CDDA%%%%DATADIR%%/mounts/cdda.mount @@ -71,7 +71,7 @@ share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service %%SMB%%%%DATADIR%%/mounts/smb.mount %%DATADIR%%/mounts/trash.mount %%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor -%%DATADIR%%/remote-volume-monitors/hal.monitor +%%HAL%%%%DATADIR%%/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 |