Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15901

Modified Files:
        massxpert.info massxpert.patch 
Log Message:
new upstream, qt4-x11 and qt4-mac variants, taking over maintainership

Index: massxpert.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/massxpert.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- massxpert.info      18 Aug 2008 01:55:23 -0000      1.9
+++ massxpert.info      9 May 2010 23:43:38 -0000       1.10
@@ -1,28 +1,79 @@
-Package: massxpert
-Version: 1.6.7
-Revision: 1004
-Source: http://www.massxpert.org/downloads/source/%n-%v.tar.gz
-Depends: freetype219-shlibs, fontconfig2-shlibs, glib2-shlibs, 
libgettext3-shlibs, qt4-x11-core-shlibs (>= 4.3-1), qt4-x11-gui-shlibs (>= 
4.3-1), x11, x11-shlibs, libpng3-shlibs, libiconv
-BuildDepends: cmake, libpng3, freetype219, fontconfig2-dev, glib2-dev, 
libgettext3-dev, qt4-x11 (>= 4.3-1), x11-dev, libiconv-dev, fink (>= 0.28.1-1)
-GCC: 4.0
-Maintainer: Jack Fink <jackf...@users.sourceforge.net>
+Info2: <<
+Package: massxpert-%type_pkg[qt]
+Version: 2.3.5
+Revision: 1001
+Type: qt (x11 mac)
+
+Source: http://download.tuxfamily.org/massxpert/source/massxpert-%v.tar.gz
+Source-MD5: d7529c6e99e0ea04c2e67118d83ae9ab
+Source2-MD5: fa0a17b2c4beba4cd37dc56889e2e212
+Source2: http://massxpert.org/userman/pdf/massxpert.pdf
+
+Depends: <<
+ fontconfig2-shlibs, 
+ freetype219-shlibs, 
+ glib2-shlibs, 
+ libgettext8-shlibs, 
+ libiconv,
+ libpng3-shlibs, 
+ qt4-%type_pkg[qt]-core-shlibs (>= 4.6.1-1), 
+ qt4-%type_pkg[qt]-gui-shlibs (>= 4.6.1-1), 
+ (%type_pkg[qt] = x11) x11-shlibs 
+<<
+BuildDepends: <<
+ cmake, 
+ fink (>= 0.29.7-1),
+ freetype219, 
+ fontconfig2-dev, 
+ glib2-dev, 
+ libgettext8-dev, 
+ libiconv-dev, 
+ libpng3, 
+ qt4-%type_pkg[qt] (>= 4.6.1-1), 
+ (%type_pkg[qt] = x11) x11-dev
+<<
+
+PatchFile: massxpert.patch
+PatchFile-MD5: 0627d543ebf79719269280437571e4cf
+
+Maintainer: Koen van der Drift <drift...@users.sourceforge.net>
 Homepage: http://www.massxpert.org
 License: GPL
 # GPL v3, actually
+
 Description: Mass spectrometric package, uses Qt4
-Source-MD5: bb1939b8826a71823ee48b42de5bf561
-SourceDirectory: %n
+
+GCC: 4.0
+SetLDFLAGS: -Wl,-framework,CoreFoundation
+
 CompileScript: <<
-       PATH=%p/lib/qt4-x11/bin:$PATH cmake -DCMAKE_INSTALL_PREFIX=%p .
-        make
-<<
-InstallScript: make install DESTDIR=%d
-Shlibs: <<
-       !%p/lib/massxpert/plugins/libmassListSorterPlugin.dylib
-       !%p/lib/massxpert/plugins/libnumeralsLocaleConverterPlugin.dylib
-       !%p/lib/massxpert/plugins/libseqToolsPlugin.dylib
+ #!/bin/sh -ev
+ export PATH=%p/lib/qt4-%type_pkg[qt]/bin:$PATH  
+ %p/bin/cmake \
+ --debug-output -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+ -DCMAKE_INSTALL_PREFIX:PATH=%p \
+ -DCMAKE_INCLUDE_PATH:PATH=%p/include \
+ -DCMAKE_LIBRARY_PATH:PATH=%p/lib \
+ -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" \
+ -DCMAKE_OSX_SYSROOT:PATH="/" \
+ .
+
+# patch three link.txt files after cmake to create a bundle instead of dynamic 
libraries
+ perl -pi -e "s,dynamiclib,bundle,g" 
plugins-src/massListSorterPlugin/CMakeFiles/massListSorterPlugin.dir/link.txt
+ perl -pi -e "s,dynamiclib,bundle,g" 
plugins-src/numeralsLocaleConverterPlugin/CMakeFiles/numeralsLocaleConverterPlugin.dir/link.txt
+ perl -pi -e "s,dynamiclib,bundle,g" 
plugins-src/seqToolsPlugin/CMakeFiles/seqToolsPlugin.dir/link.txt
+
+ make
 <<
-DocFiles: COPYING TODO install_manifest.txt
+
+# make install DESTDIR=%d doesn't work, so just use the default InstallScript
+#InstallScript: <<
+# make install
+#<<
+
+AppBundles: gui/massXpert.app
+DocFiles: COPYING TODO ../massxpert.pdf
+
 DescDetail: <<
 The massXpert project aims at providing (bio)chemists with 
 a software package allowing the following:
