[107441] trunk/dports/graphics/harfbuzz

[ryandesign at macports.org]

Revision: 107441
          https://trac.macports.org/changeset/107441
Author:   ryandesign at macports.org
Date:     2013-06-29 04:34:36 -0700 (Sat, 29 Jun 2013)
Log Message:
-----------
harfbuzz: enable graphite2 support again, which defaulted to off since 0.9.18 (#39574); move ICU support to new harfbuzz-icu subport as recommended by upstream; remove libpng dependency because it is not used

Modified Paths:
--------------
    trunk/dports/graphics/harfbuzz/Portfile

Added Paths:
-----------
    trunk/dports/graphics/harfbuzz/files/
    trunk/dports/graphics/harfbuzz/files/patch-test-api-Makefile.am.diff

Modified: trunk/dports/graphics/harfbuzz/Portfile
===================================================================
--- trunk/dports/graphics/harfbuzz/Portfile	2013-06-29 11:16:37 UTC (rev 107440)
+++ trunk/dports/graphics/harfbuzz/Portfile	2013-06-29 11:34:36 UTC (rev 107441)
@@ -5,7 +5,7 @@
 
 name                harfbuzz
 version             0.9.18
-revision            1
+revision            2
 categories          graphics
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -24,29 +24,70 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         path:lib/pkgconfig/cairo.pc:cairo \
+configure.args      --disable-silent-rules
+
+if {${name} eq ${subport}} {
+    depends_lib-append \
+                    path:lib/pkgconfig/cairo.pc:cairo \
                     port:freetype \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
-                    port:graphite2 \
-                    port:icu \
-                    port:libpng
+                    port:graphite2
+    
+    patchfiles-append patch-test-api-Makefile.am.diff
+    use_autoreconf yes
+    
+    configure.args-append \
+                    --with-cairo \
+                    --with-freetype \
+                    --with-glib \
+                    --with-graphite2 \
+                    --without-icu
+    
+    post-destroot {
+        set docdir ${prefix}/share/doc/${name}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 644 -W ${worksrcpath} \
+                    AUTHORS \
+                    COPYING \
+                    ChangeLog \
+                    NEWS \
+                    README \
+                    THANKS \
+                    TODO \
+                    ${destroot}${docdir}
+    }
+    
+    livecheck.type  regex
+    livecheck.url   [lindex ${master_sites} 0]
+    livecheck.regex [suffix ${name}-(\[0-9.\]+)]
+} else {
+    livecheck.type  none
+}
 
-configure.args      --disable-silent-rules
-
-post-destroot {
-    set docdir ${prefix}/share/doc/${name}
-    xinstall -d ${destroot}${docdir}
-    xinstall -m 644 -W ${worksrcpath} \
-        AUTHORS \
-        COPYING \
-        ChangeLog \
-        NEWS \
-        README \
-        THANKS \
-        TODO \
-        ${destroot}${docdir}
+subport harfbuzz-icu {
+    description     HarfBuzz ICU support library
+    
+    long_description This library adds support for ICU (the International Components for Unicode) to HarfBuzz.
+    
+    depends_lib-append \
+                    port:harfbuzz \
+                    port:icu
+    
+    configure.args-append \
+                    --without-cairo \
+                    --without-freetype \
+                    --without-glib \
+                    --without-graphite2 \
+                    --with-icu
+    
+    destroot.dir    ${worksrcpath}/src
+    destroot {
+        eval xinstall -W ${destroot.dir}/.libs \
+                    [glob ${destroot.dir}/.libs/libharfbuzz-icu.*.dylib] \
+                    libharfbuzz-icu.la \
+                    ${destroot}${prefix}/lib
+        copy ${destroot.dir}/.libs/libharfbuzz-icu.dylib ${destroot}${prefix}/lib
+        xinstall -m 644 ${destroot.dir}/hb-icu.h ${destroot}${prefix}/include
+        xinstall -m 644 ${destroot.dir}/harfbuzz-icu.pc ${destroot}${prefix}/lib/pkgconfig
+    }
 }
-
-livecheck.type      regex
-livecheck.url       [lindex ${master_sites} 0]
-livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}

Added: trunk/dports/graphics/harfbuzz/files/patch-test-api-Makefile.am.diff
===================================================================
--- trunk/dports/graphics/harfbuzz/files/patch-test-api-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/graphics/harfbuzz/files/patch-test-api-Makefile.am.diff	2013-06-29 11:34:36 UTC (rev 107441)
@@ -0,0 +1,20 @@
+Fix build when icu is not used
+https://bugs.freedesktop.org/show_bug.cgi?id=65522
+https://github.com/behdad/harfbuzz/commit/2966d3603259430800cb5880491d28a1c5ea2314
+--- test/api/Makefile.am.orig
++++ test/api/Makefile.am
+@@ -28,12 +28,13 @@ TEST_PROGS = \
+ 	$(NULL)
+ 
+ test_unicode_CPPFLAGS = $(AM_CPPFLAGS)
++test_unicode_LDADD = $(LDADD)
+ if HAVE_GLIB
+ test_unicode_CPPFLAGS += $(GLIB_CFLAGS)
+ endif
+ if HAVE_ICU
+ test_unicode_CPPFLAGS += $(ICU_CFLAGS)
+-test_unicode_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-icu.la
++test_unicode_LDADD += $(top_builddir)/src/libharfbuzz-icu.la
+ endif
+ 
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130629/cae1c973/attachment.html>