[131818] trunk/dports/graphics/poppler/Portfile

[devans at macports.org]

Revision: 131818
          https://trac.macports.org/changeset/131818
Author:   devans at macports.org
Date:     2015-01-19 03:05:54 -0800 (Mon, 19 Jan 2015)
Log Message:
-----------
poppler: update to version 0.30.0, use gobject_introspection portgroup.

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

Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile	2015-01-19 11:03:21 UTC (rev 131817)
+++ trunk/dports/graphics/poppler/Portfile	2015-01-19 11:05:54 UTC (rev 131818)
@@ -3,11 +3,12 @@
 
 PortSystem          1.0
 PortGroup           compiler_blacklist_versions 1.0
+PortGroup           gobject_introspection 1.0
 PortGroup           muniversal 1.0
 
 name                poppler
 conflicts           pdf2json xpdf-tools
-version             0.29.0
+version             0.30.0
 license             GPL-2+
 maintainers         devans openmaintainer
 categories          graphics
@@ -21,8 +22,8 @@
 
 use_xz              yes
 
-checksums           rmd160  4636133e855361bd8323088cec999545cd6344cb \
-                    sha256  3c1e16dc8d5d846d085baf65844ed3e05cbde5d44f6682f9f1e2b120d66c62c4
+checksums           rmd160  435c5cb016f34b66866a169b0db31f8ffbbf1300 \
+                    sha256  b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5
 
 depends_build       port:pkgconfig
 
@@ -31,7 +32,6 @@
                     port:expat \
                     port:fontconfig \
                     port:freetype \
-                    port:gobject-introspection \
                     port:jpeg \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     path:lib/pkgconfig/cairo.pc:cairo \
@@ -42,6 +42,8 @@
                     port:tiff \
                     port:zlib
 
+gobject_introspection yes
+
 # Generate newer libtool that passes -stdlib when linking dylibs.
 use_autoreconf      yes
 autoreconf.args     -fvi
@@ -63,17 +65,6 @@
     reinplace "s:-fno-check-new::g" ${worksrcpath}/configure.ac
 }
 
-# gobject-introspection uses g-ir-scanner, which uses $CC from env
-if {[variant_isset universal]} {
-    foreach arch ${configure.universal_archs} {
-        lappend merger_build_args(${arch})  CC='${configure.cc} -arch ${arch}'
-        lappend merger_destroot_args(${arch})  CC='${configure.cc} -arch ${arch}'
-    }
-} else {
-    build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
-    destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}"
-}
-
 # TODO:
 # add subport for poppler-qt4-x11 when qt4-x11 builds and port group qt4 allows
 # add subport(s) for poppler-qt5-* when a qt5 port is available
@@ -94,7 +85,7 @@
         delete ${destroot}${prefix}/include/poppler/fofi \
                ${destroot}${prefix}/include/poppler/goo \
                ${destroot}${prefix}/include/poppler/splash \
-               ${destroot}${prefix}/lib/libpoppler.48.dylib \
+               ${destroot}${prefix}/lib/libpoppler.49.dylib \
                ${destroot}${prefix}/lib/libpoppler.a \
                ${destroot}${prefix}/lib/libpoppler.dylib \
                ${destroot}${prefix}/lib/libpoppler.la \
@@ -103,12 +94,6 @@
     }
 }
 
-platform darwin 8 {
-    # The rules enabled by gobject-introspection require GNU make 3.81+ (#39144)
-    depends_build-append    port:gmake
-    build.cmd               ${prefix}/bin/gmake
-}
-
 livecheck.type      regex
 livecheck.url       http://poppler.freedesktop.org/releases.html
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150119/95941560/attachment.html>