February 2015 - macports-changes - lists.macosforge.org

[132609] trunk/dports/devel/openssl/Portfile
by larryv＠macports.org 05 Feb '15

05 Feb '15

Revision: 132609 https://trac.macports.org/changeset/132609 Author: larryv(a)macports.org Date: 2015-02-05 13:50:33 -0800 (Thu, 05 Feb 2015) Log Message: ----------- openssl: Force configure to use the system Perl 5 The installation contains a few small scripts that require Perl 5. The system Perl should be more than sufficient for these, but the configure script bakes in the path of MacPorts' perl5 if that port is installed. Modified Paths: -------------- trunk/dports/devel/openssl/Portfile Modified: trunk/dports/devel/openssl/Portfile =================================================================== --- trunk/dports/devel/openssl/Portfile 2015-02-05 21:16:51 UTC (rev 132608) +++ trunk/dports/devel/openssl/Portfile 2015-02-05 21:50:33 UTC (rev 132609) @@ -55,6 +55,7 @@ } configure.ccache no +configure.perl /usr/bin/perl configure.cmd ./Configure configure.args -L${prefix}/lib \ no-krb5 \

1 0

[132608] trunk/dports/games/openttd
by cal＠macports.org 05 Feb '15

05 Feb '15

Revision: 132608 https://trac.macports.org/changeset/132608 Author: cal(a)macports.org Date: 2015-02-05 13:16:51 -0800 (Thu, 05 Feb 2015) Log Message: ----------- openttd: backport fix instead of using our fix No revbump, because besides fixing a couple of warnings, the patch is equivalent to what we had locally. Modified Paths: -------------- trunk/dports/games/openttd/Portfile Added Paths: ----------- trunk/dports/games/openttd/files/openttd-fontcache.patch Removed Paths: ------------- trunk/dports/games/openttd/files/patch-src__fontcache.cpp-signed-vs-unsigned-max.diff Modified: trunk/dports/games/openttd/Portfile =================================================================== --- trunk/dports/games/openttd/Portfile 2015-02-05 20:58:38 UTC (rev 132607) +++ trunk/dports/games/openttd/Portfile 2015-02-05 21:16:51 UTC (rev 132608) @@ -46,8 +46,7 @@ port:openttd-openmsx patchfiles patch-config.lib-remove-deployment-target.diff \ - patch-src__fontcache.cpp-signed-vs-unsigned-max.diff - # see https://bugs.openttd.org/task/6223 + openttd-fontcache.patch configure.env-append \ CFLAGS_BUILD="${configure.cflags}" \ Added: trunk/dports/games/openttd/files/openttd-fontcache.patch =================================================================== --- trunk/dports/games/openttd/files/openttd-fontcache.patch (rev 0) +++ trunk/dports/games/openttd/files/openttd-fontcache.patch 2015-02-05 21:16:51 UTC (rev 132608) @@ -0,0 +1,42 @@ +Fix: Compilation with freetype2 version 2.5.4 and newer (AMDmi3) + +See upstream tickets #6223 and #6185. + +Upstream-Status: Backport [committed in r27079] +Index: src/fontcache.cpp +=================================================================== +--- src/fontcache.cpp (revision 27078) ++++ src/fontcache.cpp (working copy) +@@ -536,8 +536,8 @@ + aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY); + + /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ +- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); +- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); ++ unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); ++ unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); + + /* Limit glyph size to prevent overflows later on. */ + if (width > 256 || height > 256) usererror("Font glyph is too large"); +@@ -553,8 +553,8 @@ + + /* Draw shadow for medium size */ + if (this->fs == FS_NORMAL && !aa) { +- for (int y = 0; y < slot->bitmap.rows; y++) { +- for (int x = 0; x < slot->bitmap.width; x++) { ++ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { ++ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { + if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { + sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; + sprite.data[1 + x + (1 + y) * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF; +@@ -563,8 +563,8 @@ + } + } + +- for (int y = 0; y < slot->bitmap.rows; y++) { +- for (int x = 0; x < slot->bitmap.width; x++) { ++ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { ++ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { + if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { + sprite.data[x + y * sprite.width].m = FACE_COLOUR; + sprite.data[x + y * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF; Deleted: trunk/dports/games/openttd/files/patch-src__fontcache.cpp-signed-vs-unsigned-max.diff =================================================================== --- trunk/dports/games/openttd/files/patch-src__fontcache.cpp-signed-vs-unsigned-max.diff 2015-02-05 20:58:38 UTC (rev 132607) +++ trunk/dports/games/openttd/files/patch-src__fontcache.cpp-signed-vs-unsigned-max.diff 2015-02-05 21:16:51 UTC (rev 132608) @@ -1,13 +0,0 @@ ---- src/fontcache.cpp.orig 2015-01-31 17:48:10.000000000 +0100 -+++ src/fontcache.cpp 2015-01-31 17:49:31.000000000 +0100 -@@ -527,8 +527,8 @@ - aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY); - - /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ -- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); -- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); -+ int width = max(1u, slot->bitmap.width + (this->fs == FS_NORMAL)); -+ int height = max(1u, slot->bitmap.rows + (this->fs == FS_NORMAL)); - - /* Limit glyph size to prevent overflows later on. */ - if (width > 256 || height > 256) usererror("Font glyph is too large");

