diff options
| author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2016-03-21 05:54:15 +0000 |
|---|---|---|
| committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2016-03-21 05:54:15 +0000 |
| commit | 80a66678b38447fcf858d92af4dbe4a10e084e2b (patch) | |
| tree | e71478e82b8b71e2d4728e55d50826db54e764f1 /x11 | |
| parent | Upgrade to upstream svn revision r1735889. This contains the (diff) | |
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
Notes
Notes:
svn path=/head/; revision=411541
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm/Makefile | 12 | ||||
| -rw-r--r-- | x11/gdm/files/gdm-password.in | 6 | ||||
| -rw-r--r-- | x11/gnome-shell/Makefile | 4 |
3 files changed, 7 insertions, 15 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index a64429e9438e..f4f8d10db6d6 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -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 diff --git a/x11/gdm/files/gdm-password.in b/x11/gdm/files/gdm-password.in index bf5b63b353b2..f0ac0cfe9eb3 100644 --- a/x11/gdm/files/gdm-password.in +++ b/x11/gdm/files/gdm-password.in @@ -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 diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index c6485f441d32..bf90492ab516 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -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}/security/ca_root_nss \ 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 \ |