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

[102571] trunk/dports/python/py-hggit/Portfile
by sean＠macports.org 04 Feb '13

04 Feb '13

Revision: 102571 https://trac.macports.org/changeset/102571 Author: sean(a)macports.org Date: 2013-02-04 14:32:21 -0800 (Mon, 04 Feb 2013) Log Message: ----------- py-hggit: remove 'python' category since it's added automatically Modified Paths: -------------- trunk/dports/python/py-hggit/Portfile Modified: trunk/dports/python/py-hggit/Portfile =================================================================== --- trunk/dports/python/py-hggit/Portfile 2013-02-04 22:32:20 UTC (rev 102570) +++ trunk/dports/python/py-hggit/Portfile 2013-02-04 22:32:21 UTC (rev 102571) @@ -9,7 +9,7 @@ set realname hggit name py-hggit -categories python devel +categories-append devel platforms darwin maintainers easieste sean openmaintainer license GPL-2

1 0

[102570] trunk/base/src/port1.0/portlint.tcl
by ryandesign＠macports.org 04 Feb '13

04 Feb '13

Revision: 102570 https://trac.macports.org/changeset/102570 Author: ryandesign(a)macports.org Date: 2013-02-04 14:32:20 -0800 (Mon, 04 Feb 2013) Log Message: ----------- portlint.tcl: when "port lint" prints the error "Line X has unrecognized PortGroup", prevent subsequent error message "can't read 'portgroup': no such variable"; see https://lists.macosforge.org/pipermail/macports-dev/2012-December/021207.ht… Modified Paths: -------------- trunk/base/src/port1.0/portlint.tcl Modified: trunk/base/src/port1.0/portlint.tcl =================================================================== --- trunk/base/src/port1.0/portlint.tcl 2013-02-04 22:32:17 UTC (rev 102569) +++ trunk/base/src/port1.0/portlint.tcl 2013-02-04 22:32:20 UTC (rev 102570) @@ -208,12 +208,13 @@ if {![info exists portgroup]} { ui_error "Line $lineno has unrecognized PortGroup" incr errors - } - if {[info exists portgroups($portgroup)]} { - ui_error "Line $lineno repeats inclusion of PortGroup $portgroup" - incr errors } else { - set portgroups($portgroup) $portgroupversion + if {[info exists portgroups($portgroup)]} { + ui_error "Line $lineno repeats inclusion of PortGroup $portgroup" + incr errors + } else { + set portgroups($portgroup) $portgroupversion + } } set seen_portgroup true set require_blank true

1 0

[102569] trunk/dports/python/py-hgsubversion/Portfile
by sean＠macports.org 04 Feb '13

04 Feb '13

Revision: 102569 https://trac.macports.org/changeset/102569 Author: sean(a)macports.org Date: 2013-02-04 14:32:17 -0800 (Mon, 04 Feb 2013) Log Message: ----------- py-hgsubversion: append categories instead of overwriting Modified Paths: -------------- trunk/dports/python/py-hgsubversion/Portfile Modified: trunk/dports/python/py-hgsubversion/Portfile =================================================================== --- trunk/dports/python/py-hgsubversion/Portfile 2013-02-04 22:32:12 UTC (rev 102568) +++ trunk/dports/python/py-hgsubversion/Portfile 2013-02-04 22:32:17 UTC (rev 102569) @@ -9,7 +9,7 @@ bitbucket.setup durin42 ${realname} 26e9fd21f3bf name py-${realname} version 1.5.20130102 -categories devel +categories-append devel platforms darwin maintainers sean openmaintainer supported_archs noarch

1 0

[102568] trunk/dports/python/py-lz4/Portfile
by sean＠macports.org 04 Feb '13

04 Feb '13

Revision: 102568 https://trac.macports.org/changeset/102568 Author: sean(a)macports.org Date: 2013-02-04 14:32:12 -0800 (Mon, 04 Feb 2013) Log Message: ----------- py-lz4: add openmaintainer Modified Paths: -------------- trunk/dports/python/py-lz4/Portfile Modified: trunk/dports/python/py-lz4/Portfile =================================================================== --- trunk/dports/python/py-lz4/Portfile 2013-02-04 22:32:08 UTC (rev 102567) +++ trunk/dports/python/py-lz4/Portfile 2013-02-04 22:32:12 UTC (rev 102568) @@ -7,7 +7,7 @@ name py-lz4 version 0.5.0 license BSD -maintainers sean +maintainers sean openmaintainer description LZ4 bindings for python long_description ${description} By Steeve Morin platforms darwin

