[137820] trunk/dports/gis/mapnik/Portfile

[stromnov at macports.org]

Revision: 137820
          https://trac.macports.org/changeset/137820
Author:   stromnov at macports.org
Date:     2015-06-20 13:46:36 -0700 (Sat, 20 Jun 2015)
Log Message:
-----------
mapnik: update to version 3.0.0-rc3

Modified Paths:
--------------
    trunk/dports/gis/mapnik/Portfile

Modified: trunk/dports/gis/mapnik/Portfile
===================================================================
--- trunk/dports/gis/mapnik/Portfile	2015-06-20 19:26:29 UTC (rev 137819)
+++ trunk/dports/gis/mapnik/Portfile	2015-06-20 20:46:36 UTC (rev 137820)
@@ -5,7 +5,7 @@
 PortGroup           cxx11 1.0
 PortGroup           github 1.0
 
-github.setup        mapnik mapnik 3.0.0-rc2 v
+github.setup        mapnik mapnik 3.0.0-rc3 v
 revision            0
 categories          gis devel
 license             LGPL-2.1
@@ -28,8 +28,8 @@
 
 homepage            http://mapnik.org
 
-checksums           rmd160  608071712cd81745a3a6d0abeb4c052603802eb0 \
-                    sha256  b5f014ad703031760723ebc86b894bc8cefa552d153ca62964c00915fcda7d8e
+checksums           rmd160  72d3217db9f3ad48ec998ff592887f502df1121d \
+                    sha256  73669a9bd4a7ee1630350d95be848d6fd0721ac69a87e6683d648f1bb03b88eb
 
 depends_build       port:pkgconfig
 
@@ -45,46 +45,12 @@
                     port:libxml2 \
                     port:proj
 
-set python_suffixes {27 34}
-set python_ports {}
-foreach s ${python_suffixes} {
-    lappend python_ports python${s}
-}
-foreach s ${python_suffixes} {
-    set p python${s}
-    set v [string index ${s} 0].[string index ${s} 1]
-    set i [lsearch -exact ${python_ports} ${p}]
-    set c [lreplace ${python_ports} ${i} ${i}]
-    eval [subst {
-        variant ${p} conflicts ${c} description {Build Python bindings} {
-            depends_lib-append      port:${p}
-            configure.args-delete   BINDINGS=none
-            configure.args-append   BINDINGS=python
-            configure.args-append   PYTHON=${prefix}/bin/python${v}
-        }
-    }]
-}
+set input_plugins {shape csv raster geojson topojson}
 
-proc python_branch {} {
-    global python_suffixes
-    foreach s ${python_suffixes} {
-        if {[variant_isset python${s}]} { return ${s} }
-    }
-    error "Python support not enabled."
-}
-
-set input_plugins {shape geojson raster csv}
-
 variant cairo description {Enable Cairo support for PDF, PostScript, and SVG} {
     configure.args-delete   CAIRO=False
     configure.args-append   CAIRO=True
     depends_lib-append      path:lib/pkgconfig/cairo.pc:cairo
-    if {![catch {set s [python_branch]}]} {
-        set pf Python.framework/Versions/[string index ${s} 0].[string index ${s} 1]
-        depends_lib-append  port:py${s}-cairo
-        configure.args-append PKG_CONFIG_PATH=${frameworks_dir}/${pf}/lib/pkgconfig
-        lappend input_plugins python
-    }
 }
 
 variant gdal description {Build GDAL/OGR plugin} {
@@ -111,21 +77,11 @@
     lappend input_plugins sqlite
 }
 
-if {![variant_isset python34]} {
-    default_variants    +python27
-}
-
 universal_variant   no
 
 configure.pkg_config ${prefix}/bin/pkg-config
 
-if {[variant_isset python27]} {
-    configure.python    ${prefix}/bin/python2.7
-} elseif {[variant_isset python34]} {
-    configure.python    ${prefix}/bin/python3.4
-} else {
-    configure.python    /usr/bin/python
-}
+configure.python    /usr/bin/python
 
 build.cmd           ${configure.python} scons/scons.py
 build.pre_args
@@ -142,7 +98,6 @@
                     DESTDIR=${destroot} \
                     CAIRO=False \
                     CPP_TESTS=False \
-                    FRAMEWORK_PYTHON=False \
                     BINDINGS=none \
                     JOBS=${build.jobs} \
                     FREETYPE_CONFIG=${prefix}/bin/freetype-config \
@@ -155,50 +110,6 @@
 destroot.destdir
 
 pre-configure {
-    # Hack to check for correct boost variant
-    if {![catch {set pys [python_branch]}]} {
-        set boost_py ${prefix}/lib/libboost_python-mt.dylib
-        if {![file exists ${boost_py}]} {
-            ui_error "
-****
-**** Your current boost does not have Python support. Please reinstall
-**** boost before trying ${name} +python${pys} again:
-****
-****     sudo port install boost +python${pys}
-****
-"
-            return -code error "Boost.Python missing"
-        }
-        regexp {Python\.framework/Versions/([[:digit:]]\.[[:digit:]])} \
-          [exec /usr/bin/otool -L ${boost_py}] foo bpv
-        if {[set bps [string replace ${bpv} 1 1]] != ${pys}} {
-            if {${bps} ni ${python_suffixes}} {
-                ui_error "
-****
-**** Your current boost is incompatible with ${name} +python${pys}.
-**** Please install the boost variant that matches ${name}:
-****
-****     sudo port install boost +python${pys}
-****
-"
-                return -code error "Incompatible Boost.Python"
-            }
-            ui_error "
-****
-**** ${name} +python${pys} is incompatible with your current boost.
-**** Please install the ${name} variant that matches boost +python${bps}:
-****
-****     sudo port install ${name} +python${bps}
-****
-**** or install the boost variant that matches ${name} +python${pys}:
-****
-****     sudo port install boost +python${pys}
-****
-"
-            return -code error "Incompatible Boost.Python"
-        }
-    }
-
     # Must be evaluated after the variants
     configure.args-append   INPUT_PLUGINS=[join ${input_plugins} ","]
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150620/7c236a2e/attachment.html>