[112747] trunk/dports/graphics/lib2geom

30 Oct 2013

Revision: 112747
          https://trac.macports.org/changeset/112747
Author:   devans@macports.org
Date:     2013-10-30 14:59:26 -0700 (Wed, 30 Oct 2013)
Log Message:
-----------
lib2geom: update to recent bzr revision, use cmake PortGroup, disable broken test code, builds using clang and Mavericks.

Modified Paths:
--------------
    trunk/dports/graphics/lib2geom/Portfile
    trunk/dports/graphics/lib2geom/files/patch-src-2geom-CMakeLists.txt.diff

Added Paths:
-----------
    trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff

Removed Paths:
-------------
    trunk/dports/graphics/lib2geom/files/patch-src-2geom-toys-CMakeLists.txt.diff

Modified: trunk/dports/graphics/lib2geom/Portfile
===================================================================

--- trunk/dports/graphics/lib2geom/Portfile	2013-10-30 21:57:43 UTC (rev 112746)
+++ trunk/dports/graphics/lib2geom/Portfile	2013-10-30 21:59:26 UTC (rev 112747)
@@ -1,11 +1,12 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem      1.0
+PortGroup       cmake 1.0
 
 name            lib2geom
-version         0.2.0
-revision        1
+version         0.3
+revision        2137
 license         {LGPL-2.1 MPL-1.1}
 maintainers     devans openmaintainer
 categories      graphics
@@ -19,38 +20,21 @@
                 will provide a robust 2D computational geometry framework for any application. It is not a \
                 rendering library, but instead concentrates on high level algorithms such as computing arc length.
 
-master_sites    sourceforge
-checksums       md5     983941e4b115a3af9ee95ab2d9cc35e5 \
-                sha1    c0fc2c50e14dba98753400c75241585fda026960 \
-                rmd160  f861adb5f7b308dc6197175c8beecfa6682ba42e
+fetch.type      bzr
+bzr.url         lp:lib2geom
+bzr.revision    ${revision}
 
-depends_build   port:cmake \
-                port:pkgconfig
+depends_build   port:pkgconfig
 
 depends_lib     port:gtkmm \
                 port:boost \
                 port:libpng \
                 port:gsl
 
-patchfiles      patch-src-2geom-CMakeLists.txt.diff \
-                patch-src-2geom-toys-CMakeLists.txt.diff
+patchfiles      patch-CMakeLists.txt.diff \
+                patch-src-2geom-CMakeLists.txt.diff
 
-# TODO: Fix buggy C++ code that clang complains about
-compiler.blacklist *clang*
+configure.args-append \
+		-D2GEOM_BUILD_SHARED=YES
 
-platform darwin {
-    if {${os.major} >= 13} {
-        depends_lib
-        depends_run
-        pre-fetch {
-            ui_error "$name does not build on Mavericks or later."
-            error "unsupported platform"
-        }
-    }
-}
-
-configure.cmd   cmake
-configure.args   -Wno-dev -DCMAKE_INSTALL_PREFIX=${prefix} -D2GEOM_BUILD_SHARED=YES
-configure.post_args ${worksrcpath}
-
-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
+livecheck       none

Added: trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff	2013-10-30 21:59:26 UTC (rev 112747)
@@ -0,0 +1,20 @@
+--- CMakeLists.txt.orig	2013-10-30 14:42:50.000000000 -0700
++++ CMakeLists.txt	2013-10-30 14:44:28.000000000 -0700
+@@ -30,7 +30,7 @@
+ ENDIF(pycairo_FOUND) 
+ 
+ # Set Compiler Flags
+-SET(CXX_WARNINGS_FLAGS "-Wall -Wformat -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch -Werror=return-type")
++SET(CXX_WARNINGS_FLAGS "-Wall -Wformat -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch -Wreturn-type")
+ 
+ # enable C++11  (the required flag may depend on your compiler...
+ #IF(CMAKE_COMPILER_IS_GNUCXX)
+@@ -75,7 +75,7 @@
+ ADD_CUSTOM_TARGET(uninstall
+   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ 
+-ADD_SUBDIRECTORY (src/gtest)
++#ADD_SUBDIRECTORY (src/gtest)
+ ADD_SUBDIRECTORY (src/2geom)
+ 
+ # install config.h

Modified: trunk/dports/graphics/lib2geom/files/patch-src-2geom-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/lib2geom/files/patch-src-2geom-CMakeLists.txt.diff	2013-10-30 21:57:43 UTC (rev 112746)
+++ trunk/dports/graphics/lib2geom/files/patch-src-2geom-CMakeLists.txt.diff	2013-10-30 21:59:26 UTC (rev 112747)
@@ -1,6 +1,6 @@
---- src/2geom/CMakeLists.txt.orig	2008-10-28 14:57:57.000000000 -0700
-+++ src/2geom/CMakeLists.txt	2008-10-28 15:00:32.000000000 -0700
-@@ -162,7 +162,7 @@
+--- src/2geom/CMakeLists.txt.orig	2013-10-30 14:41:47.000000000 -0700
++++ src/2geom/CMakeLists.txt	2013-10-30 14:42:59.000000000 -0700
+@@ -163,9 +163,9 @@
  CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/2geom.pc.in
                  ${CMAKE_BINARY_DIR}/2geom.pc @ONLY IMMEDIATE )
  INSTALL(FILES "${CMAKE_BINARY_DIR}/2geom.pc" DESTINATION lib/pkgconfig)
@@ -11,3 +11,5 @@
 +#ADD_SUBDIRECTORY (tests)
 +#ADD_SUBDIRECTORY (py2geom)
  
+ 
+ 

Deleted: trunk/dports/graphics/lib2geom/files/patch-src-2geom-toys-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/lib2geom/files/patch-src-2geom-toys-CMakeLists.txt.diff	2013-10-30 21:57:43 UTC (rev 112746)
+++ trunk/dports/graphics/lib2geom/files/patch-src-2geom-toys-CMakeLists.txt.diff	2013-10-30 21:59:26 UTC (rev 112747)
@@ -1,11 +0,0 @@
---- src/2geom/toys/CMakeLists.txt.orig	2008-10-28 09:32:26.000000000 -0700
-+++ src/2geom/toys/CMakeLists.txt	2008-10-28 09:33:01.000000000 -0700
-@@ -27,7 +27,7 @@
- convex-toy
- curvature-test
- curve-curve-distance
--curve-curve-nearest-point-3
-+#curve-curve-nearest-point-3
- curve-intersection-by-bezier-clipping
- curve-intersection-by-implicitization
- d2sbasis-fitting

    

devans＠macports.org

tags

participants (1)