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

[devans at macports.org]

Revision: 146564
          https://trac.macports.org/changeset/146564
Author:   devans at macports.org
Date:     2016-03-11 23:55:26 -0800 (Fri, 11 Mar 2016)
Log Message:
-----------
poppler: contributed patch, adds new subport poppler-qt5, installs in parallel with poppler and poppler-qt4-mac (#47025).

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

Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile	2016-03-12 07:12:05 UTC (rev 146563)
+++ trunk/dports/graphics/poppler/Portfile	2016-03-12 07:55:26 UTC (rev 146564)
@@ -65,15 +65,22 @@
 }
 
 # TODO:
-# add subport poppler-qt4-x11 when qt4-x11 builds and port group qt4 allows
-# add subport poppler-qt5-mac when various qt5 build issues are resolved (#47025)
+# add subport for poppler-qt4-x11 when qt4-x11 builds and port group qt4 allows
 
 subport poppler-qt4-mac {
     PortGroup qt4 1.0
 
+    configure.env-append    MOCQT4=${qt_bins_dir}/moc
     configure.args-delete   --disable-poppler-qt4
 }
 
+subport poppler-qt5 {
+    PortGroup qt5 1.0
+
+    configure.env-append    MOCQT5=${qt_bins_dir}/moc
+    configure.args-delete   --disable-poppler-qt5
+}
+
 if {${subport} ne ${name}} {
     depends_extract-append  port:git
 
@@ -82,14 +89,14 @@
     post-extract {
         system -W ${workpath} "${prefix}/bin/git clone --depth=1 http://anongit.freedesktop.org/git/poppler/test"
     }
-    
+
     configure.args-append   --disable-cairo-output \
                             --disable-poppler-glib \
                             --disable-poppler-cpp \
                             --disable-utils
 
 # currently poppler only provides unit tests for the Qt wrappers
-    
+
     test.run    yes
     test.target check
 
@@ -97,13 +104,12 @@
         foreach dot_h [glob -nocomplain -directory ${destroot}${prefix}/include/poppler *.h] {
             delete $dot_h
         }
+        foreach libpoppler [glob -nocomplain ${destroot}${prefix}/lib/libpoppler.*] {
+            delete ${libpoppler}
+        }
         delete  ${destroot}${prefix}/include/poppler/fofi \
                 ${destroot}${prefix}/include/poppler/goo \
                 ${destroot}${prefix}/include/poppler/splash \
-                ${destroot}${prefix}/lib/libpoppler.58.dylib \
-                ${destroot}${prefix}/lib/libpoppler.a \
-                ${destroot}${prefix}/lib/libpoppler.dylib \
-                ${destroot}${prefix}/lib/libpoppler.la \
                 ${destroot}${prefix}/lib/pkgconfig/poppler-splash.pc \
                 ${destroot}${prefix}/lib/pkgconfig/poppler.pc
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160311/5f778a25/attachment.html>