cad/gmsh update to version 2.4.2 Fix: This is a major update because gmsh has switched from configure to cmake. Please delete gmsh/files/patch-configure # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # gmsh/files/patch-CMakeLists.txt # gmsh/files/patch-Solver::linearSystemCSR.cpp # echo x - gmsh/files/patch-CMakeLists.txt sed 's/^X//' >gmsh/files/patch-CMakeLists.txt << '19cf35e0941cfdbf43861f4ccc0e3f8a' X--- CMakeLists.txt.orig 2009-09-21 13:54:49.000000000 -0500 X+++ CMakeLists.txt 2010-01-02 16:31:27.000000000 -0600 X@@ -41,6 +41,7 @@ X option(ENABLE_TAUCS "Enable Taucs linear algebra solver" ON) X option(ENABLE_TETGEN "Enable Tetgen mesh generator" ON) X option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF) X+option(INSTALL_DOCS "Install the docs (FreeBSD only)" ON) X X set(GMSH_MAJOR_VERSION 2) X set(GMSH_MINOR_VERSION 4) X@@ -478,13 +479,17 @@ X if(ENABLE_TAUCS) X find_library(TAUCS_LIB taucs) X if(TAUCS_LIB) X- find_path(TAUCS_INC "taucs.h" PATH_SUFFIXES src include) X- if(TAUCS_INC) X- set(HAVE_TAUCS TRUE) X- list(APPEND CONFIG_OPTIONS "Taucs") X- list(APPEND EXTERNAL_LIBRARIES ${TAUCS_LIB}) X- list(APPEND EXTERNAL_INCLUDES ${TAUCS_INC}) X- endif(TAUCS_INC) X+ find_library(COMPAT_LIB compat) X+ if (COMPAT_LIB) X+ find_path(TAUCS_INC "taucs.h" PATH_SUFFIXES src include) X+ if(TAUCS_INC) X+ set(HAVE_TAUCS TRUE) X+ list(APPEND CONFIG_OPTIONS "Taucs") X+ list(APPEND EXTERNAL_LIBRARIES ${TAUCS_LIB}) X+ list(APPEND EXTERNAL_LIBRARIES ${COMPAT_LIB}) X+ list(APPEND EXTERNAL_INCLUDES ${TAUCS_INC}) X+ endif(TAUCS_INC) X+ endif(COMPAT_LIB) X endif(TAUCS_LIB) X endif(ENABLE_TAUCS) X X@@ -518,7 +523,7 @@ X list(LENGTH OCC_LIBS NUM_OCC_LIBS) X if(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED) X find_path(OCC_INC "BRep_Tool.hxx" PATHS ENV CASROOT PATH_SUFFIXES inc X- include opencascade) X+ include opencascade OpenCAS/ros/inc) X if(OCC_INC) X set(HAVE_OCC TRUE) X list(APPEND CONFIG_OPTIONS "OpenCascade") X@@ -762,13 +767,15 @@ X install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL) X install(TARGETS lib shared DESTINATION lib OPTIONAL) X install(FILES ${GMSH_API} DESTINATION include/gmsh) X-install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt) X-install(FILES ${LICENSE_FILE} DESTINATION ${GMSH_DOC}) X-install(FILES ${CREDITS_FILE} DESTINATION ${GMSH_DOC}) X-install(FILES ${TUTORIAL_FILES} DESTINATION ${GMSH_DOC}/tutorial) X-install(FILES ${DEMO_FILES} DESTINATION ${GMSH_DOC}/demos) X+if(INSTALL_DOCS) X+ install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt) X+ install(FILES ${LICENSE_FILE} DESTINATION ${GMSH_DOC}) X+ install(FILES ${CREDITS_FILE} DESTINATION ${GMSH_DOC}) X+ install(FILES ${TUTORIAL_FILES} DESTINATION ${GMSH_DOC}/tutorial) X+ install(FILES ${DEMO_FILES} DESTINATION ${GMSH_DOC}/demos) X+endif(INSTALL_DOCS) X if(UNIX AND NOT CYGWIN) X- install(FILES ${CMAKE_SOURCE_DIR}/doc/gmsh.1 DESTINATION share/man/man1) X+ install(FILES ${CMAKE_SOURCE_DIR}/doc/gmsh.1 DESTINATION man/man1) X endif(UNIX AND NOT CYGWIN) X X find_program(MAKEINFO makeinfo) 19cf35e0941cfdbf43861f4ccc0e3f8a echo x - gmsh/files/patch-Solver::linearSystemCSR.cpp sed 's/^X//' >gmsh/files/patch-Solver::linearSystemCSR.cpp << '476cde06d9d6582e5eb586e4d7670a01' X--- Solver/linearSystemCSR.cpp.orig 2010-01-02 16:10:27.000000000 -0600 X+++ Solver/linearSystemCSR.cpp 2010-01-02 16:10:40.000000000 -0600 X@@ -245,7 +245,7 @@ X } X X template <class scalar> X-static void sortColumns(int NbLines, X+void sortColumns(int NbLines, X int nnz, X INDEX_TYPE *ptr, X INDEX_TYPE *jptr, 476cde06d9d6582e5eb586e4d7670a01 exit
Maintainer of cad/gmsh, Please note that PR ports/142360 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/142360 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
For some reason, this PR is taking the longest time to appear on the web site. [bugmeister note: this was due to a GNATS index error, now fixed.] If this is the PR I submitted earlier today, then of course I approve.
Synopsis: Re: ports/142360: cad/gmsh update to version 2.4.2 State-Changed-From-To: open->closed State-Changed-By: linimon State-Changed-When: Tue Jan 5 21:03:41 UTC 2010 State-Changed-Why: Misfiled followup to ports/142360 due to GNATS index error; content migrated. Responsible-Changed-From-To: gnats-admin->freebsd-ports-bugs Responsible-Changed-By: linimon Responsible-Changed-When: Tue Jan 5 21:03:41 UTC 2010 Responsible-Changed-Why: http://www.freebsd.org/cgi/query-pr.cgi?pr=142361
I see what the problem was. I put in my email address incorrectly. Can you change the email address of the originator of the PR to stephen@missouri.edu? Thanks, Stephen
Responsible Changed From-To: freebsd-ports-bugs->pgollucci I'll take it.
Responsible Changed From-To: pgollucci->freebsd-ports-bugs I don't do java
The only reason you need java is to build the opencascade dependency, which is only required if WITH_OCC is set, or the slave port gmsh-occ is built. I found that opencascade builds flawlessly with diablo-jdk16 which takes only minutes to install.
State Changed From-To: open->closed Committed, thanks!
pav 2010-01-13 12:47:20 UTC FreeBSD ports repository Modified files: cad/gmsh Makefile distinfo pkg-plist cad/gmsh/files patch-Common::DefaultOptions.h Added files: cad/gmsh/files patch-CMakeLists.txt patch-Solver::linearSystemCSR.cpp Removed files: cad/gmsh/files patch-configure Log: - Update to 2.4.2 PR: ports/142360 Submitted by: Stephen Montgomery-Smith <stephen@missouri.edu> (maintainer) Revision Changes Path 1.81 +115 -98 ports/cad/gmsh/Makefile 1.46 +6 -3 ports/cad/gmsh/distinfo 1.1 +66 -0 ports/cad/gmsh/files/patch-CMakeLists.txt (new) 1.2 +6 -6 ports/cad/gmsh/files/patch-Common::DefaultOptions.h 1.1 +11 -0 ports/cad/gmsh/files/patch-Solver::linearSystemCSR.cpp (new) 1.8 +0 -38 ports/cad/gmsh/files/patch-configure (dead) 1.17 +115 -40 ports/cad/gmsh/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"