Revision: 139142 https://trac.macports.org/changeset/139142 Author: devans@macports.org Date: 2015-08-03 15:26:57 -0700 (Mon, 03 Aug 2015) Log Message: ----------- gnome-keyring: clean up PAM configuration, update comments. Modified Paths: -------------- trunk/dports/gnome/gnome-keyring/Portfile Property Changed: ---------------- trunk/dports/gnome/gnome-keyring/ Property changes on: trunk/dports/gnome/gnome-keyring ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/gnome/gnome-keyring:108269-139107 /users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118156,125236-125738,133845-134673 /users/rmstonecipher/gnome/gnome-keyring:102363-103172 + /branches/mld-qt-481/dports/gnome/gnome-keyring:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/gnome/gnome-keyring:108269-139141 /users/devans/GNOME-3/unstable/dports/gnome/gnome-keyring:117930-118156,125236-125738,133845-134673 /users/rmstonecipher/gnome/gnome-keyring:102363-103172 Modified: trunk/dports/gnome/gnome-keyring/Portfile =================================================================== --- trunk/dports/gnome/gnome-keyring/Portfile 2015-08-03 22:24:27 UTC (rev 139141) +++ trunk/dports/gnome/gnome-keyring/Portfile 2015-08-03 22:26:57 UTC (rev 139142) @@ -56,21 +56,23 @@ configure.cmd ./autogen.sh configure.args --without-libcap-ng \ + --disable-pam \ --disable-p11-tests \ --disable-silent-rules \ --disable-strict \ --disable-schemas-compile platform darwin { -# darwin 15 (El Capitan) fails during activation if pam support is enabled -# won't allow activation of module in system pam directory (/usr/lib/pam) - if {${os.major} < 10 || ${os.major} > 14} { - configure.args-append --disable-pam - } else { +# On darwin 15 (El Capitan), System Integrity Protection (SIP) +# blocks, by default, any attempt by non-AppStore applications +# to install content in system locations. This causes +# activation of PAM modules in /usr/lib/pam by MacPorts to fail. +# Disabling optional PAM support on this platform. + if {${os.major} > 9 && ${os.major} < 15} { + configure.args-delete --disable-pam configure.args-append --with-pam-dir=/usr/lib/pam - + # installs PAM modules into /usr/lib/pam destroot.violate_mtree yes - post-destroot { file delete ${destroot}/usr/lib/pam/pam_gnome_keyring.la }