August 2010 - macports-changes - lists.macosforge.org

[70390] trunk/dports/print/freetype/Portfile
by ryandesign＠macports.org 08 Aug '10

08 Aug '10

Revision: 70390 http://trac.macports.org/changeset/70390 Author: ryandesign(a)macports.org Date: 2010-08-07 18:14:34 -0700 (Sat, 07 Aug 2010) Log Message: ----------- freetype: update to 2.4.2 Modified Paths: -------------- trunk/dports/print/freetype/Portfile Modified: trunk/dports/print/freetype/Portfile =================================================================== --- trunk/dports/print/freetype/Portfile 2010-08-08 00:27:39 UTC (rev 70389) +++ trunk/dports/print/freetype/Portfile 2010-08-08 01:14:34 UTC (rev 70390) @@ -5,7 +5,7 @@ PortGroup archcheck 1.0 name freetype -version 2.4.1 +version 2.4.2 categories print graphics maintainers ryandesign license freetype/GPLv2 @@ -37,13 +37,13 @@ checksums \ [suffix ${distname}] \ - md5 567a27e5189ed581396f69fb51faf2d8 \ - sha1 1870cc142be52a721031fcf16c4f8110dfb84fdb \ - rmd160 8e0dc7fb031c900984fac338bfc117cdb1c2055d \ + md5 647ee8ed266f9a4117c8d0a4855b3d3e \ + sha1 cc257ceda2950b8c80950d780ccf3ce665a815d1 \ + rmd160 5e3970f3a9e242255489111f77fe880d5d524860 \ [suffix ${docdistfile}] \ - md5 ac2de445ce6706dd61f1c6acf2ba1837 \ - sha1 5769d4eb70fb6548ddb7c20743ec2fd5b09d7d45 \ - rmd160 51646deb6a9d37639f4ffade541798d6a45057f6 + md5 4adeafb4959b29af661a43bc55dc60d9 \ + sha1 27f58d135fa4ec5fd42f3c95c0776bfafd078d5e \ + rmd160 40948173eeed83f7658528918fe63d92d798f610 patchfiles \ patch-detect.mk.diff \

1 0

[70389] trunk/dports/net/rsync/Portfile
by ryandesign＠macports.org 08 Aug '10

08 Aug '10

Revision: 70389 http://trac.macports.org/changeset/70389 Author: ryandesign(a)macports.org Date: 2010-08-07 17:27:39 -0700 (Sat, 07 Aug 2010) Log Message: ----------- rsync: suggest users copy, not rename, the sample conf file, so they still have the sample to refer to later if necessary Modified Paths: -------------- trunk/dports/net/rsync/Portfile Modified: trunk/dports/net/rsync/Portfile =================================================================== --- trunk/dports/net/rsync/Portfile 2010-08-07 23:59:37 UTC (rev 70388) +++ trunk/dports/net/rsync/Portfile 2010-08-08 00:27:39 UTC (rev 70389) @@ -60,7 +60,7 @@ post-install { ui_msg "****************************************************************" ui_msg "* *" - ui_msg "* To use the rsyncd server you must rename *" + ui_msg "* To use the rsyncd server you must copy *" ui_msg "* ${prefix}/etc/rsyncd.conf.example to rsyncd.conf and add *" ui_msg "* your modules there. See 'man rsyncd.conf' for more *" ui_msg "* information. *"

1 0

[70388] trunk/dports/archivers/bzip2/Portfile
by ryandesign＠macports.org 07 Aug '10

07 Aug '10

Revision: 70388 http://trac.macports.org/changeset/70388 Author: ryandesign(a)macports.org Date: 2010-08-07 16:59:37 -0700 (Sat, 07 Aug 2010) Log Message: ----------- bzip2: no longer a need to enclose setting build.args in a pre-build block Modified Paths: -------------- trunk/dports/archivers/bzip2/Portfile Modified: trunk/dports/archivers/bzip2/Portfile =================================================================== --- trunk/dports/archivers/bzip2/Portfile 2010-08-07 23:51:05 UTC (rev 70387) +++ trunk/dports/archivers/bzip2/Portfile 2010-08-07 23:59:37 UTC (rev 70388) @@ -31,15 +31,13 @@ use_parallel_build yes variant universal {} -pre-build { - if {[variant_isset universal]} { - set my_archflags ${configure.universal_cflags} - } else { - set my_archflags ${configure.cc_archflags} - } - build.args CC="${configure.cc} ${my_archflags}" \ - PREFIX=${prefix} +if {[variant_isset universal]} { + set my_archflags ${configure.universal_cflags} +} else { + set my_archflags ${configure.cc_archflags} } +build.args CC="${configure.cc} ${my_archflags}" \ + PREFIX=${prefix} destroot.destdir PREFIX=${destroot}${prefix}