1 0

[132607] trunk/dports/devel/openssl/Portfile
by larryv＠macports.org 05 Feb '15

05 Feb '15

Revision: 132607 https://trac.macports.org/changeset/132607 Author: larryv(a)macports.org Date: 2015-02-05 12:58:38 -0800 (Thu, 05 Feb 2015) Log Message: ----------- openssl: Add cal as additional maintainer Modified Paths: -------------- trunk/dports/devel/openssl/Portfile Modified: trunk/dports/devel/openssl/Portfile =================================================================== --- trunk/dports/devel/openssl/Portfile 2015-02-05 20:51:25 UTC (rev 132606) +++ trunk/dports/devel/openssl/Portfile 2015-02-05 20:58:38 UTC (rev 132607) @@ -20,7 +20,7 @@ categories devel security platforms darwin license OpenSSL SSLeay -maintainers larryv openmaintainer +maintainers larryv cal openmaintainer description OpenSSL SSL/TLS cryptography library long_description The OpenSSL Project is a collaborative effort to \

1 0

[132606] trunk/dports/devel/openssl/Portfile
by larryv＠macports.org 05 Feb '15

05 Feb '15

Revision: 132606 https://trac.macports.org/changeset/132606 Author: larryv(a)macports.org Date: 2015-02-05 12:51:25 -0800 (Thu, 05 Feb 2015) Log Message: ----------- openssl: Add modeline, rearrange, reformat Might as well make myself at home. Modified Paths: -------------- trunk/dports/devel/openssl/Portfile Modified: trunk/dports/devel/openssl/Portfile =================================================================== --- trunk/dports/devel/openssl/Portfile 2015-02-05 20:51:21 UTC (rev 132605) +++ trunk/dports/devel/openssl/Portfile 2015-02-05 20:51:25 UTC (rev 132606) @@ -1,11 +1,12 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ -PortSystem 1.0 -PortGroup muniversal 1.0 +PortSystem 1.0 +PortGroup muniversal 1.0 name openssl +epoch 1 version 1.0.1k -epoch 1 # At least the following ports statically link OpenSSL and need to be revbumped # for every update of OpenSSL: @@ -16,19 +17,22 @@ # - tor # These lists aren't exhaustive. Feel free to add more entries as you find them. +categories devel security platforms darwin -categories devel security +license OpenSSL SSLeay maintainers larryv openmaintainer + +description OpenSSL SSL/TLS cryptography library +long_description The OpenSSL Project is a collaborative effort to \ + develop a robust, commercial-grade, full-featured, \ + and Open Source toolkit implementing the Secure \ + Sockets Layer (SSL v2/v3) and Transport Layer \ + Security (TLS v1) protocols as well as \ + a full-strength general purpose cryptography \ + library. homepage http://www.openssl.org/ -license OpenSSL SSLeay -description OpenSSL SSL/TLS cryptography library -long_description \ - The OpenSSL Project is a collaborative effort to develop a robust, \ - commercial-grade, full-featured, and Open Source toolkit implementing \ - the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security \ - (TLS v1) protocols as well as a full-strength general purpose \ - cryptography library. +depends_lib port:zlib master_sites http://www.openssl.org/source/ checksums md5 d4f002bd22a56881340105028842ae1f \ @@ -36,27 +40,33 @@ rmd160 e22c085189c6ce640378f0cc67faa512b4b873f2 \ sha256 8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c -depends_lib port:zlib - -patchfiles patch-Makefile.org.diff patch-crypto-Makefile.diff \ +patchfiles patch-bn_internal.pod.diff \ + patch-Configure.diff \ + patch-crypto-Makefile.diff \ patch-Makefile.org-parallel.diff \ - patch-bn_internal.pod.diff patch-Configure.diff - + patch-Makefile.org.diff post-patch { # Ensure that the correct compiler is used reinplace "s|cc:|${configure.cc}:|" ${worksrcpath}/Configure # use SDK if necessary - if {${configure.sdkroot} != ""} { + if {${configure.sdkroot} ne ""} { reinplace "s|\$-arch \[_a-zA-Z0-9\]*\$|\\1 -isysroot ${configure.sdkroot}|" ${worksrcpath}/Configure } } +configure.ccache no configure.cmd ./Configure -configure.args -L${prefix}/lib --openssldir=${prefix}/etc/openssl zlib no-krb5 shared -configure.ccache no +configure.args -L${prefix}/lib \ + no-krb5 \ + --openssldir=${prefix}/etc/openssl \ + shared \ + zlib +platform darwin 8 i386 { + configure.args-append no-asm +} +destroot.args MANDIR=${prefix}/share/man MANSUFFIX=ssl destroot.destdir INSTALL_PREFIX=${destroot} -destroot.args MANDIR=${prefix}/share/man MANSUFFIX=ssl test.run yes test.dir ${worksrcpath}/test @@ -66,41 +76,37 @@ livecheck.url ${master_sites} livecheck.regex ${name}-(\[0-9.\]+\[a-z\]?)\\.tar\\.gz -variant rfc3779 description {enable RFC 3779: X.509 Extensions for IP Addresses and AS Identifiers} { - configure.args-append enable-rfc3779 -} - # code for universal build array set merger_configure_args { - ppc darwin-ppc-cc - i386 darwin-i386-cc - ppc64 darwin64-ppc-cc - x86_64 darwin64-x86_64-cc + ppc darwin-ppc-cc + i386 darwin-i386-cc + ppc64 darwin64-ppc-cc + x86_64 darwin64-x86_64-cc } -if { [variant_isset universal] } { +if {[variant_isset universal]} { set merger_arch_compiler "no" configure.universal_args-delete --disable-dependency-tracking pre-destroot { global merger_dont_diff - if { [llength ${universal_archs_to_use}] > 2 } { + if {[llength ${universal_archs_to_use}] > 2} { lappend merger_dont_diff ${prefix}/include/openssl/opensslconf.h } } # Do not set --host. array set merger_host { - ppc "" - i386 "" - ppc64 "" - x86_64 "" + ppc {} + i386 {} + ppc64 {} + x86_64 {} } } elseif {[info exists merger_configure_args($build_arch)]} { configure.args-append $merger_configure_args($build_arch) } -platform darwin 8 i386 { - configure.args-append no-asm +variant rfc3779 description {enable RFC 3779: X.509 Extensions for IP Addresses and AS Identifiers} { + configure.args-append enable-rfc3779 }

