[115966] trunk/dports

[devans at macports.org]

Revision: 115966
          https://trac.macports.org/changeset/115966
Author:   devans at macports.org
Date:     2014-01-15 08:51:19 -0800 (Wed, 15 Jan 2014)
Log Message:
-----------
previous depedents of poppler +qt4 +quartz: now depend on poppler-qt4-mac and drop poppler active variant checks, rebuild not required.

Modified Paths:
--------------
    trunk/dports/editors/texstudio/Portfile
    trunk/dports/kde/okular/Portfile
    trunk/dports/python/py-python-poppler-qt4/Portfile

Modified: trunk/dports/editors/texstudio/Portfile
===================================================================
--- trunk/dports/editors/texstudio/Portfile	2014-01-15 16:31:13 UTC (rev 115965)
+++ trunk/dports/editors/texstudio/Portfile	2014-01-15 16:51:19 UTC (rev 115966)
@@ -23,24 +23,8 @@
 checksums               rmd160  e2b90518a60b4c70771a4885e920a324d68ceb60 \
                         sha256  7f7ae53818d74a06fffef81e1aa9552badd85045a9953b13f28d15b393962015
 
-depends_lib-append      port:poppler
+depends_lib-append      port:poppler-qt4-mac
 
-if {![file exists ${prefix}/lib/libpoppler-qt4.dylib]} {
-    depends_lib-delete port:poppler
-    pre-configure {
-        ui_error "
-****
-**** ${name} requires port poppler installed with the variants +qt4 +quartz.
-**** Please do the following then try installing ${name} again:
-****
-****     sudo port install poppler +qt4 +quartz
-****
-
-"
-        return -code error "incompatible poppler installation"
-    }
-}
-
 pre-patch {
     # DOS to UNIX line endings so we can patch
     reinplace "s|\r||g" ${worksrcpath}/texstudio.pro

Modified: trunk/dports/kde/okular/Portfile
===================================================================
--- trunk/dports/kde/okular/Portfile	2014-01-15 16:31:13 UTC (rev 115965)
+++ trunk/dports/kde/okular/Portfile	2014-01-15 16:51:19 UTC (rev 115966)
@@ -29,19 +29,12 @@
 
 depends_lib-append  port:kdelibs4 \
                     port:oxygen-icons \
-                    port:poppler port:libspectre \
+                    port:poppler-qt4-mac 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+)+)

Modified: trunk/dports/python/py-python-poppler-qt4/Portfile
===================================================================
--- trunk/dports/python/py-python-poppler-qt4/Portfile	2014-01-15 16:31:13 UTC (rev 115965)
+++ trunk/dports/python/py-python-poppler-qt4/Portfile	2014-01-15 16:51:19 UTC (rev 115966)
@@ -3,7 +3,6 @@
 
 PortSystem              1.0
 PortGroup               python 1.0
-PortGroup               active_variants 1.1
 
 set original_name       python-poppler-qt4
 name                    py-${original_name}
@@ -27,13 +26,11 @@
     depends_build-append    port:pkgconfig
 
     # Can use either py*-pyqt4 or py*-pyqt4-devel.
-    depends_lib-append      port:poppler \
+    depends_lib-append      port:poppler-qt4-mac \
                             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}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140115/e9eb6a89/attachment.html>