1 0

[70387] trunk/dports/archivers/bzip2/Portfile
by ryandesign＠macports.org 07 Aug '10

07 Aug '10

Revision: 70387 http://trac.macports.org/changeset/70387 Author: ryandesign(a)macports.org Date: 2010-08-07 16:51:05 -0700 (Sat, 07 Aug 2010) Log Message: ----------- bzip2: whitespace changes / reformatting only Modified Paths: -------------- trunk/dports/archivers/bzip2/Portfile Modified: trunk/dports/archivers/bzip2/Portfile =================================================================== --- trunk/dports/archivers/bzip2/Portfile 2010-08-07 22:40:46 UTC (rev 70386) +++ trunk/dports/archivers/bzip2/Portfile 2010-08-07 23:51:05 UTC (rev 70387) @@ -9,44 +9,26 @@ categories archivers sysutils maintainers ryandesign openmaintainer license BSD -use_configure no -use_parallel_build yes -homepage http://www.bzip.org/ -master_sites ${homepage}${version} -description \ - compression library and tools +description compression library and tools -long_description \ - ${name} is a freely available, patent free, high-quality data \ - compressor. +long_description ${name} is a freely available, patent free, \ + high-quality data compressor. -checksums \ - md5 3c15a0c8d1d3ee1c46a1634d00617b1a \ - sha1 8b02713ea0c8eb501cc8bdac4432d7f29700f767 \ - rmd160 2b31a22138e3914d82a656fee28e2bf029cbc3d4 +homepage http://www.bzip.org/ +master_sites ${homepage}${version} -patchfiles \ - patch-Makefile-man.diff \ - patch-Makefile-links.diff \ - patch-Makefile-so.diff +checksums md5 3c15a0c8d1d3ee1c46a1634d00617b1a \ + sha1 8b02713ea0c8eb501cc8bdac4432d7f29700f767 \ + rmd160 2b31a22138e3914d82a656fee28e2bf029cbc3d4 -platform darwin { - patchfiles-replace s|patch-Makefile-so.diff|patch-Makefile-dylib.diff| +patchfiles patch-Makefile-man.diff \ + patch-Makefile-links.diff \ + patch-Makefile-so.diff - post-patch { - reinplace "s|__MacPorts_Version__|${version}|g" \ - ${worksrcpath}/Makefile - reinplace "s|__MacPorts_Compatibility_Version__|[join [lrange [split ${version} .] 0 1] .]|g" \ - ${worksrcpath}/Makefile - } +use_configure no - post-destroot { - ln -s libbz2.${version}.dylib ${destroot}${prefix}/lib/libbz2.[join [lrange [split ${version} .] 0 1] .].dylib - ln -s libbz2.${version}.dylib ${destroot}${prefix}/lib/libbz2.[join [lrange [split ${version} .] 0 0] .].dylib - ln -s libbz2.${version}.dylib ${destroot}${prefix}/lib/libbz2.dylib - } -} +use_parallel_build yes variant universal {} pre-build { @@ -60,3 +42,18 @@ } destroot.destdir PREFIX=${destroot}${prefix} + +platform darwin { + patchfiles-replace s|patch-Makefile-so.diff|patch-Makefile-dylib.diff| + + post-patch { + reinplace "s|__MacPorts_Version__|${version}|g" ${worksrcpath}/Makefile + reinplace "s|__MacPorts_Compatibility_Version__|[join [lrange [split ${version} .] 0 1] .]|g" ${worksrcpath}/Makefile + } + + post-destroot { + ln -s libbz2.${version}.dylib ${destroot}${prefix}/lib/libbz2.[join [lrange [split ${version} .] 0 1] .].dylib + ln -s libbz2.${version}.dylib ${destroot}${prefix}/lib/libbz2.[join [lrange [split ${version} .] 0 0] .].dylib + ln -s libbz2.${version}.dylib ${destroot}${prefix}/lib/libbz2.dylib + } +}

1 0

[70386] branches/gsoc10-configfiles/base/src/cregistry
by and.damore＠macports.org 07 Aug '10

07 Aug '10

