Date: Mon, 21 Mar 2016 05:54:15 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411541 - in head: databases/evolution-data-server net/gnome-online-accounts net/vinagre net/vino security/gnome-keyring www/epiphany x11/gdm x11/gdm/files x11/gnome-shell Message-ID: <201603210554.u2L5sF7P040567@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Mon Mar 21 05:54:15 2016 New Revision: 411541 URL: https://svnweb.freebsd.org/changeset/ports/411541 Log: Drop bogus libgnome-keyring dependency And add dependency upon libsecret where needed. Bump PORTREVISION because of dependency change. For x11/gdm also drop KEYRING option and corresponding logic bits - this functionality is now available unconditionally. Differential Revision: D5690 Reviewed by: kwm, mat Modified: head/databases/evolution-data-server/Makefile head/net/gnome-online-accounts/Makefile head/net/vinagre/Makefile head/net/vino/Makefile head/security/gnome-keyring/Makefile head/www/epiphany/Makefile head/x11/gdm/Makefile head/x11/gdm/files/gdm-password.in head/x11/gnome-shell/Makefile Modified: head/databases/evolution-data-server/Makefile ============================================================================== --- head/databases/evolution-data-server/Makefile Mon Mar 21 05:53:01 2016 (r411540) +++ head/databases/evolution-data-server/Makefile Mon Mar 21 05:54:15 2016 (r411541) @@ -3,6 +3,7 @@ PORTNAME= evolution-data-server PORTVERSION= 3.18.5 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -22,7 +23,7 @@ LIB_DEPENDS= libsoup-gnome-2.4.so:${PORT libical.so:${PORTSDIR}/devel/libical \ libnss3.so:${PORTSDIR}/security/nss \ libtasn1.so:${PORTSDIR}/security/libtasn1 \ - libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring + libsecret-1.so:${PORTSDIR}/security/libsecret PORTSCOUT= limitw:1,even Modified: head/net/gnome-online-accounts/Makefile ============================================================================== --- head/net/gnome-online-accounts/Makefile Mon Mar 21 05:53:01 2016 (r411540) +++ head/net/gnome-online-accounts/Makefile Mon Mar 21 05:54:15 2016 (r411541) @@ -3,6 +3,7 @@ PORTNAME= gnome-online-accounts PORTVERSION= 3.18.4 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= GNOME @@ -15,7 +16,6 @@ LIB_DEPENDS= libwebkit2gtk-4.0.so:${PORT libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \ libnotify.so:${PORTSDIR}/devel/libnotify \ - libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ libsecret-1.so:${PORTSDIR}/security/libsecret \ librest-0.7.so:${PORTSDIR}/devel/librest Modified: head/net/vinagre/Makefile ============================================================================== --- head/net/vinagre/Makefile Mon Mar 21 05:53:01 2016 (r411540) +++ head/net/vinagre/Makefile Mon Mar 21 05:54:15 2016 (r411541) @@ -3,7 +3,7 @@ PORTNAME= vinagre PORTVERSION= 3.18.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -14,8 +14,7 @@ COMMENT= VNC client for the GNOME Deskto BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool LIB_DEPENDS= libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc \ libgdbm.so:${PORTSDIR}/databases/gdbm \ - libsecret-1.so:${PORTSDIR}/security/libsecret \ - libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring + libsecret-1.so:${PORTSDIR}/security/libsecret RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme PORTSCOUT= limitw:1,even Modified: head/net/vino/Makefile ============================================================================== --- head/net/vino/Makefile Mon Mar 21 05:53:01 2016 (r411540) +++ head/net/vino/Makefile Mon Mar 21 05:54:15 2016 (r411541) @@ -3,6 +3,7 @@ PORTNAME= vino PORTVERSION= 3.18.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -13,8 +14,8 @@ COMMENT= VNC server that allows for remo LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libsecret-1.so:${PORTSDIR}/security/libsecret \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ - libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ libnotify.so:${PORTSDIR}/devel/libnotify \ libavahi-glib.so:${PORTSDIR}/net/avahi-app Modified: head/security/gnome-keyring/Makefile ============================================================================== --- head/security/gnome-keyring/Makefile Mon Mar 21 05:53:01 2016 (r411540) +++ head/security/gnome-keyring/Makefile Mon Mar 21 05:54:15 2016 (r411541) @@ -3,6 +3,7 @@ PORTNAME= gnome-keyring PORTVERSION= 3.18.3 +PORTREVISION= 1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -13,8 +14,7 @@ COMMENT= Program that keeps passwords an BUILD_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \ gcr>=3.5.3:${PORTSDIR}/security/gcr -LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ - libdbus-1.so:${PORTSDIR}/devel/dbus \ +LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libgcr-3.so:${PORTSDIR}/security/gcr \ libtasn1.so:${PORTSDIR}/security/libtasn1 \ libp11-kit.so:${PORTSDIR}/security/p11-kit \ Modified: head/www/epiphany/Makefile ============================================================================== --- head/www/epiphany/Makefile Mon Mar 21 05:53:01 2016 (r411540) +++ head/www/epiphany/Makefile Mon Mar 21 05:54:15 2016 (r411541) @@ -3,6 +3,7 @@ PORTNAME= epiphany PORTVERSION= 3.16.3 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -20,7 +21,7 @@ LIB_DEPENDS= libwebkit2gtk-4.0.so:${PORT libnss3.so:${PORTSDIR}/security/nss \ libavahi-gobject.so:${PORTSDIR}/net/avahi-app \ libnotify.so:${PORTSDIR}/devel/libnotify \ - libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring + libsecret-1.so:${PORTSDIR}/security/libsecret RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \ gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \ gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \ Modified: head/x11/gdm/Makefile ============================================================================== --- head/x11/gdm/Makefile Mon Mar 21 05:53:01 2016 (r411540) +++ head/x11/gdm/Makefile Mon Mar 21 05:54:15 2016 (r411541) @@ -3,6 +3,7 @@ PORTNAME= gdm PORTVERSION= 3.16.4 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -90,10 +91,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message GNOME_LOCALSTATEDIR= /var -OPTIONS_DEFINE= IPV6 KEYRING -OPTIONS_DEFAULT=KEYRING -KEYRING_DESC= Gnomekeyring/PAM integration -KEYRING_LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring +OPTIONS_DEFINE= IPV6 IPV6_CONFIGURE_ENABLE= ipv6 .include <bsd.port.options.mk> @@ -102,12 +100,6 @@ IPV6_CONFIGURE_ENABLE= ipv6 CONFIGURE_ARGS+= --enable-debug .endif -.if ${PORT_OPTIONS:MKEYRING} -SUB_LIST+= PAM_KEYRING= -.else -SUB_LIST+= PAM_KEYRING=\# -.endif - post-patch: @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \ ${WRKSRC}/data/Makefile.in Modified: head/x11/gdm/files/gdm-password.in ============================================================================== --- head/x11/gdm/files/gdm-password.in Mon Mar 21 05:53:01 2016 (r411540) +++ head/x11/gdm/files/gdm-password.in Mon Mar 21 05:54:15 2016 (r411541) @@ -3,8 +3,8 @@ # gdm-password settings for pam(3) auth include system -auth optional /usr/local/lib/pam_ck_connector.so -%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so +auth optional %%LOCALBASE%%/lib/pam_ck_connector.so +auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so account required pam_nologin.so account include system @@ -12,4 +12,4 @@ account include system password include system session include system -%%PAM_KEYRING%%session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start +session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start Modified: head/x11/gnome-shell/Makefile ============================================================================== --- head/x11/gnome-shell/Makefile Mon Mar 21 05:53:01 2016 (r411540) +++ head/x11/gnome-shell/Makefile Mon Mar 21 05:54:15 2016 (r411541) @@ -3,7 +3,7 @@ PORTNAME= gnome-shell PORTVERSION= 3.18.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -16,7 +16,7 @@ BUILD_DEPENDS= ca_root_nss>=0:${PORTSDIR LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ libcaribou.so:${PORTSDIR}/accessibility/caribou \ libmutter.so:${PORTSDIR}/x11-wm/mutter \ - libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ + libsecret-1.so:${PORTSDIR}/security/libsecret \ libgcr-3.so:${PORTSDIR}/security/gcr \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603210554.u2L5sF7P040567>