# HG changeset patch # User Alessio Caiazza # Date 1265732981 -3600 # Node ID 220cfe0815d3145cad64fc0d73b4a707c92c2787 # Parent 0000000000000000000000000000000000000000 pango 1.26.2 and tk fix for snow leopard diff -r 0000000000000000000000000000000000000000 -r 220cfe0815d3145cad64fc0d73b4a707c92c2787 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Tue Feb 09 17:29:41 2010 +0100 @@ -0,0 +1,5 @@ +^\.hg +^\.mq +syntax: glob +status +guards diff -r 0000000000000000000000000000000000000000 -r 220cfe0815d3145cad64fc0d73b4a707c92c2787 pango_1.26.2 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pango_1.26.2 Tue Feb 09 17:29:41 2010 +0100 @@ -0,0 +1,87 @@ +Portfile for pango 1.26.2 + +diff --git a/x11/pango/Portfile b/x11/pango/Portfile +--- a/x11/pango/Portfile ++++ b/x11/pango/Portfile +@@ -1,13 +1,11 @@ +-# $Id: Portfile 61898 2009-12-23 10:45:31Z ryandesign@macports.org $ ++# $Id: Portfile 58104 2009-09-22 06:58:34Z ryandesign@macports.org $ + + PortSystem 1.0 + PortGroup muniversal 1.0 +-PortGroup archcheck 1.0 + + name pango + conflicts pango-devel +-epoch 1 +-version 1.24.5 ++version 1.26.2 + set branch [join [lrange [split ${version} .] 0 1] .] + categories x11 + maintainers ryandesign +@@ -26,10 +24,9 @@ + open-source framework for the layout and rendering \ + of internationalized text. + +-checksums \ +- md5 815416a452e9cccc172fed9862401f37 \ +- sha1 a5aa40b78546a7ee59f21804b172e5d47ef776ad \ +- rmd160 7e436752734c55950ad5feced7c7d5c3f040a1b4 ++checksums md5 f30212b8833af3ce5c82121dc309e3d0 \ ++ sha1 051b6f7b5f98a4c8083ef6a5178cb5255a992b98 \ ++ rmd160 6613bddf643d5c912e6656d84c6671aa6ce88a9d + + depends_extract \ + port:pkgconfig +@@ -39,19 +36,15 @@ + port:Xft2 \ + path:lib/pkgconfig/cairo.pc:cairo + +-archcheck.files lib/libglib-2.0.dylib \ +- lib/libXft.dylib \ +- lib/libcairo.dylib +- +-patchfiles \ +- patch-which.diff \ +- patch-ltmain.sh.diff \ +- patch-configure.diff +- + configure.ccache no + ++# Do not call gzip on man files as it interferes with the universal merger process. ++post-patch { ++ reinplace "s|\$(MAKE) \$(AM_MAKEFLAGS) install-data-hook||" ${worksrcpath}/pango-view/Makefile.in ++} ++ + platform macosx {} +-variant quartz requires macosx { ++variant quartz requires macosx description {Add Quartz graphics interface} { + # Although this variant does nothing, pango will automatically build + # itself differently depending on whether or not cairo is installed with + # the quartz variant. Therefore this variant is necessary to be able to +@@ -107,8 +100,8 @@ + set merger_configure_env(i386) "NM='/usr/bin/nm -p'" + set merger_configure_env(x86_64) "NM='/usr/bin/nm -p'" + } +-lappend merger_configure_args(ppc64) have_atsui=false +-lappend merger_configure_args(x86_64) have_atsui=false ++lappend merger_configure_env(ppc64) ac_cv_header_Carbon_Carbon_h=no ++lappend merger_configure_env(x86_64) ac_cv_header_Carbon_Carbon_h=no + + configure.cppflags-append \ + -no-cpp-precomp +@@ -121,14 +114,9 @@ + --enable-static \ + --x-include=${prefix}/include --x-lib=${prefix}/lib + +-if {![variant_isset universal] && $build_arch == "x86_64" || $build_arch == "ppc64"} { +- configure.args-append have_atsui=false +-} +- + variant no_x11 { + depends_lib-delete \ + port:Xft2 +- archcheck.files-delete lib/libXft.dylib + configure.args-append \ + --without-x + } diff -r 0000000000000000000000000000000000000000 -r 220cfe0815d3145cad64fc0d73b4a707c92c2787 series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/series Tue Feb 09 17:29:41 2010 +0100 @@ -0,0 +1,2 @@ +pango_1.26.2 +tk_fix_snow_leopard diff -r 0000000000000000000000000000000000000000 -r 220cfe0815d3145cad64fc0d73b4a707c92c2787 tk_fix_snow_leopard --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tk_fix_snow_leopard Tue Feb 09 17:29:41 2010 +0100 @@ -0,0 +1,27 @@ +Fixes tk for Snow Leopard + +diff --git a/x11/tk/Portfile b/x11/tk/Portfile +--- a/x11/tk/Portfile ++++ b/x11/tk/Portfile +@@ -14,15 +14,16 @@ + Ousterhout, Addison-Wesley, ISBN 0-201-63337-X. + + platforms darwin +-master_sites sourceforge:tcl ++master_sites http://cloud.github.com/downloads/das/tcltk\ ++ sourceforge:tcl + dist_subdir tcltk +-distname ${name}${version}-src ++distname ${name}${version}-decarbon + worksrcdir ${name}${version}/unix + checksums \ + ${distname}${extract.suffix} \ +- md5 13bf90602e16fc530e05196431021dc6 \ +- sha1 ea13b9d0bf611c7671c488bc0b5f3f739ad7e399 \ +- rmd160 494a0d217ce6a81c10afb91b344c6110dd0986b0 ++ md5 3a69d58fc6fe4e0609d82ac7923e1ea6 \ ++ sha1 97e6726c9cdee02ae19f7c73505e0f7c9fdf232c \ ++ rmd160 5b26026007e5c6af29abcff492aac23fe028486e + # suck in Tcl as well so we can use it internally. + distfiles-append tcl${version}-src${extract.suffix} + checksums-append \