Revision: 70386 http://trac.macports.org/changeset/70386 Author: and.damore(a)macports.org Date: 2010-08-07 15:40:46 -0700 (Sat, 07 Aug 2010) Log Message: ----------- uncommit entry.c changes, sql.c change Modified Paths: -------------- branches/gsoc10-configfiles/base/src/cregistry/entry.c branches/gsoc10-configfiles/base/src/cregistry/entry.h branches/gsoc10-configfiles/base/src/cregistry/sql.c Modified: branches/gsoc10-configfiles/base/src/cregistry/entry.c =================================================================== --- branches/gsoc10-configfiles/base/src/cregistry/entry.c 2010-08-07 21:47:53 UTC (rev 70385) +++ branches/gsoc10-configfiles/base/src/cregistry/entry.c 2010-08-07 22:40:46 UTC (rev 70386) @@ -860,60 +860,6 @@ } /** - * gsoc10-configfiles - * Maps files to the given port in the filemap. The list of files must not - * contain files that are already mapped to the given port. - * - * @param [in] entry the entry to map the files to - * @param [in] tupels a list of tupels to map in form {file checksum} - * @param [in] tupel_count the number of tupels - * @param [out] errPtr on error, a description of the error that occurred - * @return true if success; false if failure - */ -int reg_entry_map_with_md5(reg_entry* entry, char** tupels, int tupel_count, - reg_error* errPtr) { - reg_registry* reg = entry->reg; - int result = 1; - sqlite3_stmt* stmt = NULL; - char* insert = "INSERT INTO registry.files (id, path, mtime, active, md5sum) " - "VALUES (?, ?, 0, 0, ?)"; - if ((sqlite3_prepare(reg->db, insert, -1, &stmt, NULL) == SQLITE_OK) - && (sqlite3_bind_int64(stmt, 1, entry->id) == SQLITE_OK)) { - int i; - for (i=0; i<tupel_count && result; i++) { - if (sqlite3_bind_text(stmt, 2, tupels[i], -1, SQLITE_STATIC) - == SQLITE_OK) { - int r; - do { - r = sqlite3_step(stmt); - switch (r) { - case SQLITE_DONE: - sqlite3_reset(stmt); - break; - case SQLITE_BUSY: - break; - default: - reg_sqlite_error(reg->db, errPtr, insert); - result = 0; - break; - } - } while (r == SQLITE_BUSY); - } else { - reg_sqlite_error(reg->db, errPtr, insert); - result = 0; - } - } - } else { - reg_sqlite_error(reg->db, errPtr, insert); - result = 0; - } - if (stmt) { - sqlite3_finalize(stmt); - } - return result; -} - -/** * Unaps files from the given port in the filemap. The files must be owned by * the given entry. * Modified: branches/gsoc10-configfiles/base/src/cregistry/entry.h =================================================================== --- branches/gsoc10-configfiles/base/src/cregistry/entry.h 2010-08-07 21:47:53 UTC (rev 70385) +++ branches/gsoc10-configfiles/base/src/cregistry/entry.h 2010-08-07 22:40:46 UTC (rev 70386) @@ -75,8 +75,6 @@ int reg_entry_propset(reg_entry* entry, char* key, char* value, reg_error* errPtr); -int reg_entry_map_with_md5(reg_entry* entry, char** tupels, int tupel_count, - reg_error* errPtr); int reg_entry_map(reg_entry* entry, char** files, int file_count, reg_error* errPtr); int reg_entry_unmap(reg_entry* entry, char** files, int file_count, Modified: branches/gsoc10-configfiles/base/src/cregistry/sql.c =================================================================== --- branches/gsoc10-configfiles/base/src/cregistry/sql.c 2010-08-07 21:47:53 UTC (rev 70385) +++ branches/gsoc10-configfiles/base/src/cregistry/sql.c 2010-08-07 22:40:46 UTC (rev 70386) @@ -130,7 +130,7 @@ /* file map */ "CREATE TABLE registry.files (id INTEGER, path TEXT, actual_path TEXT, " - "active INT, mtime DATETIME, md5sum TEXT, editable INT, is_config INT, modified INT, " + "active INT, mtime DATETIME, md5sum TEXT, editable INT, " "FOREIGN KEY(id) REFERENCES ports(id))", "CREATE INDEX registry.file_port ON files (id)", "CREATE INDEX registry.file_path ON files(path)",

1 0

