[Midnightbsd-cvs] mports [19303] trunk/devel/gvfs: gvfs 1.20.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Jun 1 22:11:03 EDT 2015


Revision: 19303
          http://svnweb.midnightbsd.org/mports/?rev=19303
Author:   laffer1
Date:     2015-06-01 22:11:03 -0400 (Mon, 01 Jun 2015)
Log Message:
-----------
gvfs 1.20.3

Modified Paths:
--------------
    trunk/devel/gvfs/Makefile
    trunk/devel/gvfs/distinfo
    trunk/devel/gvfs/pkg-plist

Removed Paths:
-------------
    trunk/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c

Modified: trunk/devel/gvfs/Makefile
===================================================================
--- trunk/devel/gvfs/Makefile	2015-06-02 02:09:58 UTC (rev 19302)
+++ trunk/devel/gvfs/Makefile	2015-06-02 02:11:03 UTC (rev 19303)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	gvfs
-PORTVERSION=	1.12.3
-PORTREVISION=	4
+PORTVERSION=	1.20.3
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,14 +12,16 @@
 
 LICENSE=	lgpl
 
+BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
-USE_GNOME=	glib20 gnomeprefix intlhack intltool
-USE_LDCONFIG=	yes
+PORTSCOUT=	limitw:1,even
+
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	glib20 gnomeprefix intlhack intltool libxslt:build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -26,58 +28,55 @@
 CONFIGURE_ARGS=	--disable-obexftp \
 		--disable-bluray \
 		--disable-afc
+
+CONFIGURE_ARGS+=\
+		--disable-gudev \
+		--disable-libsystemd-login \
+		--disable-udisks2 \
+		--disable-gdu \
+		--disable-udev \
+		--disable-goa \
+		--disable-keyring \
+		--disable-bluray \
+		--disable-libmtp \
+		--disable-gtk
+
 INSTALL_TARGET=	install-strip
 
+GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
+
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
-OPTIONS_DEFAULT=SAMBA GPHOTO2 CDDA HAL
+OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
 CDDA_DESC=	CDDA (enables HAL)
 GPHOTO2_DESC=	Gphoto 2 camera support (enables HAL)
 SAMBA_DESC=	Samba support
 
-GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
+FUSE_USES=	fuse
+FUSE_CONFIGURE_ENABLE=	fuse
 
+SAMBA_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SAMBA_CONFIGURE_ENABLE=	samba
+
+CDDA_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDDA_CONFIGURE_ENABLE=	cdda
+
+GPHOTO2_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO2_CONFIGURE_ENABLE=	gphoto2
+
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_CONFIGURE_ENABLE=	avahi
+
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MFUSE}
-USES+=		fuse
-PLIST_SUB+=	FUSE=""
-.else
-CONFIGURE_ARGS+=	--disable-fuse
-PLIST_SUB+=	FUSE="@comment "
-.endif
+LIB_DEPENDS+=	libarchive.so.13:${PORTSDIR}/archivers/libarchive
 
 .if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
 GLIB_SCHEMAS+=	org.gnome.system.smb.gschema.xml
-PLIST_SUB+=	SMB=""
-.else
-CONFIGURE_ARGS+=	--disable-samba
-PLIST_SUB+=	SMB="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MCDDA}
-LIB_DEPENDS+=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
-PLIST_SUB+=	CDDA=""
-.else
-CONFIGURE_ARGS+=	--disable-cdda
-PLIST_SUB+=	CDDA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGPHOTO2}
-LIB_DEPENDS+=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
-PLIST_SUB+=	GPHOTO2=""
-.else
-CONFIGURE_ARGS+=	--disable-gphoto2
-PLIST_SUB+=	GPHOTO2="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 GLIB_SCHEMAS+=	org.gnome.system.dns_sd.gschema.xml
-PLIST_SUB+=	AVAHI=""
-.else
-CONFIGURE_ARGS+=--disable-avahi
-PLIST_SUB+=	AVAHI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA}
@@ -89,10 +88,12 @@
 PLIST_SUB+=	HAL="@comment "
 .endif
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=722411
+post-patch:
+	@${RM} ${WRKSRC}/monitor/hal/gvfsdbusutils.[ch]
+
 post-install:
-	@${STRIP_CMD} ${PREFIX}/lib/lib*.so.0
-	@${STRIP_CMD} ${PREFIX}/lib/gio/modules/lib*.so
-	@${MKDIR} ${DATADIR}/remote-volume-monitors
-	${TOUCH} ${DATADIR}/remote-volume-monitors/.keep
+	@${MKDIR} ${STAGEDIR}${DATADIR}/remote-volume-monitors
+	${TOUCH} ${STAGEDIR}${DATADIR}/remote-volume-monitors/.keep
 
 .include <bsd.port.mk>

Modified: trunk/devel/gvfs/distinfo
===================================================================
--- trunk/devel/gvfs/distinfo	2015-06-02 02:09:58 UTC (rev 19302)
+++ trunk/devel/gvfs/distinfo	2015-06-02 02:11:03 UTC (rev 19303)
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gvfs-1.12.3.tar.xz) = 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2
-SIZE (gnome3/gvfs-1.12.3.tar.xz) = 1361968
+SHA256 (gnome3/gvfs-1.20.3.tar.xz) = 646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba
+SIZE (gnome3/gvfs-1.20.3.tar.xz) = 1558028

Deleted: trunk/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c
===================================================================
--- trunk/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c	2015-06-02 02:09:58 UTC (rev 19302)
+++ trunk/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c	2015-06-02 02:11:03 UTC (rev 19303)
@@ -1,14 +0,0 @@
---- monitor/gphoto2/ggphoto2volume.c.orig	2008-07-22 09:29:19.000000000 -0400
-+++ monitor/gphoto2/ggphoto2volume.c	2008-07-22 23:22:30.000000000 -0400
-@@ -277,7 +277,11 @@ g_gphoto2_volume_new (GVolumeMonitor   *
-     return NULL;
- 
-   /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */
-+#ifdef __FreeBSD__
-+  device_path = hal_device_get_property_string (drive_device, "freebsd.device_file");
-+#else
-   device_path = hal_device_get_property_string (drive_device, "linux.device_file");
-+#endif
-   if (strlen (device_path) == 0)
-     device_path = NULL;
- 

Modified: trunk/devel/gvfs/pkg-plist
===================================================================
--- trunk/devel/gvfs/pkg-plist	2015-06-02 02:09:58 UTC (rev 19302)
+++ trunk/devel/gvfs/pkg-plist	2015-06-02 02:11:03 UTC (rev 19303)
@@ -16,22 +16,14 @@
 bin/gvfs-set-attribute
 bin/gvfs-trash
 bin/gvfs-tree
-etc/profile.d/gvfs-bash-completion.sh
 include/gvfs-client/gvfs/gvfsurimapper.h
 include/gvfs-client/gvfs/gvfsuriutils.h
-lib/gio/modules/libgioremote-volume-monitor.la
 lib/gio/modules/libgioremote-volume-monitor.so
-lib/gio/modules/libgvfsdbus.la
 lib/gio/modules/libgvfsdbus.so
-%%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
+lib/gvfs/libgvfscommon.so
+lib/gvfs/libgvfsdaemon.so
 libexec/gvfsd-afp
 libexec/gvfsd-afp-browse
-%%FUSE%%libexec/gvfs-fuse-daemon
 %%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor
 %%HAL%%libexec/gvfs-hal-volume-monitor
 libexec/gvfsd
@@ -42,6 +34,7 @@
 libexec/gvfsd-dav
 %%AVAHI%%libexec/gvfsd-dnssd
 libexec/gvfsd-ftp
+%%FUSE%%libexec/gvfsd-fuse
 %%GPHOTO2%%libexec/gvfsd-gphoto2
 libexec/gvfsd-http
 libexec/gvfsd-localtest
@@ -48,11 +41,33 @@
 libexec/gvfsd-metadata
 libexec/gvfsd-network
 libexec/gvfsd-sftp
-%%SMB%%libexec/gvfsd-smb
-%%SMB%%libexec/gvfsd-smb-browse
+%%SAMBA%%libexec/gvfsd-smb
+%%SAMBA%%libexec/gvfsd-smb-browse
 libexec/gvfsd-trash
+man/man1/gvfs-cat.1.gz
+man/man1/gvfs-copy.1.gz
+man/man1/gvfs-info.1.gz
+man/man1/gvfs-ls.1.gz
+man/man1/gvfs-mime.1.gz
+man/man1/gvfs-mkdir.1.gz
+man/man1/gvfs-monitor-dir.1.gz
+man/man1/gvfs-monitor-file.1.gz
+man/man1/gvfs-mount.1.gz
+man/man1/gvfs-move.1.gz
+man/man1/gvfs-open.1.gz
+man/man1/gvfs-rename.1.gz
+man/man1/gvfs-rm.1.gz
+man/man1/gvfs-save.1.gz
+man/man1/gvfs-set-attribute.1.gz
+man/man1/gvfs-trash.1.gz
+man/man1/gvfs-tree.1.gz
+man/man1/gvfsd-fuse.1.gz
+man/man1/gvfsd-metadata.1.gz
+man/man1/gvfsd.1.gz
+man/man7/gvfs.7.gz
 %%AVAHI%%share/GConf/gsettings/gvfs-dns-sd.convert
-%%SMB%%share/GConf/gsettings/gvfs-smb.convert
+%%SAMBA%%share/GConf/gsettings/gvfs-smb.convert
+share/bash-completion/completions/gvfs
 share/dbus-1/services/gvfs-daemon.service
 share/dbus-1/services/gvfs-metadata.service
 %%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
@@ -72,8 +87,8 @@
 %%DATADIR%%/mounts/localtest.mount
 %%DATADIR%%/mounts/network.mount
 %%DATADIR%%/mounts/sftp.mount
-%%SMB%%%%DATADIR%%/mounts/smb-browse.mount
-%%SMB%%%%DATADIR%%/mounts/smb.mount
+%%SAMBA%%%%DATADIR%%/mounts/smb-browse.mount
+%%SAMBA%%%%DATADIR%%/mounts/smb.mount
 %%DATADIR%%/mounts/trash.mount
 %%DATADIR%%/remote-volume-monitors/.keep
 %%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor
@@ -140,6 +155,7 @@
 share/locale/sv/LC_MESSAGES/gvfs.mo
 share/locale/ta/LC_MESSAGES/gvfs.mo
 share/locale/te/LC_MESSAGES/gvfs.mo
+share/locale/tg/LC_MESSAGES/gvfs.mo
 share/locale/th/LC_MESSAGES/gvfs.mo
 share/locale/tr/LC_MESSAGES/gvfs.mo
 share/locale/ug/LC_MESSAGES/gvfs.mo
@@ -148,39 +164,3 @@
 share/locale/zh_CN/LC_MESSAGES/gvfs.mo
 share/locale/zh_HK/LC_MESSAGES/gvfs.mo
 share/locale/zh_TW/LC_MESSAGES/gvfs.mo
- at dirrm %%DATADIR%%/remote-volume-monitors
- at dirrm %%DATADIR%%/mounts
- at dirrm %%DATADIR%%
- at dirrm include/gvfs-client/gvfs
- at dirrm include/gvfs-client
- at dirrmtry etc/profile.d
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/ug/LC_MESSAGES
- at dirrmtry share/locale/ug
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
- at dirrmtry share/locale/nds/LC_MESSAGES
- at dirrmtry share/locale/nds
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/mai/LC_MESSAGES
- at dirrmtry share/locale/mai
- at dirrmtry share/locale/ku/LC_MESSAGES
- at dirrmtry share/locale/ku
- at dirrmtry share/locale/kk/LC_MESSAGES
- at dirrmtry share/locale/kk
- at dirrmtry share/locale/en at shaw/LC_MESSAGES
- at dirrmtry share/locale/en at shaw
- at dirrmtry share/locale/ca at valencia/LC_MESSAGES
- at dirrmtry share/locale/ca at valencia
- at dirrmtry share/locale/bn_IN/LC_MESSAGES
- at dirrmtry share/locale/bn_IN
- at dirrmtry share/locale/be at latin/LC_MESSAGES
- at dirrmtry share/locale/be at latin
- at dirrmtry share/locale/ast/LC_MESSAGES
- at dirrmtry share/locale/ast
- at dirrmtry share/locale/as/LC_MESSAGES
- at dirrmtry share/locale/as



More information about the Midnightbsd-cvs mailing list