1 0

[132605] trunk/dports/devel/openssl/Portfile
by larryv＠macports.org 05 Feb '15

05 Feb '15

Revision: 132605 https://trac.macports.org/changeset/132605 Author: larryv(a)macports.org Date: 2015-02-05 12:51:21 -0800 (Thu, 05 Feb 2015) Log Message: ----------- openssl: Take over maintainership Modified Paths: -------------- trunk/dports/devel/openssl/Portfile Modified: trunk/dports/devel/openssl/Portfile =================================================================== --- trunk/dports/devel/openssl/Portfile 2015-02-05 20:19:48 UTC (rev 132604) +++ trunk/dports/devel/openssl/Portfile 2015-02-05 20:51:21 UTC (rev 132605) @@ -18,7 +18,7 @@ platforms darwin categories devel security -maintainers nomaintainer +maintainers larryv openmaintainer homepage http://www.openssl.org/ license OpenSSL SSLeay description OpenSSL SSL/TLS cryptography library

1 0

[132604] trunk/dports/devel/libtool/Portfile
by larryv＠macports.org 05 Feb '15

05 Feb '15

Revision: 132604 https://trac.macports.org/changeset/132604 Author: larryv(a)macports.org Date: 2015-02-05 12:19:48 -0800 (Thu, 05 Feb 2015) Log Message: ----------- libtool: Remove note about libltdl I think I misunderstood the mailing list posts that I read. Carry on. Modified Paths: -------------- trunk/dports/devel/libtool/Portfile Modified: trunk/dports/devel/libtool/Portfile =================================================================== --- trunk/dports/devel/libtool/Portfile 2015-02-05 20:01:02 UTC (rev 132603) +++ trunk/dports/devel/libtool/Portfile 2015-02-05 20:19:48 UTC (rev 132604) @@ -7,9 +7,6 @@ version 2.4.5 categories devel sysutils platforms darwin freebsd -# The libltdl library will probably be removed in the next release -# (http://lists.gnu.org/archive/html/libtool/2015-01/msg00004.html) -#supported_archs noarch # Scripts are GPL-2+, libltdl is LGPL-2+, but all parts that tend to be # distributed with dependents have a licensing exception that allows # distribution under the same terms as the rest of the program.

