Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20952/10.7/stable/main/finkinfo/sci
Modified Files:
gmsh-2.6.0.info gmsh.info gmsh.patch gmsh2.5.0-shlibs.info
Added Files:
gmsh-2.6.1.info gmsh-2.6.patch
Log Message:
New upstream. Remove METIS and TETGEN from older versions, since their
licenses are too restrictive (no commercial use).
--- NEW FILE: gmsh-2.6.patch ---
diff -Nurd gmsh-2.6.0-source/CMakeLists.txt
gmsh-2.6.0-source.patched/CMakeLists.txt
--- gmsh-2.6.0-source/CMakeLists.txt 2012-06-19 09:45:08.000000000 -0700
+++ gmsh-2.6.0-source.patched/CMakeLists.txt 2012-07-03 05:26:50.000000000
-0700
@@ -1145,9 +1145,9 @@
elseif(APPLE AND ENABLE_APP_BUNDLE)
# set these so that the files get installed nicely in the MacOSX
# .app bundle
- set(GMSH_BIN ../MacOS)
- set(GMSH_DOC ../../..)
- set(GMSH_MAN ../../..)
+ set(GMSH_BIN Gmsh.app/Contents/MacOS)
+ set(GMSH_DOC share/doc/gmsh)
+ set(GMSH_MAN share/man/man1)
else(WIN32 OR CYGWIN)
set(GMSH_BIN bin)
set(GMSH_DOC share/doc/gmsh)
@@ -1276,11 +1276,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
Gmsh.app/Contents/Resources
RENAME GmshGeo.icns)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION .
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION
Gmsh.app/Contents/Resources
RENAME GmshMsh.icns)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsPos.icns DESTINATION .
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsPos.icns DESTINATION
Gmsh.app/Contents/Resources
RENAME GmshPos.icns)
set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIcons.icns)
elseif(WIN32 OR CYGWIN)
Index: gmsh.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gmsh.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gmsh.patch 3 Jul 2012 16:05:13 -0000 1.3
+++ gmsh.patch 12 Mar 2013 01:13:51 -0000 1.4
@@ -1,8 +1,8 @@
-diff -Nurd gmsh-2.6.0-source/CMakeLists.txt
gmsh-2.6.0-source.patched/CMakeLists.txt
---- gmsh-2.6.0-source/CMakeLists.txt 2012-06-19 09:45:08.000000000 -0700
-+++ gmsh-2.6.0-source.patched/CMakeLists.txt 2012-07-03 05:26:50.000000000
-0700
-@@ -1145,9 +1145,9 @@
- elseif(APPLE AND ENABLE_APP_BUNDLE)
+diff -Nurd gmsh-2.7.0-source/CMakeLists.txt
gmsh-2.7.0-source.patched/CMakeLists.txt
+--- gmsh-2.7.0-source/CMakeLists.txt 2013-03-08 11:06:45.000000000 -0700
++++ gmsh-2.7.0-source.patched/CMakeLists.txt 2013-03-11 09:34:56.000000000
-0700
+@@ -1179,9 +1179,9 @@
+ elseif(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
# set these so that the files get installed nicely in the MacOSX
# .app bundle
- set(GMSH_BIN ../MacOS)
@@ -14,7 +14,7 @@
else(WIN32 OR CYGWIN)
set(GMSH_BIN bin)
set(GMSH_DOC share/doc/gmsh)
-@@ -1276,11 +1276,11 @@
+@@ -1315,13 +1315,13 @@
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)
@@ -24,6 +24,9 @@
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION
.
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION
Gmsh.app ontents/Resources * ré] ð* àò6ÿ Pó6ÿ uj] ð* ^ ð*
~ ð* xz ð* Pó6ÿ
ð* @è6ÿ ç6ÿ k] ð* 6
è è ! è ! àò6ÿ Pó6ÿ x4z
ð* @é6ÿ b] ð* ] ð* àò6ÿ `b] ð* ó6ÿ À/Þ
ð* uj] ð* Þ ð* Ø$Þ ð* ¨)Þ ð* ^ ð* x4z
ð* @é6ÿ è6ÿ k] ð* à! à! àò6ÿ Pó6ÿ HþY
ð*
ê6ÿ b] ð* ] ð* àò6ÿ `b] ð* ó6ÿ ó6ÿ ó6ÿ 8~ ð* p Pó6ÿ uj] ð* ^ ð*
ê6ÿ ðè6ÿ k] ð* G H I J K M N O P àò6ÿ Pó6ÿ Hµ0
ð* Àë6ÿ b] ð* ] ð* àò6ÿ 0/Þ
ð* uj] ð* @z ð* é
ð* Þ ð* Ø$Þ ð* ¨)Þ ð* ^ ð* Hµ0
ð* Àë6ÿ ê6ÿ k] ð* 8µ0
ð* Àë6ÿ 0ê6ÿ k] ð* (µ0
ð* Àë6ÿ `ê6ÿ k] ð* µ0
ð* Àë6ÿ ê6ÿ k] ð* ¨.Þ
ð* uj] ð* ¨)Þ ð* å6ÿ 8 ð* ei] ð* Ø$Þ
ð* 0ë6ÿ y8 ð* ei] ð* Þ ð* `ë6ÿ Z8
ð* ei] ð* Øä
ð* @z ð* é
ð* Þ ð* ØDz ð* Ø$Þ ð* ¨)Þ
ð* ^ ð* 8~ ð* Ù ð* Pó6ÿ p{
ð* í6ÿ àë6ÿ k] ð* 5 6 7 8 : < = > ? @ B D àò6ÿ Pó6ÿ
±Ö ð* Pó6ÿ uj] ð*
~ ð* ë6ÿ Ù ð* ei] ð*
~ ð* Õ_@f ÆS
Qöl±í ìÃ¥ ð* Pó6ÿ ±Ö ð*
î6ÿ ðì6ÿ k] ð* u]ÞÓ 4Q
÷U^Qʧ ¶uª¹ñìò*Ävàò6ÿ Pó6ÿ Hþ¢ ð* 0ð6ÿ b] ð* ] ð* àò6ÿ `b] ð* ó6ÿ ó6ÿ ó6ÿ Oz
ð* uj] ð* ØDz ð* Iz
ð* ^ ð* 0ð6ÿ àí6ÿ k] ð* 8þ¢ ð* 0ð6ÿ î6ÿ k/Contents/Resources
RENAME GmshMsh.icns)
+- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsSol.icns DESTINATION
.
++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsSol.icns DESTINATION
Gmsh.app/Contents/Resources
+ RENAME GmshSol.icns)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsPos.icns DESTINATION
.
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsPos.icns DESTINATION
Gmsh.app/Contents/Resources
RENAME GmshPos.icns)
Index: gmsh2.5.0-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gmsh2.5.0-shlibs.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gmsh2.5.0-shlibs.info 21 Jul 2012 13:36:18 -0000 1.11
+++ gmsh2.5.0-shlibs.info 12 Mar 2013 01:13:51 -0000 1.12
@@ -1,6 +1,6 @@
Package: gmsh2.5.0-shlibs
Version: 2.5.0
-Revision: 8
+Revision: 9
Depends: <<
fltk13-aqua-shlibs,
gmp5-shlibs,
@@ -41,7 +41,7 @@
#!/bin/sh -ev
mkdir build
cd build
-cmake -DCMAKE_PREFIX_PATH=%p -DCMAKE_INSTALL_PREFIX=%i ..
+cmake -DCMAKE_PREFIX_PATH=%p -DCMAKE_INSTALL_PREFIX=%i -DENABLE_METIS=no
-DENABLE_TETGEN=no ..
make verbose=1 shared
<<
@@ -107,6 +107,8 @@
appears indeed to be one. I implemented a patch which seemed to be
correct in
context.
This file is currently still unchanged in upstream's SVN.
+
+ No METIS or TETGEN support because of their license limitations.
<<
Splitoff: <<
@@ -123,4 +125,4 @@
DescUsage: <<
This package contains build-time files (headers and unversioned dylib).
<<
-<<
\ No newline at end of file
+<<
Index: gmsh.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gmsh.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gmsh.info 21 Jul 2012 13:36:18 -0000 1.11
+++ gmsh.info 12 Mar 2013 01:13:51 -0000 1.12
@@ -1,12 +1,12 @@
Package: gmsh
-Version: 2.6.1
+Version: 2.7.0
Revision: 1
Depends: <<
fltk13-aqua-shlibs,
gmp5-shlibs,
libjpeg8-shlibs,
- libpng14-shlibs,
+ libpng15-shlibs,
lua51-shlibs,
libncurses5-shlibs,
readline6-shlibs
@@ -16,7 +16,7 @@
fltk13-aqua,
gmp5,
libjpeg8,
- libpng14,
+ libpng15,
lua51-dev,
libncurses5,
readline6,
@@ -24,17 +24,16 @@
<<
Source: http://www.geuz.org/%n/src/%n-%v-source.tgz
-Source-MD5: 815511cad883db20b966ba0f773ab339
+Source-MD5: c47f8f7563d253412c635461a8fabefe
SourceDirectory: %n-%v-source
GCC: 4.0
PatchFile: %n.patch
-PatchFile-MD5: fa117d7ee3adb9f218ce08cb3f547819
+PatchFile-MD5: 39252d46b5c109feb22567af1f2e3cea
PatchScript: <<
%{default_script}
perl -pi -e 's|-framework vecLib|-framework Accelerate|' CMakeLists.txt
- perl -pi -e 's|return;|return NULL;|'
contrib/mmg3d/build/sources/ratio.c
<<
CompileScript: <<
@@ -43,10 +42,16 @@
cd build
cmake -DCMAKE_PREFIX_PATH=%p \
-DCMAKE_INSTALL_PREFIX=%i \
+ -DENABLE_METIS=no \
+ -DENABLE_TETGEN=no \
+ -DENABLE_BUILD_SHARED=yes \
+ -DENABLE_BUILD_LIB=yes \
-DENABLE_WRAP_PYTHON=no \
+ -DCMAKE_INSTALL_NAME_DIR=%p/lib \
..
make verbose=1
make verbose=1 shared
+make verbose=1 framework
make -j1 verbose=1 html
make -j1 verbose=1 info
make -j1 verbose=1 txt
@@ -70,12 +75,9 @@
cp -r %b/Gmsh.app/Contents/MacOS/%n %i/bin
chmod a+x %i/bin/%n
-# fix library up
-pushd %i/lib
-mv libGmsh.dylib libGmsh.%v.dylib
-ln -s libGmsh.%v.dylib libGmsh.dylib
-install_name_tool -id %p/lib/libGmsh.%v.dylib libGmsh.%v.dylib
-popd
+# manually install framework
+mkdir -p %i/Library/Frameworks
+cp -r %b/build/Gmsh.framework %i/Library/Frameworks/
# put texinfo file in proper location for Fink
mkdir -p %i/share/info
@@ -112,40 +114,48 @@
<<
DescPackaging: <<
Executable is built statically from the object files directly, rather
than
- via libraries, so there is no dependency on gmsh2.6.0-shlibs.
+ via libraries, so there is no dependency on gmsh2.7-shlibs.
Patch to install docs in their proper locations when using "make
install".
Thanks to Nicholas Taylor for the original form of the patch.
The app bundle build takes a lot of manual fiddling.
- Patch contrib/mmg3d/build/sources/ratio.c where a non-void function has
a
- return without a value.
-
Uses vecLib for BLAS. (we patch this to Accelerate)
It appears not to use Fink's ATLAS even when that's
installed, so no -atlas variant currently.
Python binding is currently disabled because the package tries to mix
Apple and
Fink Pythons.
+
+ No METIS or TETGEN support because of their license limitations.
<<
SplitOff: <<
- Package: %N2.6.1-shlibs
- Files: lib/libGmsh.%v.dylib
- Shlibs: %p/lib/libGmsh.%v.dylib 0.0.0 %n (>= 2.6.1-1)
+ Package: %N2.7-shlibs
+ Files: lib/libGmsh.*.dylib
+ Shlibs: %p/lib/libGmsh.2.7.dylib 2.7.0 %n (>= 2.7.0-1)
DocFiles: doc/LICENSE.txt
DescUsage: <<
This package contains a shared library.
<<
<<
SplitOff2: <<
- Package: %N2.6.1-dev
- Conflicts: %N2.5.0-dev, %N2.6.0-dev
- Replaces: %N2.5.0-dev, %N2.6.0-dev
+ Package: %N2.7-dev
+ Conflicts: %N2.5.0-dev, %N2.6.0-dev, %N2.6.1-dev
+ Replaces: %N2.5.0-dev, %N2.6.0-dev, %N2.6.1-dev
Files: include lib
BuildDependsOnly: true
DocFiles: doc/LICENSE.txt
DescUsage: <<
- This package contains build-time files (headers and unversioned
dylib).
+ This package contains build-time files (headers, unversioned
dylib).
<<
-<<
\ No newline at end of file
+<<
+SplitOff3: <<
+ Package: %N2.7-framework
+ Files: Library/Frameworks
+ BuildDependsOnly: true
+ DocFiles: doc/LICENSE.txt
+ DescUsage: <<
+ This package contains a framework which only has a static
library.
+ <<
+<<
--- NEW FILE: gmsh-2.6.1.info ---
Package: gmsh
Version: 2.6.1
Revision: 2
Depends: <<
fltk13-aqua-shlibs,
gmp5-shlibs,
libjpeg8-shlibs,
libpng14-shlibs,
lua51-shlibs,
libncurses5-shlibs,
readline6-shlibs
<<
BuildDepends: <<
cmake,
fltk13-aqua,
gmp5,
libjpeg8,
libpng14,
lua51-dev,
libncurses5,
readline6,
texinfo
<<
Source: http://www.geuz.org/%n/src/%n-%v-source.tgz
Source-MD5: 815511cad883db20b966ba0f773ab339
SourceDirectory: %n-%v-source
GCC: 4.0
PatchFile: %n-2.6.patch
PatchFile-MD5: fa117d7ee3adb9f218ce08cb3f547819
PatchScript: <<
%{default_script}
perl -pi -e 's|-framework vecLib|-framework Accelerate|' CMakeLists.txt
perl -pi -e 's|return;|return NULL;|'
contrib/mmg3d/build/sources/ratio.c
<<
CompileScript: <<
#!/bin/sh -ev
mkdir build
cd build
cmake -DCMAKE_PREFIX_PATH=%p \
-DCMAKE_INSTALL_PREFIX=%i \
-DENABLE_WRAP_PYTHON=no \
-DENABLE_METIS=no \
-DENABLE_TETGEN=no \
..
make verbose=1
make verbose=1 shared
make -j1 verbose=1 html
make -j1 verbose=1 info
make -j1 verbose=1 txt
<<
InstallScript: <<
#!/bin/sh -ev
pushd build
make install
#fix app bundle
# move app bundle back into build directory
mv %i/Gmsh.app %b
cp Info.plist %b/Gmsh.app/Contents
popd
cp %b/Fltk/MacIcons.icns %b/Gmsh.app/Contents/Resources/Gmsh.icns
# put a copy of the executable in %p/bin for e.g. the Octave Forge
# packages that expect a "gmsh" executable in the PATH.
mkdir -p %i/bin
cp -r %b/Gmsh.app/Contents/MacOS/%n %i/bin
chmod a+x %i/bin/%n
# fix library up
pushd %i/lib
mv libGmsh.dylib libGmsh.%v.dylib
ln -s libGmsh.%v.dylib libGmsh.dylib
install_name_tool -id %p/lib/libGmsh.%v.dylib libGmsh.%v.dylib
popd
# put texinfo file in proper location for Fink
mkdir -p %i/share/info
cp doc/texinfo/%n.info %i/share/info/
<<
DocFiles: doc/
InfoDocs: %n.info
AppBundles: Gmsh.app
Homepage: http://www.geuz.org/gmsh
Maintainer: Alexander Hansen <[email protected]>
License: GPL/LGPL
Description: 3D finite element mesh generator
DescDetail: <<
Gmsh is an automatic 3D finite element mesh generator (primarily
Delaunay) with build-in CAD and post-processing facilities. Its
design goal is to provide a simple meshing tool for academic test
cases with parametric input and up to date visualization
capabilities.
Gmsh is built around four modules: geometry, mesh, solver and
post-processing. The specification of any input to these modules is
done either interactively using the graphical user interface or in
ASCII text files using Gmsh's own scripting language.
See Gmsh's reference manual for a more thorough overview of Gmsh's
capabilities.
<<
DescUsage: <<
This package contains the '%n' executable, an app bundle, and documentation
including demos and tutorial material.
<<
DescPackaging: <<
Executable is built statically from the object files directly, rather
than
via libraries, so there is no dependency on gmsh2.6.1-shlibs.
Patch to install docs in their proper locations when using "make
install".
Thanks to Nicholas Taylor for the original form of the patch.
The app bundle build takes a lot of manual fiddling.
Patch contrib/mmg3d/build/sources/ratio.c where a non-void function has
a
return without a value.
Uses vecLib for BLAS. (we patch this to Accelerate)
It appears not to use Fink's ATLAS even when that's
installed, so no -atlas variant currently.
Python binding is currently disabled because the package tries to mix
Apple and
Fink Pythons.
No METIS or TETGEN support because of their license limitations.
<<
SplitOff: <<
Package: %N2.6.1-shlibs
Files: lib/libGmsh.%v.dylib
Shlibs: %p/lib/libGmsh.%v.dylib 0.0.0 %n (>= 2.6.1-1)
DocFiles: doc/LICENSE.txt
DescUsage: <<
This package contains a shared library.
<<
<<
SplitOff2: <<
Package: %N2.6.1-dev
Conflicts: %N2.5.0-dev, %N2.6.0-dev, %N2.7-dev
Replaces: %N2.5.0-dev, %N2.6.0-dev, %N2.7-dev
Files: include lib
BuildDependsOnly: true
DocFiles: doc/LICENSE.txt
DescUsage: <<
This package contains build-time files (headers and unversioned
dylib).
<<
<<
Index: gmsh-2.6.0.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gmsh-2.6.0.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gmsh-2.6.0.info 21 Jul 2012 13:36:18 -0000 1.2
+++ gmsh-2.6.0.info 12 Mar 2013 01:13:51 -0000 1.3
@@ -1,6 +1,6 @@
Package: gmsh
Version: 2.6.0
-Revision: 3
+Revision: 4
Depends: <<
fltk13-aqua-shlibs,
@@ -29,7 +29,7 @@
GCC: 4.0
-PatchFile: %n.patch
+PatchFile: %n-2.6.patch
PatchFile-MD5: fa117d7ee3adb9f218ce08cb3f547819
PatchScript: <<
%{default_script}
@@ -45,6 +45,8 @@
cmake -DCMAKE_PREFIX_PATH=%p \
-DCMAKE_INSTALL_PREFIX=%i \
-DENABLE_WRAP_PYTHON=no \
+ -DENABLE_METIS=no \
+ -DENABLE_TETGEN=no \
..
make verbose=1
make verbose=1 shared
@@ -135,6 +137,8 @@
Python binding is currently disabled because the package tries to mix
Apple and
Fink Pythons.
+
+ No METIS or TETGEN support because of their license limitations.
<<
SplitOff: <<
Package: %N2.6.0-shlibs
@@ -147,12 +151,12 @@
<<
SplitOff2: <<
Package: %N2.6.0-dev
- Conflicts: %N2.5.0-dev, %N2.6.1-dev
- Replaces: %N2.5.0-dev, %N2.6.1-dev
+ Conflicts: %N2.5.0-dev, %N2.6.1-dev, %N2.7-dev
+ Replaces: %N2.5.0-dev, %N2.6.1-dev, %N2.7-dev
Files: include lib
BuildDependsOnly: true
DocFiles: doc/LICENSE.txt
DescUsage: <<
This package contains build-time files (headers and unversioned
dylib).
<<
-<<
\ No newline at end of file
+<<
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
