Ticket #38350: Portfile-poppler.diff

graphics/poppler/Portfile

@@ -6 +6 @@
 PortGroup       muniversal 1.0
 
 name            poppler
-conflicts       pdf2json xpdf-tools
+conflicts       pdf2json xpdf-tools poppler-qt4
 version         0.24.4
 revision        1
 license         GPL-2+
@@ -56 +56 @@
 
 compiler.blacklist {gcc-4.0 < 5493}
 
-configure.args  --disable-poppler-qt4 \
-                --disable-gtk-test \
+configure.args  --disable-gtk-test \
                 --disable-silent-rules \
                 --enable-xpdf-headers \
                 --enable-zlib \
@@ -75 +74 @@
     build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
 }
 
-variant quartz {
-    configure.args-append --without-x
-}
+if {${subport} == ${name}} {
+    configure.args-append    --disable-poppler-qt4
+
+    variant quartz {
+        configure.args-append --without-x
+    }
 
-if {![variant_isset quartz]} {
-    if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
+    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 } {
-    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
+    variant qt4 description { Support for the QT4 toolkit } {
+        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
+        }
     }
 }
 
+subport poppler-qt4 {
+    PortGroup   qt4 1.0
+    conflicts   pdf2json xpdf-tools poppler
+
+    configure.args-append   --without-x
+}
+
 variant docs conflicts universal description {Build gtk-doc documentation} {
     depends_build-append   port:gtk-doc
     configure.args-append  --enable-gtk-doc