[136208] trunk/dports/devel/cableswig

larryv at macports.org larryv at macports.org
Mon May 11 16:48:23 PDT 2015


Revision: 136208
          https://trac.macports.org/changeset/136208
Author:   larryv at macports.org
Date:     2015-05-11 16:48:23 -0700 (Mon, 11 May 2015)
Log Message:
-----------
cableswig: Update to 4.0

Also:
- Fetch with Git.
- Force compiler to use C90 mode (#39359).
- Patch build to stop mistaking "clang" for "CL.EXE".

Modified Paths:
--------------
    trunk/dports/devel/cableswig/Portfile

Added Paths:
-----------
    trunk/dports/devel/cableswig/files/
    trunk/dports/devel/cableswig/files/no-windows-compilers.patch

Modified: trunk/dports/devel/cableswig/Portfile
===================================================================
--- trunk/dports/devel/cableswig/Portfile	2015-05-11 23:48:21 UTC (rev 136207)
+++ trunk/dports/devel/cableswig/Portfile	2015-05-11 23:48:23 UTC (rev 136208)
@@ -5,10 +5,7 @@
 PortGroup           cmake 1.0
 
 name                cableswig
-version             20090521
-# CableSwig is only available from cvs and there are no release tags, using date
-# of cvs checkout for the version number.
-
+version             4.0
 categories          devel
 platforms           darwin
 maintainers         nomaintainer
@@ -36,17 +33,17 @@
                         port:gawk \
                         port:gmake
 
-fetch.type          cvs
-cvs.root            :pserver:anonymous at public.kitware.com:/cvsroot/CableSwig
-cvs.module          CableSwig
-cvs.date            "21-May-2009"
+fetch.type              git
+git.url                 git://itk.org/CableSwig.git
+git.branch              ITK-${version}
 
-post-extract {
-    move ${workpath}/CableSwig ${worksrcpath}
-}
+worksrcdir              CableSwig
 
+patchfiles              no-windows-compilers.patch
+
 cmake.out_of_source     yes
 
+configure.cflags-append -std=c90
 configure.args-append   -DBISON_YACC:FILEPATH=${prefix}/bin/bison \
                         -DBUILD_TESTING:BOOL=OFF \
                         -DCMAKE_SKIP_RPATH:BOOL=OFF \

Added: trunk/dports/devel/cableswig/files/no-windows-compilers.patch
===================================================================
--- trunk/dports/devel/cableswig/files/no-windows-compilers.patch	                        (rev 0)
+++ trunk/dports/devel/cableswig/files/no-windows-compilers.patch	2015-05-11 23:48:23 UTC (rev 136208)
@@ -0,0 +1,25 @@
+This logic mistakes "clang" for "CL.EXE". Let's just cut out the Windows
+stuff entirely.
+Index: GCC/CMakeLists.txt
+===================================================================
+--- GCC/CMakeLists.txt.orig
++++ GCC/CMakeLists.txt
+@@ -23,18 +23,6 @@ IF(APPLE)
+ ENDIF(APPLE)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}")
+ 
+-IF(CMAKE_C_COMPILER MATCHES "cl")
+-  STRING(REGEX REPLACE "/W([0-4])?" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+-  SET(CMAKE_CXX_WARNING_LEVEL 0)
+-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W0")
+-ELSE(CMAKE_C_COMPILER MATCHES "cl")
+-  IF(CMAKE_C_COMPILER MATCHES "bcc32")
+-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-")
+-  ELSE(CMAKE_C_COMPILER MATCHES "bcc32")
+-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+-  ENDIF(CMAKE_C_COMPILER MATCHES "bcc32")
+-ENDIF(CMAKE_C_COMPILER MATCHES "cl")
+-
+ ADD_DEFINITIONS(-DALMOST_STDC)
+ 
+ SUBDIRS(config_cmake libiberty libdecnumber libcpp gcc)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150511/3d79bae4/attachment.html>


More information about the macports-changes mailing list