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

[devans at macports.org]

Revision: 115965
          https://trac.macports.org/changeset/115965
Author:   devans at macports.org
Date:     2014-01-15 08:31:13 -0800 (Wed, 15 Jan 2014)
Log Message:
-----------
poppler: general overhaul.
  * update to version 0.24.5, ABI compatible with previous version
  * update dependencies, configuration
  * remove variant +doc which has absolutely no effect on installed content
  * remove variant +quartz, poppler is quartz/x11 agnostic
  * remove theoretical support for broken qt4-x11
  * replace variant +qt4 with new subport poppler-qt4-mac which depends on
    poppler and adds the additional poppler bindings for qt4-mac (#38350).
  * framework in place to support bindings for qt4-x11, qt5 as additional subports
    if and when those ports become availabe.

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

Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile	2014-01-15 15:44:52 UTC (rev 115964)
+++ trunk/dports/graphics/poppler/Portfile	2014-01-15 16:31:13 UTC (rev 115965)
@@ -7,8 +7,7 @@
 
 name            poppler
 conflicts       pdf2json xpdf-tools
-version         0.24.4
-revision        1
+version         0.24.5
 license         GPL-2+
 maintainers     devans openmaintainer
 categories      graphics
@@ -23,8 +22,8 @@
 
 use_xz          yes
 
-checksums       rmd160  2a71b7da5562e1ac655c9591812551f3fbfe6fe9 \
-                sha256  c8a3509a17e6f0bbb07eeb1b58276b485974a8bff3f5eef1bc8e150ccd7c01e2
+checksums       rmd160  34a017f79e624091a62845beb26b3f81fb971645 \
+                sha256  a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84
 
 depends_build   port:pkgconfig
 
@@ -34,6 +33,7 @@
                 port:fontconfig \
                 port:freetype \
                 port:gobject-introspection \
+                port:jpeg \
                 path:lib/pkgconfig/glib-2.0.pc:glib2 \
                 path:lib/pkgconfig/cairo.pc:cairo \
                 port:lcms2 \
@@ -43,13 +43,6 @@
                 port:tiff \
                 port:zlib
 
-post-patch {
-    reinplace "s|\$includedir|${prefix}/include|g" \
-        ${worksrcpath}/configure
-    reinplace "s|tests||" \
-        ${worksrcpath}/qt4/Makefile.in
-}
-
 # Generate newer libtool that passes -stdlib when linking dylibs.
 use_autoreconf  yes
 autoreconf.args -fvi
@@ -57,12 +50,12 @@
 compiler.blacklist {gcc-4.0 < 5493}
 
 configure.args  --disable-poppler-qt4 \
+                --disable-poppler-qt5 \
                 --disable-gtk-test \
                 --disable-silent-rules \
                 --enable-xpdf-headers \
                 --enable-zlib \
                 --enable-libcurl \
-                --enable-poppler-glib \
                 --enable-introspection=yes
 
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
@@ -75,35 +68,33 @@
     build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
 }
 
-variant quartz {
-    configure.args-append --without-x
-}
+# 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
 
-if {![variant_isset quartz]} {
-    if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-            configure.args-append --x-includes=${prefix}/include \
-                                  --x-libraries=${prefix}/lib
-    }
-}
-
-variant qt4 description { Support for the QT4 toolkit } {
+subport poppler-qt4-mac {
+    PortGroup qt4 1.0
+    depends_lib-append port:poppler
     configure.args-delete --disable-poppler-qt4
-    if ([variant_isset quartz]) {
-        PortGroup qt4 1.0
-    } else {
-        depends_lib-append  port:qt4-x11
-        set qt_dir ${prefix}/libexec/qt4-x11
-        configure.env-append  QTDIR=${qt_dir}
-        set env(PATH) "${qt_dir}/bin:$env(PATH)"
-        configure.pkg_config_path ${qt_dir}/lib/pkgconfig
+    configure.args-append --disable-splash-output \
+                          --disable-cairo-output \
+                          --disable-poppler-glib \
+                          --disable-poppler-cpp \
+                          --disable-utils
+    post-destroot {
+        foreach dot_h [glob -nocomplain -directory ${destroot}${prefix}/include/poppler *.h] {
+            delete $dot_h
+        }
+        delete ${destroot}${prefix}/include/poppler/fofi \
+               ${destroot}${prefix}/include/poppler/goo \
+               ${destroot}${prefix}/lib/libpoppler.44.dylib \
+               ${destroot}${prefix}/lib/libpoppler.a \
+               ${destroot}${prefix}/lib/libpoppler.dylib \
+               ${destroot}${prefix}/lib/libpoppler.la \
+               ${destroot}${prefix}/lib/pkgconfig/poppler.pc
     }
 }
 
-variant docs conflicts universal description {Build gtk-doc documentation} {
-    depends_build-append   port:gtk-doc
-    configure.args-append  --enable-gtk-doc
-}
-
 platform darwin 8 {
     # The rules enabled by gobject-introspection require GNU make 3.81+ (#39144)
     depends_build-append    port:gmake
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140115/904251b5/attachment-0001.html>