@@ -35,3 +86,6 @@
 * Mass-to-charge ratio calculations with inline change of ionization agent;
 * Simulation of isotopic patterns for any chemical formula.
 <<
+
+DescPackaging: Previous maintainer: Jack Fink <jackf...@users.sourceforge.net>
+<<
\ No newline at end of file

Index: massxpert.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/massxpert.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- massxpert.patch     20 Oct 2007 08:39:29 -0000      1.3
+++ massxpert.patch     9 May 2010 23:43:38 -0000       1.4
@@ -1,46 +1,28 @@
-diff -urd massxpert.orig/config.h massxpert/config.h
---- massxpert.orig/config.h    2007-07-10 22:30:55.000000000 +0200
-+++ massxpert/config.h 2007-07-12 07:07:11.000000000 +0200
-@@ -1,11 +1,11 @@
- #define TARGET "massxpert"
- #define VERSION "1.6.6"
--#define PREFIX "/usr/local"
--#define BASEBINDIR "/usr/local/bin"
--#define PLUGINDIR "/usr/local/lib/massxpert/plugins"
--#define DATADIR "/usr/local/share/massxpert"
--#define DOCDIR "/usr/local/share/doc/massxpert"
--#define USERMANDIR "/usr/local/share/doc/massxpert"
--#define USERMANPDFDIR "/usr/local/share/doc/massxpert/userman/pdf"
--#define USERMANHTMLDIR "/usr/local/share/doc/massxpert/userman/html"
--#define USERMANFIGDIR "/usr/local/share/doc/massxpert/userman/figures"
-+#define PREFIX "@FINKPREFIX@"
-+#define BASEBINDIR "@FINKPREFIX@/bin"
-+#define PLUGINDIR "@FINKPREFIX@/lib/massxpert/plugins"
-+#define DATADIR "@FINKPREFIX@/share/massxpert"
-+#define DOCDIR "@FINKPREFIX@/share/doc/massxpert"
-+#define USERMANDIR "@FINKPREFIX@/share/doc/massxpert"
-+#define USERMANPDFDIR "@FINKPREFIX@/share/doc/massxpert/userman/pdf"
-+#define USERMANHTMLDIR "@FINKPREFIX@/share/doc/massxpert/userman/html"
-+#define USERMANFIGDIR "@FINKPREFIX@/share/doc/massxpert/userman/figures"
-diff -urd massxpert.orig/for-user-to-change-config-settings 
massxpert/for-user-to-change-config-settings
---- massxpert.orig/for-user-to-change-config-settings  2007-07-10 
16:04:25.000000000 +0200
-+++ massxpert/for-user-to-change-config-settings       2007-07-12 
07:07:39.000000000 +0200
-@@ -6,15 +6,15 @@
- ## generated on release mode. However, if a crash happens, the latter 
- ## will not prove as informative as the former.
+diff -Nurd massxpert-2.3.5/gui/CMakeLists.txt 
massxpert-2.3.5-patched/gui/CMakeLists.txt
+--- massxpert-2.3.5/gui/CMakeLists.txt 2010-04-29 08:21:07.000000000 -0400
++++ massxpert-2.3.5-patched/gui/CMakeLists.txt 2010-05-09 19:32:47.000000000 
-0400
+@@ -233,19 +233,19 @@
+ EXEC_PROGRAM ("cp ${CMAKE_CURRENT_SOURCE_DIR}/images/massXpert.icns 
${CMAKE_CURRENT_BINARY_DIR}/massXpert.app/Contents/Resources")
+   
+ # We want to build universal binaries 
+-SET (CMAKE_OSX_ARCHITECTURES "ppc;i386" 
+-  CACHE STRING "Build architectures for OSX" FORCE) 
++#SET (CMAKE_OSX_ARCHITECTURES "ppc;i386" 
++#  CACHE STRING "Build architectures for OSX" FORCE) 
  
--# CONFIG += release
--CONFIG += debug
-+CONFIG += release
-+## CONFIG += debug
+ # That can be deployed on older system 
+ # (Qt 4.4.0 is available starting at 10.3.9) 
+-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.3" 
++SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4" 
+   CACHE STRING "Flags used by the compiler during all build types." FORCE)
  
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden" 
+   CACHE STRING "Flags used by the compiler during all build types." FORCE)
  
- ## Installation directories depending on the system where the 
- ## software is being built and will be used.
+-SET (CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk" 
+-  CACHE STRING "MacOSX10.4u.sdk." FORCE)
++#SET (CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk" 
++#  CACHE STRING "MacOSX10.4u.sdk." FORCE)
  
- unix {
--    PREFIX = "/usr/local"
-+    PREFIX = "@FINKPREFIX@"
-     BASEBINDIR = "$${PREFIX}/bin"
-     PLUGINDIR= "$${PREFIX}/lib/$${TARGET}/plugins"
-     DATADIR = "$${PREFIX}/share/$${TARGET}"
+ SET_SOURCE_FILES_PROPERTIES (application.qrc ${TARGET}_fr.qm 
+   PROPERTIES MACOSX_BUNDLE_LOCATION Resources)


------------------------------------------------------------------------------

_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to