1 0

[102567] trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl
by sean＠macports.org 04 Feb '13

04 Feb '13

Revision: 102567 https://trac.macports.org/changeset/102567 Author: sean(a)macports.org Date: 2013-02-04 14:32:08 -0800 (Mon, 04 Feb 2013) Log Message: ----------- bitbucket-1.0: fix error with moving an empty list of files Modified Paths: -------------- trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl 2013-02-04 22:32:03 UTC (rev 102566) +++ trunk/dports/_resources/port1.0/group/bitbucket-1.0.tcl 2013-02-04 22:32:08 UTC (rev 102567) @@ -78,7 +78,8 @@ post-extract { if {![file exists ${worksrcpath}] && "standard" == ${fetch.type} && \ - ${master_sites} == ${bitbucket.master_sites} && [llength ${distfiles}] > 0} { + ${master_sites} == ${bitbucket.master_sites} && [llength ${distfiles}] > 0 && \ + [llength [glob -nocomplain ${workpath}/*]] > 0} { move [glob ${workpath}/*] ${worksrcpath} } }

1 0

[102566] trunk/dports/_resources/port1.0/group/github-1.0.tcl
by sean＠macports.org 04 Feb '13

04 Feb '13

Revision: 102566 https://trac.macports.org/changeset/102566 Author: sean(a)macports.org Date: 2013-02-04 14:32:03 -0800 (Mon, 04 Feb 2013) Log Message: ----------- github-1.0: fix error with moving an empty list of files Modified Paths: -------------- trunk/dports/_resources/port1.0/group/github-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/github-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/github-1.0.tcl 2013-02-04 22:29:06 UTC (rev 102565) +++ trunk/dports/_resources/port1.0/group/github-1.0.tcl 2013-02-04 22:32:03 UTC (rev 102566) @@ -80,7 +80,8 @@ post-extract { if {![file exists ${worksrcpath}] && "standard" == ${fetch.type} && \ - ${master_sites} == ${github.master_sites} && [llength ${distfiles}] > 0} { + ${master_sites} == ${github.master_sites} && [llength ${distfiles}] > 0 && \ + [llength [glob -nocomplain ${workpath}/*]] > 0} { move [glob ${workpath}/*] ${worksrcpath} } }

1 0

[102565] trunk/dports/sysutils/e2fsprogs/Portfile
by raimue＠macports.org 04 Feb '13

04 Feb '13

Revision: 102565 https://trac.macports.org/changeset/102565 Author: raimue(a)macports.org Date: 2013-02-04 14:29:06 -0800 (Mon, 04 Feb 2013) Log Message: ----------- sysutils/e2fsprogs: Enable verbose build messages Modified Paths: -------------- trunk/dports/sysutils/e2fsprogs/Portfile Modified: trunk/dports/sysutils/e2fsprogs/Portfile =================================================================== --- trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 22:23:35 UTC (rev 102564) +++ trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 22:29:06 UTC (rev 102565) @@ -34,6 +34,9 @@ # This project is not C99 conformant configure.cflags-append -std=gnu89 +# Enable verbose build messages +build.args-append V=1 + if {${name} == ${subport}} { universal_variant no

1 0

[102564] trunk/dports/sysutils/e2fsprogs
by cal＠macports.org 04 Feb '13

04 Feb '13

