Index: head/devel/gvfs/Makefile =================================================================== --- head/devel/gvfs/Makefile (revision 552112) +++ head/devel/gvfs/Makefile (revision 552113) @@ -1,106 +1,85 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= gvfs -PORTVERSION= 1.30.4 -PORTREVISION= 4 +PORTVERSION= 1.46.1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME virtual file system LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl -LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libsoup-gnome-2.4.so:devel/libsoup-gnome \ - libsoup-2.4.so:devel/libsoup \ - libgcrypt.so:security/libgcrypt \ +LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libdbus-1.so:devel/dbus \ libgcr-base-3.so:security/gcr \ + libsoup-2.4.so:devel/libsoup \ + libgudev-1.0.so:devel/libgudev \ + libudisks2.so:sysutils/libudisks \ libsecret-1.so:security/libsecret \ - libp11-kit.so:security/p11-kit \ - libgpg-error.so:security/libgpg-error \ - libcdio.so:sysutils/libcdio \ - libjson-glib-1.0.so:devel/json-glib + libbluray.so:multimedia/libbluray +RUN_DEPENDS= bsdisks>0:sysutils/bsdisks PORTSCOUT= limitw:1,even -USES= gettext gmake gnome libarchive libtool localbase \ - pathfix pkgconfig tar:xz -USE_GNOME= glib20 intlhack libxslt:build -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-bluray \ - --disable-gudev \ - --disable-libsystemd-login \ - --disable-udisks2 \ - --disable-gdu \ - --disable-udev \ - --disable-goa \ - --disable-libmtp \ - --disable-gtk \ - --disable-libsystemd-login \ - --disable-admin +USES= gettext gnome libarchive localbase meson \ + pkgconfig python:3.5+,build shebangfix tar:xz +USE_GNOME= glib20 libxml2 libxslt:build +SHEBANG_FILES= meson_post_install.py +MESON_ARGS= -Dsystemduserunitdir=no \ + -Dtmpfilesdir=no \ + -Dadmin=false \ + -Dlogind=false \ + -Dlibusb=false \ + -Dman=true +USE_LDCONFIG= yes -INSTALL_TARGET= install-strip - GLIB_SCHEMAS= org.gnome.system.gvfs.enums.xml OPTIONS_SUB= yes -OPTIONS_DEFINE= AVAHI SAMBA GPHOTO2 CDDA HAL FUSE AFC GOOGLE -OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL FUSE GOOGLE -CDDA_DESC= CDDA (enables HAL) -GPHOTO2_DESC= Gphoto 2 camera support (enables HAL) for PTP support -SAMBA_DESC= Samba support +OPTIONS_DEFINE= AVAHI FUSE AFC GOA SAMBA CDDA GOOGLE GPHOTO2 MTP NFS +OPTIONS_DEFAULT=AVAHI FUSE GOA SAMBA CDDA GOOGLE GPHOTO2 MTP NFS AFC_DESC= Apple device support +GOA_DESC= GNOME Online Accounts volume monitor support GOOGLE_DESC= Google backend -FUSE_USES= fuse -FUSE_CONFIGURE_ENABLE= fuse - -SAMBA_USES= samba:lib -SAMBA_CONFIGURE_ENABLE= samba -SAMBA_CONFIGURE_WITH= samba-includes=${SAMBAINCLUDES} samba-libs=${SAMBALIBS} - -CDDA_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia -CDDA_CONFIGURE_ENABLE= cdda - -GPHOTO2_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 -GPHOTO2_CONFIGURE_ENABLE= gphoto2 - AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app -AVAHI_CONFIGURE_ENABLE= avahi +AVAHI_MESON_TRUE= dnssd +AVAHI_VARS= GLIB_SCHEMAS+=org.gnome.system.dns_sd.gschema.xml +FUSE_USES= fuse:3 +FUSE_MESON_TRUE= fuse + AFC_LIB_DEPENDS= libimobiledevice.so:comms/libimobiledevice \ libplist.so:devel/libplist -AFC_CONFIGURE_ENABLE= afc +AFC_MESON_TRUE= afc -GOOGLE_CONFIGURE_ENABLE= google -GOOGLE_LIB_DEPENDS= libgdata.so:devel/libgdata \ - libgoa-1.0.so:net/gnome-online-accounts +GOA_LIB_DEPENDS= libgoa-1.0.so:net/gnome-online-accounts +GOA_MESON_TRUE= goa -.include +SAMBA_USES= samba:lib +SAMBA_MESON_TRUE= smb +SAMBA_VARS= GLIB_SCHEMAS+=org.gnome.system.smb.gschema.xml -.if ${PORT_OPTIONS:MSAMBA} -GLIB_SCHEMAS+= org.gnome.system.smb.gschema.xml -.endif +CDDA_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia \ + libcdio.so:sysutils/libcdio +CDDA_MESON_TRUE= cdda -.if ${PORT_OPTIONS:MAVAHI} -GLIB_SCHEMAS+= org.gnome.system.dns_sd.gschema.xml -.endif +GOOGLE_IMPLIES= GOA +GOOGLE_LIB_DEPENDS= libgdata.so:devel/libgdata +GOOGLE_MESON_TRUE= google -.if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA} -LIB_DEPENDS+= libhal.so:sysutils/hal -RUN_DEPENDS+= gnome-mount:sysutils/gnome-mount -PLIST_SUB+= HAL="" -.else -CONFIGURE_ARGS+=--disable-hal -PLIST_SUB+= HAL="@comment " -.endif +GPHOTO2_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 +GPHOTO2_MESON_TRUE= gphoto2 -post-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/remote-volume-monitors - @${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd +MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp +MTP_MESON_TRUE= mtp +NFS_LIB_DEPENDS= libnfs.so:net/libnfs +NFS_MESON_TRUE= nfs + .include + Index: head/devel/gvfs/distinfo =================================================================== --- head/devel/gvfs/distinfo (revision 552112) +++ head/devel/gvfs/distinfo (revision 552113) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526113308 -SHA256 (gnome/gvfs-1.30.4.tar.xz) = 981e0aca7f4e2e99860137f9fd99c335fa72a764156d253caf1069380a8e3afa -SIZE (gnome/gvfs-1.30.4.tar.xz) = 1895304 +TIMESTAMP = 1602487319 +SHA256 (gnome/gvfs-1.46.1.tar.xz) = 621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503 +SIZE (gnome/gvfs-1.46.1.tar.xz) = 1220416 Index: head/devel/gvfs/files/patch-client_Makefile.in =================================================================== --- head/devel/gvfs/files/patch-client_Makefile.in (revision 552112) +++ head/devel/gvfs/files/patch-client_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- client/Makefile.in.orig 2015-08-17 21:54:17.000000000 +0200 -+++ client/Makefile.in 2015-08-17 21:54:39.000000000 +0200 -@@ -292,7 +292,7 @@ - EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ --FUSE_LIBS = @FUSE_LIBS@ -+FUSE_LIBS = @FUSE_LIBS@ -lfuse - GCR_CFLAGS = @GCR_CFLAGS@ - GCR_LIBS = @GCR_LIBS@ - GDU_CFLAGS = @GDU_CFLAGS@ Property changes on: head/devel/gvfs/files/patch-client_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/gvfs/pkg-plist =================================================================== --- head/devel/gvfs/pkg-plist (revision 552112) +++ head/devel/gvfs/pkg-plist (revision 552113) @@ -1,196 +1,156 @@ -bin/gvfs-cat -bin/gvfs-copy -bin/gvfs-info -bin/gvfs-less -bin/gvfs-ls -bin/gvfs-mime -bin/gvfs-mkdir -bin/gvfs-monitor-dir -bin/gvfs-monitor-file -bin/gvfs-mount -bin/gvfs-move -bin/gvfs-open -bin/gvfs-rename -bin/gvfs-rm -bin/gvfs-save -bin/gvfs-set-attribute -bin/gvfs-trash -bin/gvfs-tree include/gvfs-client/gvfs/gvfsurimapper.h include/gvfs-client/gvfs/gvfsuriutils.h lib/gio/modules/libgioremote-volume-monitor.so lib/gio/modules/libgvfsdbus.so lib/gvfs/libgvfscommon.so lib/gvfs/libgvfsdaemon.so %%AFC%%libexec/gvfs-afc-volume-monitor +%%GOA%%libexec/gvfs-goa-volume-monitor %%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor -%%HAL%%libexec/gvfs-hal-volume-monitor +%%MTP%%libexec/gvfs-mtp-volume-monitor +libexec/gvfs-udisks2-volume-monitor +libexec/gvfsd +%%AFC%%libexec/gvfsd-afc libexec/gvfsd-afp libexec/gvfsd-afp-browse -%%AFC%%libexec/gvfsd-afc -libexec/gvfsd libexec/gvfsd-archive libexec/gvfsd-burn %%CDDA%%libexec/gvfsd-cdda libexec/gvfsd-computer libexec/gvfsd-dav %%AVAHI%%libexec/gvfsd-dnssd libexec/gvfsd-ftp %%FUSE%%libexec/gvfsd-fuse %%GOOGLE%%libexec/gvfsd-google %%GPHOTO2%%libexec/gvfsd-gphoto2 libexec/gvfsd-http libexec/gvfsd-localtest libexec/gvfsd-metadata +%%MTP%%libexec/gvfsd-mtp libexec/gvfsd-network +%%NFS%%libexec/gvfsd-nfs +libexec/gvfsd-recent libexec/gvfsd-sftp %%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-less.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 +%%FUSE%%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 -%%SAMBA%%share/GConf/gsettings/gvfs-smb.convert -share/bash-completion/completions/gvfs-cat -share/bash-completion/completions/gvfs-copy -share/bash-completion/completions/gvfs-info -share/bash-completion/completions/gvfs-less -share/bash-completion/completions/gvfs-ls -share/bash-completion/completions/gvfs-mkdir -share/bash-completion/completions/gvfs-monitor-dir -share/bash-completion/completions/gvfs-monitor-file -share/bash-completion/completions/gvfs-mount -share/bash-completion/completions/gvfs-move -share/bash-completion/completions/gvfs-open -share/bash-completion/completions/gvfs-rename -share/bash-completion/completions/gvfs-rm -share/bash-completion/completions/gvfs-save -share/bash-completion/completions/gvfs-set-attribute -share/bash-completion/completions/gvfs-trash -share/bash-completion/completions/gvfs-tree +share/GConf/gsettings/gvfs-dns-sd.convert +share/GConf/gsettings/gvfs-smb.convert share/dbus-1/services/org.gtk.vfs.Daemon.service -share/dbus-1/services/org.gtk.vfs.Metadata.service -share/polkit-1/actions/org.gtk.vfs.file-operations.policy -share/polkit-1/rules.d/org.gtk.vfs.file-operations.rules %%AFC%%share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service %%GPHOTO2%%share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service -%%HAL%%share/dbus-1/services/org.gtk.vfs.HalVolumeMonitor.service +%%GOA%%share/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service +%%MTP%%share/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service +share/dbus-1/services/org.gtk.vfs.Metadata.service +share/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service %%AFC%%%%DATADIR%%/mounts/afc.mount -share/gvfs/mounts/afp-browse.mount -share/gvfs/mounts/afp.mount +%%DATADIR%%/mounts/afp-browse.mount +%%DATADIR%%/mounts/afp.mount %%DATADIR%%/mounts/archive.mount %%DATADIR%%/mounts/burn.mount %%CDDA%%%%DATADIR%%/mounts/cdda.mount %%DATADIR%%/mounts/computer.mount -%%DATADIR%%/mounts/dav.mount %%AVAHI%%%%DATADIR%%/mounts/dav+sd.mount +%%DATADIR%%/mounts/dav.mount %%AVAHI%%%%DATADIR%%/mounts/dns-sd.mount %%DATADIR%%/mounts/ftp.mount +%%DATADIR%%/mounts/ftpis.mount %%DATADIR%%/mounts/ftps.mount %%GOOGLE%%%%DATADIR%%/mounts/google.mount %%GPHOTO2%%%%DATADIR%%/mounts/gphoto2.mount %%DATADIR%%/mounts/http.mount %%DATADIR%%/mounts/localtest.mount +%%MTP%%%%DATADIR%%/mounts/mtp.mount %%DATADIR%%/mounts/network.mount +%%NFS%%%%DATADIR%%/mounts/nfs.mount +%%DATADIR%%/mounts/recent.mount %%DATADIR%%/mounts/sftp.mount %%SAMBA%%%%DATADIR%%/mounts/smb-browse.mount %%SAMBA%%%%DATADIR%%/mounts/smb.mount %%DATADIR%%/mounts/trash.mount %%AFC%%%%DATADIR%%/remote-volume-monitors/afc.monitor +%%GOA%%%%DATADIR%%/remote-volume-monitors/goa.monitor %%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor -%%HAL%%%%DATADIR%%/remote-volume-monitors/hal.monitor +%%MTP%%%%DATADIR%%/remote-volume-monitors/mtp.monitor +%%DATADIR%%/remote-volume-monitors/udisks2.monitor share/locale/af/LC_MESSAGES/gvfs.mo share/locale/ar/LC_MESSAGES/gvfs.mo share/locale/as/LC_MESSAGES/gvfs.mo share/locale/ast/LC_MESSAGES/gvfs.mo share/locale/be/LC_MESSAGES/gvfs.mo share/locale/be@latin/LC_MESSAGES/gvfs.mo share/locale/bg/LC_MESSAGES/gvfs.mo share/locale/bn/LC_MESSAGES/gvfs.mo share/locale/bn_IN/LC_MESSAGES/gvfs.mo share/locale/bs/LC_MESSAGES/gvfs.mo share/locale/ca/LC_MESSAGES/gvfs.mo share/locale/ca@valencia/LC_MESSAGES/gvfs.mo share/locale/cs/LC_MESSAGES/gvfs.mo share/locale/da/LC_MESSAGES/gvfs.mo share/locale/de/LC_MESSAGES/gvfs.mo share/locale/el/LC_MESSAGES/gvfs.mo share/locale/en@shaw/LC_MESSAGES/gvfs.mo share/locale/en_GB/LC_MESSAGES/gvfs.mo share/locale/eo/LC_MESSAGES/gvfs.mo share/locale/es/LC_MESSAGES/gvfs.mo share/locale/et/LC_MESSAGES/gvfs.mo share/locale/eu/LC_MESSAGES/gvfs.mo share/locale/fa/LC_MESSAGES/gvfs.mo share/locale/fi/LC_MESSAGES/gvfs.mo share/locale/fr/LC_MESSAGES/gvfs.mo +share/locale/fur/LC_MESSAGES/gvfs.mo share/locale/ga/LC_MESSAGES/gvfs.mo share/locale/gl/LC_MESSAGES/gvfs.mo share/locale/gu/LC_MESSAGES/gvfs.mo share/locale/he/LC_MESSAGES/gvfs.mo share/locale/hi/LC_MESSAGES/gvfs.mo +share/locale/hr/LC_MESSAGES/gvfs.mo share/locale/hu/LC_MESSAGES/gvfs.mo share/locale/id/LC_MESSAGES/gvfs.mo share/locale/it/LC_MESSAGES/gvfs.mo share/locale/ja/LC_MESSAGES/gvfs.mo share/locale/kk/LC_MESSAGES/gvfs.mo share/locale/kn/LC_MESSAGES/gvfs.mo share/locale/ko/LC_MESSAGES/gvfs.mo share/locale/ku/LC_MESSAGES/gvfs.mo share/locale/lt/LC_MESSAGES/gvfs.mo share/locale/lv/LC_MESSAGES/gvfs.mo share/locale/mai/LC_MESSAGES/gvfs.mo share/locale/mk/LC_MESSAGES/gvfs.mo share/locale/ml/LC_MESSAGES/gvfs.mo share/locale/mr/LC_MESSAGES/gvfs.mo +share/locale/ms/LC_MESSAGES/gvfs.mo share/locale/nb/LC_MESSAGES/gvfs.mo share/locale/nds/LC_MESSAGES/gvfs.mo +share/locale/ne/LC_MESSAGES/gvfs.mo share/locale/nl/LC_MESSAGES/gvfs.mo share/locale/nn/LC_MESSAGES/gvfs.mo share/locale/oc/LC_MESSAGES/gvfs.mo share/locale/or/LC_MESSAGES/gvfs.mo share/locale/pa/LC_MESSAGES/gvfs.mo share/locale/pl/LC_MESSAGES/gvfs.mo share/locale/pt/LC_MESSAGES/gvfs.mo share/locale/pt_BR/LC_MESSAGES/gvfs.mo share/locale/ro/LC_MESSAGES/gvfs.mo share/locale/ru/LC_MESSAGES/gvfs.mo share/locale/sk/LC_MESSAGES/gvfs.mo share/locale/sl/LC_MESSAGES/gvfs.mo share/locale/sq/LC_MESSAGES/gvfs.mo share/locale/sr/LC_MESSAGES/gvfs.mo share/locale/sr@latin/LC_MESSAGES/gvfs.mo 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 share/locale/uk/LC_MESSAGES/gvfs.mo share/locale/vi/LC_MESSAGES/gvfs.mo share/locale/zh_CN/LC_MESSAGES/gvfs.mo share/locale/zh_HK/LC_MESSAGES/gvfs.mo share/locale/zh_TW/LC_MESSAGES/gvfs.mo -@dir %%DATADIR%%/remote-volume-monitors -@dir share/GConf/gsettings