Index: Portfile
===================================================================
--- Portfile	(revision 133739)
+++ Portfile	(working copy)
@@ -8,7 +8,7 @@
 
 name                poppler
 conflicts           pdf2json xpdf-tools
-version             0.31.0
+version             0.32.0
 license             GPL-2+
 maintainers         devans openmaintainer
 categories          graphics
@@ -22,8 +22,8 @@
 
 use_xz              yes
 
-checksums           rmd160  6b786565edf89fdd97419fcbe39302f8ce837400 \
-                    sha256  943290270dca390d8f14467d54b06a25d9d6f70dc5853b0a9b89c62f74570694
+checksums           rmd160  3c301db613399db407bd2ee9b033423b0232b8c2 \
+                    sha256  4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98
 
 depends_build       port:pkgconfig
 
@@ -66,17 +66,49 @@
 
 # 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
 
 subport poppler-qt4-mac {
     PortGroup qt4 1.0
+
+    conflicts poppler-qt5-mac
+
+    depends_lib-append      port:poppler
+    configure.env-append    MOCQT4=${qt_bins_dir}/moc
+    configure.args-delete   --disable-poppler-qt4
+    configure.args-append   --disable-cairo-output \
+                            --disable-poppler-glib \
+                            --disable-poppler-cpp \
+                            --disable-gtk-test \
+                            --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}/include/poppler/splash \
+               ${destroot}${prefix}/lib/libpoppler.51.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
+    }
+}
+
+subport poppler-qt5-mac {
+    PortGroup qt5 1.0
+
+    conflicts poppler-qt4-mac
     
-    depends_lib-append port:poppler
-    configure.args-delete --disable-poppler-qt4
-    configure.args-append --disable-cairo-output \
-                          --disable-poppler-glib \
-                          --disable-poppler-cpp \
-                          --disable-utils
+    depends_lib-append      port:poppler
+    configure.env-append    MOCQT5=${qt_bins_dir}/moc
+    configure.args-delete   --disable-poppler-qt5
+    configure.args-append   --disable-cairo-output \
+                            --disable-poppler-glib \
+                            --disable-poppler-cpp \
+                            --disable-gtk-test \
+                            --disable-utils
     post-destroot {
         foreach dot_h [glob -nocomplain -directory ${destroot}${prefix}/include/poppler *.h] {
             delete $dot_h
@@ -84,7 +116,7 @@
         delete ${destroot}${prefix}/include/poppler/fofi \
                ${destroot}${prefix}/include/poppler/goo \
                ${destroot}${prefix}/include/poppler/splash \
-               ${destroot}${prefix}/lib/libpoppler.50.dylib \
+               ${destroot}${prefix}/lib/libpoppler.51.dylib \
                ${destroot}${prefix}/lib/libpoppler.a \
                ${destroot}${prefix}/lib/libpoppler.dylib \
                ${destroot}${prefix}/lib/libpoppler.la \
@@ -93,6 +125,15 @@
     }
 }
 
+if {${subport} ne ${name}} {
+    post-extract {
+        system -W ${workpath} "git clone --depth=1 git://git.freedesktop.org/git/poppler/test"
+    }
+
+    test.run    yes
+    test.target check
+}
+
 livecheck.type      regex
 livecheck.url       http://poppler.freedesktop.org/releases.html
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"