[70385] trunk/dports/math/qrupdate/Portfile
by takeshi＠macports.org 07 Aug '10

07 Aug '10

Revision: 70385 http://trac.macports.org/changeset/70385 Author: takeshi(a)macports.org Date: 2010-08-07 14:47:53 -0700 (Sat, 07 Aug 2010) Log Message: ----------- qrupdate: added accelerate variant Modified Paths: -------------- trunk/dports/math/qrupdate/Portfile Modified: trunk/dports/math/qrupdate/Portfile =================================================================== --- trunk/dports/math/qrupdate/Portfile 2010-08-07 21:38:14 UTC (rev 70384) +++ trunk/dports/math/qrupdate/Portfile 2010-08-07 21:47:53 UTC (rev 70385) @@ -6,7 +6,7 @@ name qrupdate version 1.1.1 -revision 1 +revision 2 categories math maintainers nomaintainer description library for fast updates of QR and Cholesky decompositions @@ -64,6 +64,13 @@ } } +variant accelerate description {build with Accelerate framework} { + depends_lib-delete port:atlas + build.args PREFIX=${prefix} BLAS="-framework Accelerate" LAPACK="-framework Accelerate" + destroot.args PREFIX=${prefix} BLAS="-framework Accelerate" LAPACK="-framework Accelerate" + test.args PREFIX=${prefix} BLAS="-framework Accelerate" LAPACK="-framework Accelerate" +} + variant g95 conflicts gcc43 gcc44 universal description {build with g95} { depends_build-append port:g95 post-patch { @@ -90,4 +97,8 @@ default_variants +gcc44 } +if {[variant_isset g95]} { + default_variants +accelerate +} + test.run yes

1 0

[70384] trunk/dports/archivers/bzip2/Portfile
by ryandesign＠macports.org 07 Aug '10

07 Aug '10

Revision: 70384 http://trac.macports.org/changeset/70384 Author: ryandesign(a)macports.org Date: 2010-08-07 14:38:14 -0700 (Sat, 07 Aug 2010) Log Message: ----------- bzip2: use patchfiles-replace instead of -delete and -append Modified Paths: -------------- trunk/dports/archivers/bzip2/Portfile Modified: trunk/dports/archivers/bzip2/Portfile =================================================================== --- trunk/dports/archivers/bzip2/Portfile 2010-08-07 21:34:07 UTC (rev 70383) +++ trunk/dports/archivers/bzip2/Portfile 2010-08-07 21:38:14 UTC (rev 70384) @@ -32,8 +32,7 @@ patch-Makefile-so.diff platform darwin { - patchfiles-delete patch-Makefile-so.diff - patchfiles-append patch-Makefile-dylib.diff + patchfiles-replace s|patch-Makefile-so.diff|patch-Makefile-dylib.diff| post-patch { reinplace "s|__MacPorts_Version__|${version}|g" \

1 0

[70383] trunk/dports/net/curl/Portfile
by ryandesign＠macports.org 07 Aug '10

07 Aug '10

Revision: 70383 http://trac.macports.org/changeset/70383 Author: ryandesign(a)macports.org Date: 2010-08-07 14:34:07 -0700 (Sat, 07 Aug 2010) Log Message: ----------- curl: use configure.args-replace instead of -delete and -append Modified Paths: -------------- trunk/dports/net/curl/Portfile Modified: trunk/dports/net/curl/Portfile =================================================================== --- trunk/dports/net/curl/Portfile 2010-08-07 21:29:40 UTC (rev 70382) +++ trunk/dports/net/curl/Portfile 2010-08-07 21:34:07 UTC (rev 70383) @@ -113,54 +113,46 @@ depends_lib-append port:openssl \ port:curl-ca-bundle archcheck.files-append lib/libssl.dylib - configure.args-delete --without-ssl - configure.args-append --with-ssl \ - --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt + configure.args-replace s|--without-ssl|--with-ssl| + configure.args-append --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt } variant ares description {Add support for resolving names asynchronously} { depends_lib-append port:c-ares archcheck.files-append lib/libcares.dylib - configure.args-delete --disable-ares - configure.args-append --enable-ares + configure.args-replace s|--disable-ares|--enable-ares| } variant spnego description {Enable SPNEGO authentication support} { # kind of broken? depends_lib-append port:fbopenssl archcheck.files-append lib/libfbopenssl.dylib - configure.args-delete --without-spnego - configure.args-append --with-spnego=${prefix} + configure.args-replace s|--without-spnego|--with-spnego=${prefix}| } variant gnutls conflicts ssl description {Allow secure connections using GNU TLS} { depends_lib-append port:gnutls archcheck.files-append lib/libgnutls.dylib - configure.args-delete --without-gnutls - configure.args-append --with-gnutls + configure.args-replace s|--without-gnutls|--with-gnutls| } variant gss description {Support the Generic Security Service API} { # This needs to use the system's Kerberos, not MacPorts' gss or kerberos5. conflicts-append gss kerberos5 - configure.args-delete --without-gssapi - configure.args-append --with-gssapi + configure.args-replace s|--without-gssapi|--with-gssapi| } variant openldap description {Support performing Lightweight Directory Access Protocol queries with OpenLDAP} { depends_lib-append port:openldap archcheck.files-append lib/libldap.dylib - configure.args-delete --disable-ldap \ - --disable-ldaps - configure.args-append --enable-ldap \ - --enable-ldaps + configure.args-replace s|--disable-ldap|--enable-ldap| + configure.args-replace s|--disable-ldaps|--enable-ldaps| } variant sftp_scp description {Add SFTP/SCP support via libssh2} { depends_lib-append port:libssh2 archcheck.files-append lib/libssh2.dylib - configure.args-delete --without-libssh2 - configure.args-append --with-libssh2 + configure.args-replace s|--without-libssh2|--with-libssh2| } livecheck.type freshmeat

