[110652] trunk/dports/science

[jeremyhu at macports.org]

Revision: 110652
          https://trac.macports.org/changeset/110652
Author:   jeremyhu at macports.org
Date:     2013-09-02 18:42:11 -0700 (Mon, 02 Sep 2013)
Log Message:
-----------
gmsh*: Update to current versions to build with clang

Modified Paths:
--------------
    trunk/dports/science/gmsh/Portfile
    trunk/dports/science/gmsh-devel/Portfile

Removed Paths:
-------------
    trunk/dports/science/gmsh/files/patch-cmakelists.diff

Modified: trunk/dports/science/gmsh/Portfile
===================================================================
--- trunk/dports/science/gmsh/Portfile	2013-09-03 01:37:21 UTC (rev 110651)
+++ trunk/dports/science/gmsh/Portfile	2013-09-03 01:42:11 UTC (rev 110652)
@@ -6,8 +6,7 @@
 
 name                gmsh
 conflicts           gmsh-devel
-version             2.5.0
-revision            2
+version             2.8.2
 categories          science
 platforms           darwin
 license             GPL-2+
@@ -25,27 +24,24 @@
 distname            gmsh-${version}-source
 extract.suffix      .tgz
 
-checksums           \
-                          sha1    b541fd9f1aadf1df7bf6fdd97a68ca41966ffeb6 \
-                          rmd160  49ab2054d546e4549250119cec0453cd1cdfffef
+checksums           sha1    1b1d3933738eee22da928c26e664ef8aa430b7c6 \
+                    rmd160  fb9a22810cacefda19da115101e789ff7d5eea50
 
-patchfiles          patch-cmakelists.diff \
-                    patch-Graphics-gl2png.cpp.diff
+#patchfiles          patch-Graphics-gl2png.cpp.diff
 
-# https://trac.macports.org/ticket/33925
-compiler.blacklist  clang
+# TODO: Fix these missing includes in the appropriate files
+configure.cxxflags-append -include /usr/include/stdlib.h
 
 configure.args-append \
-    -DENABLE_NATIVE_FILE_CHOOSER:BOOL=OFF\
-    -DENABLE_OCC:BOOL=OFF \
-    -DENABLE_FLTK:BOOL=ON\
-    -DENABLE_GRAPHICS:BOOL=ON
+    -DENABLE_OS_SPECIFIC_INSTALL=OFF \
+    -DENABLE_NATIVE_FILE_CHOOSER=OFF \
+    -DENABLE_OCC=OFF \
+    -DENABLE_FLTK=ON \
+    -DENABLE_GRAPHICS=ON \
+    -DENABLE_APP_BUNDLE=OFF \
+    -DENABLE_METIS=OFF \
+    -DENABLE_TAUCS=OFF
 
-post-build {
-    # lib and shared targets are not handled by default target
-    system "cd ${worksrcpath} && make lib shared"
-}
-
 depends_lib  \
     port:mesa \
     port:libpng \

Deleted: trunk/dports/science/gmsh/files/patch-cmakelists.diff
===================================================================
--- trunk/dports/science/gmsh/files/patch-cmakelists.diff	2013-09-03 01:37:21 UTC (rev 110651)
+++ trunk/dports/science/gmsh/files/patch-cmakelists.diff	2013-09-03 01:42:11 UTC (rev 110652)
@@ -1,30 +0,0 @@
---- CMakeLists.txt.orig	2011-05-04 14:40:19.000000000 +0200
-+++ CMakeLists.txt	2011-05-04 14:41:33.000000000 +0200
-@@ -955,9 +955,9 @@
-   # set these so that the files get installed nicely in the MacOSX
-   # .app bundle (FIXME: this screws up a standard "make install" on
-   # MacOS)
--  set(GMSH_BIN ../MacOS)
--  set(GMSH_DOC ../../..)
--  set(GMSH_MAN ../../..)
-+  set(GMSH_BIN bin)
-+  set(GMSH_DOC share/doc/gmsh)
-+  set(GMSH_MAN share/man/man1)
- else(WIN32)
-   set(GMSH_BIN bin)
-   set(GMSH_DOC share/doc/gmsh)
-@@ -1057,11 +1057,11 @@
-   file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist "${F1}")
-   set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
-   set(CPACK_BUNDLE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIcons.icns)
--  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsGeo.icns DESTINATION .
-+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsGeo.icns DESTINATION share/gmsh
-           RENAME GmshGeo.icns)
--  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION .
-+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION share/gmsh
-           RENAME GmshMsh.icns)
--  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsPos.icns DESTINATION .
-+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsPos.icns DESTINATION share/gmsh
-           RENAME GmshPos.icns)
-   set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIcons.icns)
- elseif(WIN32)

Modified: trunk/dports/science/gmsh-devel/Portfile
===================================================================
--- trunk/dports/science/gmsh-devel/Portfile	2013-09-03 01:37:21 UTC (rev 110651)
+++ trunk/dports/science/gmsh-devel/Portfile	2013-09-03 01:42:11 UTC (rev 110652)
@@ -8,13 +8,12 @@
 fetch.user          gmsh
 fetch.password      gmsh
 svn.url             https://geuz.org/svn/gmsh/trunk
-svn.revision        12036
+svn.revision        16565
 svn.method          export
 svn.post_args       --username ${fetch.user} --password ${fetch.password}
 
 name                gmsh-devel
-version             2.5.1-svn-${svn.revision}
-revision            2
+version             2.8.2-svn-${svn.revision}
 categories          science
 platforms           darwin
 license             GPL-2+
@@ -31,23 +30,19 @@
 worksrcdir          trunk
 conflicts           gmsh
 
-# https://trac.macports.org/ticket/33925
-compiler.blacklist  clang
+# TODO: Fix these missing includes in the appropriate files
+configure.cxxflags-append -include /usr/include/stdlib.h
 
 configure.args-append \
-    -DENABLE_NATIVE_FILE_CHOOSER:BOOL=OFF\
-    -DENABLE_OCC:BOOL=OFF \
-    -DENABLE_FLTK:BOOL=ON\
-    -DENABLE_GRAPHICS:BOOL=ON\
+    -DENABLE_OS_SPECIFIC_INSTALL=OFF \
+    -DENABLE_NATIVE_FILE_CHOOSER=OFF \
+    -DENABLE_OCC=OFF \
+    -DENABLE_FLTK=ON \
+    -DENABLE_GRAPHICS=ON \
     -DENABLE_APP_BUNDLE=OFF \
     -DENABLE_METIS=OFF \
     -DENABLE_TAUCS=OFF
 
-post-build {
-    # lib and shared targets are not handled by default target
-    system "cd ${worksrcpath} && make lib shared"
-}
-
 depends_lib  \
     port:mesa \
     port:libpng \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130902/29d847a0/attachment.html>