Revision: 102564 https://trac.macports.org/changeset/102564 Author: cal(a)macports.org Date: 2013-02-04 14:23:35 -0800 (Mon, 04 Feb 2013) Log Message: ----------- libcomerr: fix universal build, closes #37922 Modified Paths: -------------- trunk/dports/sysutils/e2fsprogs/Portfile trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib Modified: trunk/dports/sysutils/e2fsprogs/Portfile =================================================================== --- trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 22:07:01 UTC (rev 102563) +++ trunk/dports/sysutils/e2fsprogs/Portfile 2013-02-04 22:23:35 UTC (rev 102564) @@ -5,6 +5,7 @@ name e2fsprogs version 1.42.7 +revision 1 categories sysutils platforms darwin maintainers nomaintainer @@ -26,22 +27,23 @@ depends_build port:pkgconfig depends_lib port:gettext +patchfiles patch-lib__Makefile.darwin-lib + configure.args-append --enable-bsd-shlibs # This project is not C99 conformant configure.cflags-append -std=gnu89 -universal_variant no +if {${name} == ${subport}} { + universal_variant no -if {${name} == ${subport}} { configure.args-append --disable-libuuid \ --disable-uuidd depends_lib-append port:ossp-uuid \ port:libcomerr - patchfiles-append patch-lib__Makefile.darwin-lib \ - patch-Makefile.in-remove-included-libcomerr.diff + patchfiles-append patch-Makefile.in-remove-included-libcomerr.diff if {[string match *clang* ${configure.compiler}]} { # return type conflicts should really be fixed Modified: trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib =================================================================== --- trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib 2013-02-04 22:07:01 UTC (rev 102563) +++ trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib 2013-02-04 22:23:35 UTC (rev 102564) @@ -5,7 +5,7 @@ $(BSD_LIB): $(OBJS) $(E) " GEN_BSD_SOLIB $(BSD_LIB)" - $(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \ -+ $(Q) (cd pic; $(CC) -dynamiclib -install_name $(BSDLIB_INSTALL_DIR)/$(BSD_LIB) -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) -Wl,-single_module \ ++ $(Q) (cd pic; $(CC) $(LDFLAGS) -dynamiclib -install_name $(BSDLIB_INSTALL_DIR)/$(BSD_LIB) -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) -Wl,-single_module \ -flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS)) $(Q) $(MV) pic/$(BSD_LIB) . $(Q) $(RM) -f ../$(BSD_LIB)

1 0

[102563] trunk/base/src/package1.0
by snc＠macports.org 04 Feb '13

04 Feb '13

Revision: 102563 https://trac.macports.org/changeset/102563 Author: snc(a)macports.org Date: 2013-02-04 14:07:01 -0800 (Mon, 04 Feb 2013) Log Message: ----------- port{mpkg,mdmg}.tcl: abstract-out mpkg_path, epoch_namestr and revision_namestr Modified Paths: -------------- trunk/base/src/package1.0/portmdmg.tcl trunk/base/src/package1.0/portmpkg.tcl Modified: trunk/base/src/package1.0/portmdmg.tcl =================================================================== --- trunk/base/src/package1.0/portmdmg.tcl 2013-02-04 21:32:25 UTC (rev 102562) +++ trunk/base/src/package1.0/portmdmg.tcl 2013-02-04 22:07:01 UTC (rev 102563) @@ -45,7 +45,7 @@ set_ui_prefix proc portmdmg::mdmg_main {args} { - global subport version revision package.destpath UI_PREFIX + global subport epoch version revision package.destpath UI_PREFIX ui_msg "$UI_PREFIX [format [msgcat::mc "Creating disk image for %s-%s"] ${subport} ${version}]" @@ -53,10 +53,10 @@ seteuid 0; setegid 0 } - return [package_mdmg $subport $version $revision] + return [package_mdmg $subport $epoch $version $revision] } -proc portmdmg::package_mdmg {portname portversion portrevision} { +proc portmdmg::package_mdmg {portname portepoch portversion portrevision} { global UI_PREFIX package.destpath portpath global os.platform os.arch os.version os.major @@ -68,7 +68,7 @@ set tmp_image ${package.destpath}/${imagename}.tmp.dmg set final_image ${package.destpath}/${imagename}.dmg - set mpkgpath ${package.destpath}/${portname}-${portversion}_${portrevision}.mpkg + set mpkgpath [portmpkg::mpkg_path $portname $portepoch $portversion $portrevision] if {[file readable $final_image] && ([file mtime ${final_image}] >= [file mtime ${portpath}/Portfile])} { ui_msg "$UI_PREFIX [format [msgcat::mc "Disk Image for %s-%s is up-to-date"] ${portname} ${portversion}]" Modified: trunk/base/src/package1.0/portmpkg.tcl =================================================================== --- trunk/base/src/package1.0/portmpkg.tcl 2013-02-04 21:32:25 UTC (rev 102562) +++ trunk/base/src/package1.0/portmpkg.tcl 2013-02-04 22:07:01 UTC (rev 102563) @@ -120,19 +120,37 @@ } } -proc portmpkg::package_mpkg {portname portepoch portversion portrevision} { - global portdbpath os.major destpath workpath prefix porturl description package.destpath package.flat long_description homepage depends_run depends_lib - +proc portmpkg::epoch_namestr {portepoch} { set portepoch_namestr "" if {${portepoch} != "0"} { set portepoch_namestr "${portepoch}_" } + return ${portepoch_namestr} +} + +proc portmpkg::revision_namestr {portrevision} { set portrevision_namestr "" if {${portrevision} != "0"} { set portrevision_namestr "_${portrevision}" } + return ${portrevision_namestr} +} + +proc portmpkg::mpkg_path {portname portepoch portversion portrevision} { + global package.destpath + set portepoch_namestr [portmpkg::epoch_namestr ${portepoch}] + set portrevision_namestr [portmpkg::revision_namestr ${portrevision}] set mpkgpath ${package.destpath}/${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}.mpkg + return $mpkgpath +} +proc portmpkg::package_mpkg {portname portepoch portversion portrevision} { + global portdbpath os.major destpath workpath prefix porturl description package.destpath package.flat long_description homepage depends_run depends_lib + + set mpkgpath [portmpkg::mpkg_path $portname $portepoch $portversion $portrevision] + + set portepoch_namestr [portmpkg::epoch_namestr ${portepoch}] + set portrevision_namestr [portmpkg::revision_namestr ${portrevision}] if {${package.flat} && ${os.major} >= 10} { set pkgpath ${package.destpath}/${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}-component.pkg set packages_path ${workpath}/mpkg_packages