1 0

[70382] trunk/dports/lang
by ryandesign＠macports.org 07 Aug '10

07 Aug '10

Revision: 70382 http://trac.macports.org/changeset/70382 Author: ryandesign(a)macports.org Date: 2010-08-07 14:29:40 -0700 (Sat, 07 Aug 2010) Log Message: ----------- pure, pure-devel: use depends_run-replace instead of -delete and -append Modified Paths: -------------- trunk/dports/lang/pure/Portfile trunk/dports/lang/pure-devel/Portfile Modified: trunk/dports/lang/pure/Portfile =================================================================== --- trunk/dports/lang/pure/Portfile 2010-08-07 21:28:08 UTC (rev 70381) +++ trunk/dports/lang/pure/Portfile 2010-08-07 21:29:40 UTC (rev 70382) @@ -45,8 +45,7 @@ path:bin/w3m:w3m platform macosx { - depends_run-delete path:bin/w3m:w3m - depends_run-append path:bin/openbrowser:openbrowser + depends_run-replace s|path:bin/w3m:w3m|path:bin/openbrowser:openbrowser| patchfiles-append patch-openbrowser.diff } Modified: trunk/dports/lang/pure-devel/Portfile =================================================================== --- trunk/dports/lang/pure-devel/Portfile 2010-08-07 21:28:08 UTC (rev 70381) +++ trunk/dports/lang/pure-devel/Portfile 2010-08-07 21:29:40 UTC (rev 70382) @@ -49,8 +49,7 @@ path:bin/w3m:w3m platform macosx { - depends_run-delete path:bin/w3m:w3m - depends_run-append path:bin/openbrowser:openbrowser + depends_run-replace s|path:bin/w3m:w3m|path:bin/openbrowser:openbrowser| patchfiles-append patch-openbrowser.diff }

1 0

[70381] trunk/dports/net/wget/Portfile
by ryandesign＠macports.org 07 Aug '10

07 Aug '10

Revision: 70381 http://trac.macports.org/changeset/70381 Author: ryandesign(a)macports.org Date: 2010-08-07 14:28:08 -0700 (Sat, 07 Aug 2010) Log Message: ----------- wget: variant conflicts Modified Paths: -------------- trunk/dports/net/wget/Portfile Modified: trunk/dports/net/wget/Portfile =================================================================== --- trunk/dports/net/wget/Portfile 2010-08-07 21:25:04 UTC (rev 70380) +++ trunk/dports/net/wget/Portfile 2010-08-07 21:28:08 UTC (rev 70381) @@ -55,13 +55,13 @@ test.target check } -variant ssl description {Build with SSL support} { +variant ssl conflicts no_ssl description {Build with SSL support} { depends_lib-append port:openssl configure.args-replace s|--without-ssl|--with-libssl-prefix=${prefix}| } # Remove this variant later. -variant no_ssl description {Build without SSL support} {} +variant no_ssl conflicts ssl description {Build without SSL support} {} if {[variant_isset no_ssl]} { default_variants -ssl } else {

1 0