1 0

[132603] trunk/dports/perl/p5-xml-libxml/Portfile
by devans＠macports.org 05 Feb '15

05 Feb '15

Revision: 132603 https://trac.macports.org/changeset/132603 Author: devans(a)macports.org Date: 2015-02-05 12:01:02 -0800 (Thu, 05 Feb 2015) Log Message: ----------- p5-xml-libxml: update to version 2.0118. Modified Paths: -------------- trunk/dports/perl/p5-xml-libxml/Portfile Modified: trunk/dports/perl/p5-xml-libxml/Portfile =================================================================== --- trunk/dports/perl/p5-xml-libxml/Portfile 2015-02-05 20:00:31 UTC (rev 132602) +++ trunk/dports/perl/p5-xml-libxml/Portfile 2015-02-05 20:01:02 UTC (rev 132603) @@ -5,7 +5,7 @@ PortGroup perl5 1.0 perl5.branches 5.16 5.18 5.20 -perl5.setup XML-LibXML 2.0117 +perl5.setup XML-LibXML 2.0118 categories-append textproc platforms darwin maintainers nomaintainer @@ -17,8 +17,8 @@ parsers with DOM, SAX and XMLReader interfaces, a large subset \ of DOM Layer 3 interface and a XML::XPath-like interface to XPath API of libxml2. -checksums rmd160 8b130a8633904643d101b3e207d4a48391a62171 \ - sha256 5767c90f34ffd3762d7800a64c7190a2635c941a41a73e1156fa791b0652bac0 +checksums rmd160 4383bf2cf4c53318f8974c112602ff8b97736e27 \ + sha256 cc64ae26ef5ebc0f64ba292c582f1cd70701c6513133a063e2d25c3257430c9c if {${perl5.major} != ""} { depends_lib-append \

1 0

[132602] trunk/dports/perl/p5-file-chdir/Portfile
by devans＠macports.org 05 Feb '15

05 Feb '15