1 0

[102562] trunk/dports/x11/pango
by ryandesign＠macports.org 04 Feb '13

04 Feb '13

Revision: 102562 https://trac.macports.org/changeset/102562 Author: ryandesign(a)macports.org Date: 2013-02-04 13:32:25 -0800 (Mon, 04 Feb 2013) Log Message: ----------- pango: update to 1.32.5 Modified Paths: -------------- trunk/dports/x11/pango/Portfile Removed Paths: ------------- trunk/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff Modified: trunk/dports/x11/pango/Portfile =================================================================== --- trunk/dports/x11/pango/Portfile 2013-02-04 21:29:05 UTC (rev 102561) +++ trunk/dports/x11/pango/Portfile 2013-02-04 21:32:25 UTC (rev 102562) @@ -6,8 +6,7 @@ name pango conflicts pango-devel epoch 1 -version 1.30.1 -revision 3 +version 1.32.5 set branch [join [lrange [split ${version} .] 0 1] .] categories x11 maintainers ryandesign openmaintainer @@ -26,8 +25,8 @@ open-source framework for the layout and rendering \ of internationalized text. -checksums rmd160 a0c68de9e02dbdb690ada02e945a378c6ca4a71b \ - sha256 3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe +checksums rmd160 809f009543426ec5153394e261fdb2faf16d259b \ + sha256 7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821 depends_build \ port:pkgconfig @@ -36,10 +35,11 @@ path:lib/pkgconfig/glib-2.0.pc:glib2 \ path:lib/pkgconfig/cairo.pc:cairo \ port:gobject-introspection \ + port:graphite2 \ + port:harfbuzz \ port:libpng patchfiles patch-ltmain.sh.diff -patchfiles-append patch-pango-pangocoretext-fontmap.c.diff configure.ccache no @@ -53,7 +53,14 @@ } pre-configure { - set glib_minimum_version 2.31.0 + set harfbuzz_minimum_version 0.9.9 + set harfbuzz_installed_version [exec ${prefix}/bin/pkg-config harfbuzz --modversion] + if {[vercmp ${harfbuzz_installed_version} ${harfbuzz_minimum_version}] < 0} { + ui_error "${name} ${version} requires harfbuzz ${harfbuzz_minimum_version} or later but you have harfbuzz ${harfbuzz_installed_version}." + return -code error "incompatible harfbuzz version" + } + + set glib_minimum_version 2.33.12 set glib_installed_version [exec ${prefix}/bin/pkg-config glib-2.0 --modversion] if {[vercmp ${glib_installed_version} ${glib_minimum_version}] < 0} { ui_error "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}." @@ -101,6 +108,7 @@ # gobject-introspection uses g-ir-scanner, which uses $CC from env build.args-append CC="${configure.cc} ${configure.cc_archflags}" +destroot.args-append CC="${configure.cc} ${configure.cc_archflags}" variant builtin_modules description {Build the modules into Pango statically (most users do not need this variant)} { configure.args-append --with-included-modules @@ -121,9 +129,7 @@ } post-destroot { - if {![variant_isset x11]} { - xinstall -d ${destroot}${prefix}/etc/pango - } + xinstall -d ${destroot}${prefix}/etc/pango if {![variant_isset builtin_modules]} { xinstall -m 0644 ${worksrcpath}/modules/pangorc \ ${destroot}${prefix}/etc/pango @@ -131,7 +137,7 @@ ${destroot}${prefix}/etc/pango/pangorc system "env LANG=C DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \ - ${destroot}${prefix}/bin/pango-querymodules ${destroot}${prefix}/lib/pango/1.6.0/modules/*.so \ + ${destroot}${prefix}/bin/pango-querymodules ${destroot}${prefix}/lib/pango/*/modules/*.so \ >${destroot}${prefix}/etc/pango/pango.modules" reinplace s|${destroot}||g ${destroot}${prefix}/etc/pango/pango.modules } Deleted: trunk/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff =================================================================== --- trunk/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff 2013-02-04 21:29:05 UTC (rev 102561) +++ trunk/dports/x11/pango/files/patch-pango-pangocoretext-fontmap.c.diff 2013-02-04 21:32:25 UTC (rev 102562) @@ -1,60 +0,0 @@ -coretext: don't insert item in the hash if it originated from the hash -https://github.com/GNOME/pango/commit/70a85d441d973883af4afb57599bc570eeea4c83 ---- pango/pangocoretext-fontmap.c.orig -+++ pango/pangocoretext-fontmap.c -@@ -1284,13 +1284,11 @@ struct _PangoCoreTextFontKey - - if (G_UNLIKELY (!fontset)) - { -+ gboolean insert_in_hash = TRUE; -+ - fontset = pango_core_text_fontset_new (&key, desc); - -- if (G_LIKELY (fontset)) -- g_hash_table_insert (ctfontmap->fontset_hash, -- pango_core_text_fontset_get_key (fontset), -- fontset); -- else -+ if (G_UNLIKELY (!fontset)) - { - /* If no font(set) could be loaded, we fallback to "Sans", - * which should always work on Mac. We try to adhere to the -@@ -1308,7 +1306,9 @@ struct _PangoCoreTextFontKey - language); - - fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key); -- if (G_UNLIKELY (!fontset)) -+ if (G_LIKELY (fontset)) -+ insert_in_hash = FALSE; -+ else - fontset = pango_core_text_fontset_new (&key, tmp_desc); - - if (G_UNLIKELY (!fontset)) -@@ -1335,7 +1335,9 @@ struct _PangoCoreTextFontKey - } - - fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key); -- if (G_UNLIKELY (!fontset)) -+ if (G_LIKELY (fontset)) -+ insert_in_hash = FALSE; -+ else - fontset = pango_core_text_fontset_new (&key, tmp_desc); - - if (G_UNLIKELY (!fontset)) -@@ -1346,11 +1348,12 @@ struct _PangoCoreTextFontKey - g_error ("Could not load fallback font, bailing out."); - } - } -- -- g_hash_table_insert (ctfontmap->fontset_hash, -- pango_core_text_fontset_get_key (fontset), -- fontset); - } -+ -+ if (insert_in_hash) -+ g_hash_table_insert (ctfontmap->fontset_hash, -+ pango_core_text_fontset_get_key (fontset), -+ fontset); - } - - /* Cannot use pango_core_text_fontset_key_free() here */

1 0