[139140] users/devans/GNOME-3/stable/dports/devel
devans at macports.org
devans at macports.org
Mon Aug 3 15:02:39 PDT 2015
Revision: 139140
https://trac.macports.org/changeset/139140
Author: devans at macports.org
Date: 2015-08-03 15:02:39 -0700 (Mon, 03 Aug 2015)
Log Message:
-----------
GNOME-3/stable: libpwquality, update to version 1.3.0
* remove +python26 variant, add +python34 as new default.
* fix python configuration to install python bindings in the correct site-packages directory.
* disable PAM support on El Capitan due to enhanced (SIP) security issues, see comments for details.
* remove outdated configuration items, general cleanup.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/devel/libpwquality/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/devel/libpwquality/
users/devans/GNOME-3/stable/dports/devel/libpwquality/files/patch-python-Makefile.in.diff
Property changes on: users/devans/GNOME-3/stable/dports/devel/libpwquality
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/devel/libpwquality:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/cal/ports/devel/libpwquality:96570-97031
Modified: users/devans/GNOME-3/stable/dports/devel/libpwquality/Portfile
===================================================================
--- trunk/dports/devel/libpwquality/Portfile 2015-08-03 07:52:39 UTC (rev 139118)
+++ users/devans/GNOME-3/stable/dports/devel/libpwquality/Portfile 2015-08-03 22:02:39 UTC (rev 139140)
@@ -4,7 +4,7 @@
PortSystem 1.0
name libpwquality
-version 1.2.4
+version 1.3.0
license LGPL-2.1+
categories devel
maintainers nomaintainer
@@ -21,8 +21,8 @@
use_bzip2 yes
-checksums rmd160 be197dccb5b1ea4592a7498c9198d65f65999581 \
- sha256 9ad67be364a66dc8b334a473c77d9f531137ee0e9d85d81f567f410a375857c7
+checksums rmd160 5ca6e8eea9c3ee277ecb9aa9b2875748fe3ff000 \
+ sha256 74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a
depends_build port:pkgconfig
@@ -30,55 +30,48 @@
port:libiconv \
port:cracklib
-patchfiles patch-src-pam_pwquality.c.diff
+patchfiles patch-python-Makefile.in.diff \
+ patch-src-pam_pwquality.c.diff
-configure.ldflags-append \
- -lintl
+configure.args --disable-pam
-configure.args --with-securedir=/usr/lib/pam \
- --with-sconfigdir=/etc/security
-
-# installs PAM modules in /usr/lib/pam
-
-destroot.violate_mtree yes
-
-variant python26 conflicts python27 description {Use python 2.6} {
- set python_ver 2.6
- depends_lib-append port:python26
- configure.python ${prefix}/bin/python${python_ver}
+variant python27 conflicts python34 description {Build python 2.7 bindings} {
+ set python_ver 2.7
+ depends_lib-append port:python27
set python_prefix ${frameworks_dir}/Python.framework/Versions/${python_ver}
set python_site_path ${python_prefix}/lib/python${python_ver}/site-packages
- configure.args-append --with-python-rev=${python_ver} \
+ configure.args-append --with-python-binary=${prefix}/bin/python${python_ver} \
--with-pythonsitedir=${python_site_path}
}
-variant python27 conflicts python26 description {Use python 2.7} {
- set python_ver 2.7
- depends_lib-append port:python27
- configure.python ${prefix}/bin/python${python_ver}
+variant python34 conflicts python27 description {Build python 3.4 bindings} {
+ set python_ver 3.4
+ depends_lib-append port:python34
set python_prefix ${frameworks_dir}/Python.framework/Versions/${python_ver}
set python_site_path ${python_prefix}/lib/python${python_ver}/site-packages
- configure.args-append --with-python-rev=${python_ver} \
+ configure.args-append --with-python-binary=${prefix}/bin/python${python_ver} \
--with-pythonsitedir=${python_site_path}
}
-if {![variant_isset python26]} {
- default_variants +python27
+if {![variant_isset python27]} {
+ default_variants +python34
}
-post-patch {
- reinplace "s|python setup.py|${configure.python} setup.py|g" \
- ${worksrcpath}/python/Makefile.am \
- ${worksrcpath}/python/Makefile.in
-}
-
platform darwin {
- if {${os.major} < 10} {
- configure.args-append --disable-pam
+# 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-securedir=/usr/lib/pam \
+ --with-sconfigdir=/etc/security
+ # installs PAM modules into /usr/lib/pam
+ destroot.violate_mtree yes
}
}
livecheck.type regex
livecheck.url ${master_sites}
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
-
Added: users/devans/GNOME-3/stable/dports/devel/libpwquality/files/patch-python-Makefile.in.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/libpwquality/files/patch-python-Makefile.in.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/devel/libpwquality/files/patch-python-Makefile.in.diff 2015-08-03 22:02:39 UTC (rev 139140)
@@ -0,0 +1,11 @@
+--- python/Makefile.in.orig 2015-08-03 03:05:32.000000000 -0700
++++ python/Makefile.in 2015-08-03 03:09:08.000000000 -0700
+@@ -465,7 +465,7 @@
+ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=.
+
+ install-exec-local:
+- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix}
++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --install-lib=${DESTDIR}${pythonsitedir}
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150803/01824645/attachment.html>
More information about the macports-changes
mailing list