Revision: 132602 https://trac.macports.org/changeset/132602 Author: devans(a)macports.org Date: 2015-02-05 12:00:31 -0800 (Thu, 05 Feb 2015) Log Message: ----------- p5-file-chdir: update to version 0.1010. Modified Paths: -------------- trunk/dports/perl/p5-file-chdir/Portfile Modified: trunk/dports/perl/p5-file-chdir/Portfile =================================================================== --- trunk/dports/perl/p5-file-chdir/Portfile 2015-02-05 20:00:05 UTC (rev 132601) +++ trunk/dports/perl/p5-file-chdir/Portfile 2015-02-05 20:00:31 UTC (rev 132602) @@ -5,15 +5,15 @@ PortGroup perl5 1.0 perl5.branches 5.16 5.18 5.20 -perl5.setup File-chdir 0.1009 +perl5.setup File-chdir 0.1010 maintainers nomaintainer description a more sensible way to change directories license {Artistic-1 GPL} long_description ${description} -checksums rmd160 a4997db8add40b9aadad1d9cd89f320dfd2b3791 \ - sha256 efad7e9a2f3db1a0d6c2929cb12029ebbb6516cd5ae12099c4635285d60fc869 +checksums rmd160 0fa63f1b08144afb757ed5cd829022f3be07ee3e \ + sha256 efc121f40bd7a0f62f8ec9b8bc70f7f5409d81cd705e37008596c8efc4452b01 platforms darwin

1 0

[132601] trunk/dports/perl/p5-encode/Portfile
by devans＠macports.org 05 Feb '15

05 Feb '15

Revision: 132601 https://trac.macports.org/changeset/132601 Author: devans(a)macports.org Date: 2015-02-05 12:00:05 -0800 (Thu, 05 Feb 2015) Log Message: ----------- p5-encode: update to version 2.70. Modified Paths: -------------- trunk/dports/perl/p5-encode/Portfile Modified: trunk/dports/perl/p5-encode/Portfile =================================================================== --- trunk/dports/perl/p5-encode/Portfile 2015-02-05 19:59:35 UTC (rev 132600) +++ trunk/dports/perl/p5-encode/Portfile 2015-02-05 20:00:05 UTC (rev 132601) @@ -5,7 +5,7 @@ PortGroup perl5 1.0 perl5.branches 5.16 5.18 5.20 -perl5.setup Encode 2.68 +perl5.setup Encode 2.70 platforms darwin license {Artistic-1 GPL} maintainers nomaintainer @@ -14,7 +14,7 @@ Perl's strings and the rest of the system. Perl strings \ are sequences of characters. -checksums rmd160 372815253ece2f5c381f15f5cceaf7b6d1879b0f \ - sha256 ee0896eac0df620d991b4d7c987d0b35332e535b79c4b15c7f91ec6e9b69b05e +checksums rmd160 308393616d065bbc2b801f88ba19c0fe8ab1bbe9 \ + sha256 aef0098c4ff62a972cca38524fbb6ca60e3d3c28b2ccba8fc820881ebd336a31 perl5.link_binaries no

1 0

[132600] trunk/dports/perl/p5-crypt-openssl-random/Portfile
by devans＠macports.org 05 Feb '15

05 Feb '15

Revision: 132600 https://trac.macports.org/changeset/132600 Author: devans(a)macports.org Date: 2015-02-05 11:59:35 -0800 (Thu, 05 Feb 2015) Log Message: ----------- p5-crypt-openssl-random: update to version 0.10. Modified Paths: -------------- trunk/dports/perl/p5-crypt-openssl-random/Portfile Modified: trunk/dports/perl/p5-crypt-openssl-random/Portfile =================================================================== --- trunk/dports/perl/p5-crypt-openssl-random/Portfile 2015-02-05 19:58:38 UTC (rev 132599) +++ trunk/dports/perl/p5-crypt-openssl-random/Portfile 2015-02-05 19:59:35 UTC (rev 132600) @@ -5,7 +5,7 @@ PortGroup perl5 1.0 perl5.branches 5.16 5.18 5.20 -perl5.setup Crypt-OpenSSL-Random 0.09 +perl5.setup Crypt-OpenSSL-Random 0.10 license {Artistic-1 GPL} maintainers nomaintainer description RSA encoding and decoding, using the openSSL libraries @@ -14,8 +14,8 @@ platforms darwin -checksums rmd160 2a00bb7858a248d95ad6a1962cd336b6575fc941 \ - sha256 213ff7e000ad4c83d8aef26432b084ac1e7433d179ab76d5e33ffbfe88c25bab +checksums rmd160 c9284d3d10ccb63eb0804db6cff902af23acd938 \ + sha256 ae65d0ab6907edd1d67f87fdf0923ecae4d54c4c2e0ac9d9df97227903ccf18a if {${perl5.major} != ""} { depends_lib-append \

1 0