[106774] trunk/dports/net/libtorrent-rasterbar-devel

[devans at macports.org]

Revision: 106774
          https://trac.macports.org/changeset/106774
Author:   devans at macports.org
Date:     2013-06-07 11:55:49 -0700 (Fri, 07 Jun 2013)
Log Message:
-----------
libtorrent-rasterbar-devel: update to svn rev 8450, disable broken tests, fix configure, universal.

Revision Links:
--------------
    https://trac.macports.org/changeset/8450

Modified Paths:
--------------
    trunk/dports/net/libtorrent-rasterbar-devel/Portfile

Added Paths:
-----------
    trunk/dports/net/libtorrent-rasterbar-devel/files/patch-Makefile.am.diff

Modified: trunk/dports/net/libtorrent-rasterbar-devel/Portfile
===================================================================
--- trunk/dports/net/libtorrent-rasterbar-devel/Portfile	2013-06-07 18:40:34 UTC (rev 106773)
+++ trunk/dports/net/libtorrent-rasterbar-devel/Portfile	2013-06-07 18:55:49 UTC (rev 106774)
@@ -2,10 +2,12 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       muniversal 1.0
+PortGroup       active_variants 1.1
 
 name            libtorrent-rasterbar-devel
 conflicts       libtorrent-rasterbar
-set svn_rev     8217
+set svn_rev     8450
 version         0.16.99.${svn_rev}
 license         permissive
 categories      net
@@ -35,30 +37,14 @@
                 port:libgeoip \
                 port:openssl
 
-patchfiles      patch-bindings-python-setup.py.in.diff
+patchfiles      patch-Makefile.am.diff \
+                patch-bindings-python-setup.py.in.diff
 
 post-patch      {
                     reinplace "s|__MP_BUILD_ARCH__|${build_arch}|" ${worksrcpath}/bindings/python/setup.py.in
                 }
 
-#
-# Make sure that boost is installed with the correct Python variant
-#
-
-pre-configure {
-    set boost_python_lib ${prefix}/lib/libboost_python-mt.dylib
-    set boost_python_version "0"
-    if {[file exists ${boost_python_lib}]} {
-        set boost_python_version [exec /usr/bin/otool -L ${boost_python_lib} | /usr/bin/grep Python | /usr/bin/sed -e "s|^.*Versions/||" -e "s|/.*||"]
-    }
-    if {${boost_python_version} != ${boost_python_required}} {
-            ui_error "This port requires 'boost ${boost_variant}'. Please install as follows:"
-            ui_error "    sudo port install boost ${boost_variant}"
-            return -code error
-    }
-}
-
-configure.cmd   ./autotool.sh && ./configure
+configure.cmd   ./bootstrap.sh
 configure.args  --disable-silent-rules \
                 --enable-python-binding \
                 --enable-geoip \
@@ -67,29 +53,28 @@
                 --with-boost-python="boost_python-mt"
 
 variant python26 conflicts python27 description {Build bindings for Python 2.6} {
+        require_active_variants boost python26
         depends_lib-append port:python26
         configure.python ${prefix}/bin/python2.6
         configure.env-append \
-                "PYTHON_INSTALL_PARAMS=--prefix=${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.6"
+                "PYTHON_INSTALL_PARAMS=--prefix=${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.6" \
+                "PYTHON_EXTRA_LDFLAGS=' '"
 }
 
 variant python27 conflicts python26 description {Build bindings for Python 2.7} {
+        require_active_variants boost python27
         depends_lib-append port:python27
         configure.python ${prefix}/bin/python2.7
         configure.env-append \
-                "PYTHON_INSTALL_PARAMS=--prefix=${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.7"
+                "PYTHON_INSTALL_PARAMS=--prefix=${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.7" \
+                "PYTHON_EXTRA_LDFLAGS=' '"
 }
 
 variant error_logging description {Enable logging of errors to disk} {
-    configure.args-append --enable-logging=errors
+        configure.args-append --enable-logging=errors
 }
 
-if {[variant_isset python26]} {
-        set boost_python_required 2.6
-        set boost_variant         +python26
-} else {
-        set boost_python_required 2.7
-        set boost_variant         +python27
+if {![variant_isset python26]} {
         default_variants          +python27
 }
 

Added: trunk/dports/net/libtorrent-rasterbar-devel/files/patch-Makefile.am.diff
===================================================================
--- trunk/dports/net/libtorrent-rasterbar-devel/files/patch-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/net/libtorrent-rasterbar-devel/files/patch-Makefile.am.diff	2013-06-07 18:55:49 UTC (rev 106774)
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2013-06-07 10:52:19.000000000 -0700
++++ Makefile.am	2013-06-07 10:52:39.000000000 -0700
+@@ -2,7 +2,7 @@
+ 
+ #DISTCHECK_CONFIGURE_FLAGS = --enable-tests
+ 
+-SUBDIRS = include/libtorrent src examples test bindings tools
++SUBDIRS = include/libtorrent src examples bindings tools
+ 
+ DOCS_IMAGES = \
+   docs/arctic_thumb.png           \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130607/cdcfe775/attachment.html>