[72474] trunk/dports/x11/pango

[jmr at macports.org]

Revision: 72474
          http://trac.macports.org/changeset/72474
Author:   jmr at macports.org
Date:     2010-10-17 06:09:47 -0700 (Sun, 17 Oct 2010)
Log Message:
-----------
pango: update to 1.28.3 and fix universal issues by not using muniversal (#26697). The current CoreText/ATSUI back end builds OK on both 64-bit and Tiger.

Modified Paths:
--------------
    trunk/dports/x11/pango/Portfile

Removed Paths:
-------------
    trunk/dports/x11/pango/files/patch-configure.diff
    trunk/dports/x11/pango/files/patch-which.diff

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2010-10-17 05:27:04 UTC (rev 72473)
+++ trunk/dports/x11/pango/Portfile	2010-10-17 13:09:47 UTC (rev 72474)
@@ -2,19 +2,18 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup               muniversal 1.0
 PortGroup               archcheck 1.0
 
 name                    pango
 conflicts               pango-devel
 epoch                   1
-version                 1.24.5
+version                 1.28.3
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
 maintainers             ryandesign
 license                 LGPLv2
 homepage                http://www.pango.org/
-master_sites            gnome:sources/pango/${branch}
+master_sites            gnome:sources/${name}/${branch}
 platforms               darwin
 use_bzip2               yes
 use_parallel_build      yes
@@ -28,9 +27,9 @@
     of internationalized text.
 
 checksums \
-    md5     815416a452e9cccc172fed9862401f37 \
-    sha1    a5aa40b78546a7ee59f21804b172e5d47ef776ad \
-    rmd160  7e436752734c55950ad5feced7c7d5c3f040a1b4
+    md5     caa74baea47e7e16bc73c89f9089d522 \
+    sha1    e72887d6e147b9abf54628c003836e61d97767a1 \
+    rmd160  cdfd6d695b169e15801956fbfd54438c109f7a61
 
 depends_build \
     port:pkgconfig
@@ -45,14 +44,11 @@
                         lib/libcairo.dylib
 
 patchfiles \
-    patch-which.diff \
-    patch-ltmain.sh.diff \
-    patch-configure.diff
+    patch-ltmain.sh.diff
 
 configure.ccache        no
 
-platform macosx {}
-if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
+platform macosx {
 variant quartz {
     # Although this variant does nothing, pango will automatically build
     # itself differently depending on whether or not cairo is installed with
@@ -69,7 +65,7 @@
         return -code error "incompatible glib2 version"
     }
     
-    set cairo_minimum_version 1.7.4
+    set cairo_minimum_version 1.7.6
     set cairo_installed_version [exec pkg-config cairo --modversion]
     if {[rpm-vercomp ${cairo_installed_version} ${cairo_minimum_version}] < 0} {
         ui_error "${name} ${version} requires cairo ${cairo_minimum_version} or later but you have cairo ${cairo_installed_version}."
@@ -103,24 +99,15 @@
     }
 }
 
-lappend merger_configure_args(ppc64)   have_atsui=false
-lappend merger_configure_args(x86_64)  have_atsui=false
-
-configure.cppflags-append \
-    -no-cpp-precomp
-
 configure.ldflags-append \
     -no-undefined \
     -bind_at_load
 
 configure.args \
     --enable-static \
+    --disable-introspection \
     --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

Deleted: trunk/dports/x11/pango/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/pango/files/patch-configure.diff	2010-10-17 05:27:04 UTC (rev 72473)
+++ trunk/dports/x11/pango/files/patch-configure.diff	2010-10-17 13:09:47 UTC (rev 72474)
@@ -1,22 +0,0 @@
---- configure.orig	2009-07-21 06:59:52.000000000 +1000
-+++ configure	2009-10-22 06:14:52.000000000 +1100
-@@ -19806,12 +19806,14 @@
- $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
- 
- fi
--if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
--  have_atsui=true
--else
--  have_atsui=false
--fi
- 
-+if test "x$have_atsui" = "x"; then
-+  if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
-+    have_atsui=true
-+  else
-+    have_atsui=false
-+  fi
-+fi
- 
- 
- #

Deleted: trunk/dports/x11/pango/files/patch-which.diff
===================================================================
--- trunk/dports/x11/pango/files/patch-which.diff	2010-10-17 05:27:04 UTC (rev 72473)
+++ trunk/dports/x11/pango/files/patch-which.diff	2010-10-17 13:09:47 UTC (rev 72474)
@@ -1,20 +0,0 @@
---- docs/Makefile.in.orig	2009-05-04 15:05:17.000000000 -0500
-+++ docs/Makefile.in	2009-05-07 04:08:23.000000000 -0500
-@@ -785,7 +785,7 @@
- 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
- 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- 	  fi; \
--	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+	  ! test -x "`which gtkdoc-rebase`" || \
- 	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
- 	fi
- 
-@@ -815,7 +815,7 @@
- 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- 	cd $(distdir) && rm -f $(DISTCLEANFILES)
--	! which gtkdoc-rebase >/dev/null 2>&1 || \
-+	! test -x "`which gtkdoc-rebase`" || \
- 	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
- 
- .PHONY : dist-hook-local docs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101017/d5862e87/attachment-0001.html>