diff options
| author | kwm <kwm@FreeBSD.org> | 2011-03-01 17:37:05 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2011-03-01 17:37:05 +0800 |
| commit | 0357e891ffefd54eb8b1b1a94204420cbf07b0f3 (patch) | |
| tree | e79cc1de960697c4dbbd98aeb3b5fb4eeda3552f /devel/gvfs | |
| parent | 7bee3659cdba01db39f97d3948fa3cf97ee863b6 (diff) | |
| download | freebsd-ports-gnome-0357e891ffefd54eb8b1b1a94204420cbf07b0f3.tar.gz freebsd-ports-gnome-0357e891ffefd54eb8b1b1a94204420cbf07b0f3.tar.zst freebsd-ports-gnome-0357e891ffefd54eb8b1b1a94204420cbf07b0f3.zip | |
Optionfy Avahi. default to on. [1]
libgnomekeyring lives in its own port these days.
Remove 2 6.x checks.
PR: ports/153327 [1]
Submitted by: "" <moonshade@pnhz.kz>
Diffstat (limited to 'devel/gvfs')
| -rw-r--r-- | devel/gvfs/Makefile | 20 | ||||
| -rw-r--r-- | devel/gvfs/pkg-plist | 16 |
2 files changed, 17 insertions, 19 deletions
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 50423b59ed44..d64857958d5f 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.66 2010/11/13 01:48:28 kwm Exp $ +# $MCom: ports/devel/gvfs/Makefile,v 1.70 2011/01/31 19:06:42 kwm Exp $ # PORTNAME= gvfs PORTVERSION= 1.6.6 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,8 +19,7 @@ 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/gnome-keyring \ - avahi-client.3:${PORTSDIR}/net/avahi-app + gnome-keyring:${PORTSDIR}/security/libgnome-keyring RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount USE_BZIP2= yes @@ -32,6 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" 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 @@ -71,15 +72,12 @@ CONFIGURE_ARGS+= --disable-gphoto2 PLIST_SUB+= GPHOTO2="@comment " .endif -.if ${OSVERSION} < 602112 -CONFIGURE_ARGS+= --disable-archive -PLIST_SUB+= ARCHIVE="@comment " +.if defined(WITH_AVAHI) +LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app +PLIST_SUB+= AVAHI="" .else -PLIST_SUB+= ARCHIVE="" -.endif - -.if ${OSVERSION} < 700000 -BROKEN= does not configure on 6.X +CONFIGURE_ARGS+=--disable-avahi +PLIST_SUB+= AVAHI="@comment " .endif .include <bsd.port.post.mk> diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index 353491c5fe39..67ac27994256 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -24,9 +24,9 @@ lib/gio/modules/libgioremote-volume-monitor.la lib/gio/modules/libgioremote-volume-monitor.so lib/gio/modules/libgvfsdbus.la lib/gio/modules/libgvfsdbus.so -lib/libgvfscommon-dnssd.la -lib/libgvfscommon-dnssd.so -lib/libgvfscommon-dnssd.so.0 +%%AVAHI%%lib/libgvfscommon-dnssd.la +%%AVAHI%%lib/libgvfscommon-dnssd.so +%%AVAHI%%lib/libgvfscommon-dnssd.so.0 lib/libgvfscommon.la lib/libgvfscommon.so lib/libgvfscommon.so.0 @@ -34,12 +34,12 @@ lib/libgvfscommon.so.0 %%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor libexec/gvfs-hal-volume-monitor libexec/gvfsd -%%ARCHIVE%%libexec/gvfsd-archive +libexec/gvfsd-archive libexec/gvfsd-burn %%CDDA%%libexec/gvfsd-cdda libexec/gvfsd-computer libexec/gvfsd-dav -libexec/gvfsd-dnssd +%%AVAHI%%libexec/gvfsd-dnssd libexec/gvfsd-ftp %%GPHOTO2%%libexec/gvfsd-gphoto2 libexec/gvfsd-http @@ -54,13 +54,13 @@ 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 -%%ARCHIVE%%share/gvfs/mounts/archive.mount +share/gvfs/mounts/archive.mount share/gvfs/mounts/burn.mount %%CDDA%%share/gvfs/mounts/cdda.mount share/gvfs/mounts/computer.mount share/gvfs/mounts/dav.mount -share/gvfs/mounts/dav+sd.mount -share/gvfs/mounts/dns-sd.mount +%%AVAHI%%share/gvfs/mounts/dav+sd.mount +%%AVAHI%%share/gvfs/mounts/dns-sd.mount share/gvfs/mounts/ftp.mount %%GPHOTO2%%share/gvfs/mounts/gphoto2.mount share/gvfs/mounts/http.mount |