Ticket #38350: openmaintainer.diff

gis/gdal/Portfile

@@ -283 +283 @@
 }
 
 variant poppler description {Enable poppler support} {
-    depends_lib-append      port:poppler
-    configure.args-delete   --without-popper
+    depends_lib-append      path:lib/libpoppler.dylib:poppler
+    configure.args-delete   --without-poppler
     configure.args-append   --with-poppler=${prefix}
 }
 

gnome/evince/Portfile

@@ -40 +40 @@
                 port:libsecret \
                 port:gsettings-desktop-schemas \
                 port:gobject-introspection \
-                port:poppler \
+                path:lib/libpoppler.dylib:poppler \
                 port:libspectre \
                 port:tiff \
                 port:texlive-bin \

graphics/ipe-tools/Portfile

@@ -48 +48 @@
                         patch-svgtoipe-python_path.diff
 
 depends_build           port:pkgconfig
-depends_lib             port:poppler
+depends_lib             path:lib/libpoppler.dylib:poppler
 
 use_configure           no
 use_parallel_build      no

graphics/pdf2djvu/Portfile

@@ -28 +28 @@
                     port:gsed
 
 depends_lib         port:djvulibre \
-                    port:poppler \
+                    path:lib/libpoppler.dylib:poppler \
                     port:libiconv \
                     port:GraphicsMagick \
                     port:libxslt

graphics/pdfpc/Portfile

@@ -34 +34 @@
 depends_build-append    port:vala \
                         port:pkgconfig
 depends_lib-append      port:gtk2 \
-                        port:poppler \
+                        path:lib/libpoppler.dylib:poppler \
                         port:librsvg \
                         port:libgee06
 

kde/okular/Portfile

@@ -29 +29 @@
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons \
-                    port:poppler port:libspectre \
+                    path:lib/libpoppler-qt4.dylib:poppler-qt4 \
+                    port:libspectre \
                     port:djvulibre port:chmlib \
                     port:ebook-tools port:tiff \
                     port:qca port:qimageblitz \
                     port:freetype port:zlib \
                     port:jpeg
 
-pre-configure {
-    if {![file exists ${prefix}/lib/libpoppler-qt4.dylib]} {
-        return -code error "Poppler must be installed with +qt4\
-                            and +quartz variants"
-    }
-}
-
 livecheck.url       http://kde.mirrors.hoobly.com/stable/
 livecheck.regex     (\\d+(\\.\\d+)+)

print/epdfview/Portfile

@@ -20 +20 @@
 depends_build \
     port:pkgconfig
 depends_lib     \
-    port:poppler \
+    path:lib/libpoppler.dylib:poppler \
     port:gtk2
 
 patchfiles      patch-epdfview.h \

python/py-python-poppler-qt4/Portfile

@@ -3 +3 @@
 
 PortSystem              1.0
 PortGroup               python 1.0
-PortGroup               active_variants 1.1
 
 set original_name       python-poppler-qt4
 name                    py-${original_name}
@@ -27 +26 @@
     depends_build-append    port:pkgconfig
 
     # Can use either py*-pyqt4 or py*-pyqt4-devel.
-    depends_lib-append      port:poppler \
+    depends_lib-append      path:lib/libpoppler-qt4.dylib:poppler-qt4 \
                             port:qt4-mac \
                             path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
                             port:py${python.version}-sip
 
-    require_active_variants poppler {qt4 quartz}
-
     post-destroot {
         set doc_dir ${destroot}${prefix}/share/doc/${subport}
         xinstall -d ${doc_dir}

textproc/pdf2htmlex/Portfile

@@ -23 +23 @@
 
 depends_lib-append  port:fontforge \
                     port:pkgconfig \
-                    port:poppler \
+                    path:lib/libpoppler.dylib:poppler \
                     port:poppler-data

textproc/recoll/Portfile

@@ -30 +30 @@
 depends_run         port:antiword \
                     port:catdoc \
                     port:libxslt \
-                    port:poppler \
+                    path:lib/libpoppler.dylib:poppler \
                     port:unrtf \
                     port:unzip
 

x11/auto-multiple-choice/Portfile

@@ -47 +47 @@
                         port:p5.12-email-mime \
                         port:p5.12-email-sender \
                         port:sqlite3 \
-                        port:poppler \
+                        path:lib/libpoppler.dylib:poppler \
                         port:netpbm \
                         port:librsvg \
                         port:gdk-pixbuf2