Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3153/main/finkinfo/sci
Modified Files:
Tag: pangocairo-branch
apbs.info lpsolve-java.info lpsolve.info xephem.info
Added Files:
Tag: pangocairo-branch
lpsolve-extra.info lpsolve-octave.info lpsolve-python.info
qtiplot-aqua.info qtiplot-aqua.patch qtiplot.info
qtiplot.patch
Log Message:
merge from head (pangocairo-root-7)
Index: xephem.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/xephem.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- xephem.info 16 Jan 2007 16:03:13 -0000 1.3.2.1
+++ xephem.info 20 Jan 2007 15:54:00 -0000 1.3.2.2
@@ -1,6 +1,6 @@
Package: xephem
Version: 3.7.2
-Revision: 1
+Revision: 2
BuildDepends: openmotif3, x11-dev
Depends: x11-shlibs, openmotif3-shlibs
Source: http://clearskyinstitute.com/xephem/%n-%v.tar.gz
@@ -34,6 +34,8 @@
cp -R fits %i/lib/xephem
cp -R gallery %i/lib/xephem
cp -R help %i/lib/xephem
+cp -R lo %i/lib/xephem
+cp -R tools %i/lib/xephem
<<
DocFiles: Copyright
--- NEW FILE: lpsolve-extra.info ---
Info2: <<
Package: lpsolve-extra
Description: External Language Interfaces for lpsolve
Version: 0.0
Revision: 1
# rev-up and adapt next line when version-increases of lpsolve or glpk
Type: glpk (4.10), maj (5.5), full (5.5.0.9)
BuildDepends: lpsolve%type_raw[maj]-dev (>= %type_raw[full]-3), glpk (>=
%type_raw[glpk]-1), bison, flex, sed | ssed
Depends: lpsolve%type_raw[maj]-shlibs (>= %type_raw[maj].0.0-1)
# we need the lp_solve source again, for yacc_read.c lp_Hash.c lp_utils.c
shared/{commonlib,myblas}.c and colamd/colamd.c
Source: mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_source.tar.gz
Source-MD5: 8c2823c8dc3d4cb80b7510b1d500635d
# those are the real sources:
Source2:
mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_xli_MathProg_source.tar.gz
Source2-MD5: 7d6ea901b2a50d385a0a4afacc7543c6
Source3:
mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_xli_CPLEX_source.tar.gz
Source3-MD5: bc688f2ae35193ed3e58bdc44a544453
Source4:
mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_xli_DIMACS_source.tar.gz
Source4-MD5: d5da33641a06af15000a2bd8e1c0c797
Source5:
mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_xli_LINDO_source.tar.gz
Source5-MD5: fa61f257beb7565d99a83041e8835d09
Source6:
mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_bfp_GLPK_source.tar.gz
Source6-MD5: 916c9cb74502b86753c5bc03193063be
Source7:
mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_bfp_LUSOL_source.tar.gz
Source7-MD5: fd2008980ec4d79101d4b60937ac4ed4
Source8:
mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_bfp_etaPFI_source.tar.gz
Source8-MD5: 9fa411b976fd8f2ded78cdc3c401b831
# the following doesn't unzip well...
#Source9: mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_doc.tar.gz
#Source9-MD5: 6a922addc6e6b6a8c9baff19debb05a1
#
SourceDirectory: lp_solve_%type_raw[maj]
PatchScript: <<
#!/bin/sh -ev
# link as bundles, and strip
sed -ri -e "s,opts='',opts='-Os'\nopts=\"\$opts -fstrict-aliasing\"," -e "s,
\-fpic,," -e 's:so="\-s.*:so="-bundle":' \
-e "s: \-lc \-lm: -Wl,-x -dead_strip -exported_symbols_list
../exp_sym:" */*/ccc
# One could use the lpsolve headers by adding in the beginning of the above
perl cmd the subs :
# "s:\.\./\.\.:%p/include/lpsolve:g; " , but we have anyway to re-expand the
lpsolve source for the .c files (cf supra).
# One could also add -llpsolve in the link line, and remove from $src all
"%p/include/lpsolve/..."
# _ so we would no longer need the lpsolve source, but afraid of compilation
under different -D's.
# link with glpk instead of re-compiling:
perl -pi -e 's, \$\{glpk\},,; s,I\$\{glpkdir\},I%p,; s,\-Wl,-L%p/lib -lglpk
$&,' {xli/xli_MathProg,bfp/bfp_GLPK}/ccc
# prior non-static declaration in lp_lib.h:2134 :
perl -pi -e 's,static (MYBOOL is_chsign),\1,' xli/xli_DIMACS/lp_Dimacs.c
# rm irrelevant files
rm -f xli/*/xli_* bfp/*/bfp_* */*/c*.bat */*.bat
# from lpsolve pkg :
## Dynamic library filenames on OS X end with ".dylib", not ".so". Also, give
full path for dlopen.
perl -pi -e 's,liblpsolve%type_pkg[maj].so,%p/lib/liblpsolve.dylib,'
lp_explicit.h
## hard-code the paths to the modules, for the user's convenience (preserving
the possibility to specify
## a full path, absolute or relative), since fink doesn't give us a decent
DYLD(_FALLBACK)_LIBRARY_PATH...
perl -pi.bak -e "s:( +) strcat\(((bfp|xli)name), \".so\"\);:$&\n\1char
finklib[127]=\"%p/lib/\";
\1if(strrchr(\2,'/') != NULL) finklib[0]=0;
\1strcat(finklib,\2);:;
s:(dlopen\().*name:\1finklib:" lp_lib.c
# make the .bat scripts useable
sed -ri -e 's,^del,rm,' -e 's,\r$,,' lp_rlp.bat */*/*.bat
<<
CompileScript: <<
#!/bin/sh -ev
for d in xli/xli_CPLEX xli/xli_LINDO; do cd $d; . ./*.bat; cd -; done
for d in bfp xli; do \
cd $d
D=`echo $d|tr "[:lower:]" "[:upper:]"`
sed -r -e '/EXPORTS/d' -e 's,^ +,_,' < lp_$D.def > exp_sym
for n in ${d}_*; do cd $n; sh -ev ccc; cd -; done
cd ..
done
<<
InstallScript: <<
#!/bin/sh -ev
# bundles
mkdir -p %i/lib
cp -p */*/*.so %i/lib
chmod 644 %i/lib/*
# Headers
for d in bfp xli; do \
cd $d
mkdir -p %i/include/lpsolve/$d
cp *.{def,h,c} %i/include/lpsolve/$d
for n in ${d}_* ; do mkdir -p %i/include/lpsolve/$d/$n; cp $n/*.h
%i/include/lpsolve/$d/$n; done
cd ..
done
# the following should be in lpsolve
cp *.def %i/include/lpsolve
# the following are already in lpsolve
rm -f %i/include/lpsolve/bfp/{lp_BFP,bfp_LUSOL/lp_LUSOL}.h
# docs
sed -ri -e '/^(This directory|To build)/d' -e '/^$/d' xli/*/readme.txt
mkdir -p %i/share/doc/%n/examples/lpsolve %i/share/doc/%n/examples/DIMACS
%i/share/doc/lpsolve%type_raw[maj]-shlibs
ln -s other/README.txt %i/share/doc/%n/README_lpsolve
ln -s ../lpsolve%type_raw[maj]-shlibs %i/share/doc/%n/other
ln -s ../%n %i/share/doc/lpsolve%type_raw[maj]-shlibs/extras
cp -p xli/xli_DIMACS/*.net xli/xli_DIMACS/*.htm
%i/share/doc/%n/examples/DIMACS
ln -s examples/DIMACS %i/share/doc/%n/DIMACS
# And since we had anyway to expand the src of lpsolve, we can as well
install its demo
# Here we delete the $src, and link instead with the dylib, forgetting our
scruples about different '-D' flags ...
# for a demo, the risk is compensated by the gain in space : 18K vs > 600K
cd demo
sed -ri -e 's,\$src ,,' -e 's,\$math \$dl,%p/lib/liblpsolve.dylib
-mdynamic-no-pic -Os -fstrict-aliasing -s -dead_strip,' ccc
sh -ev ./ccc
cp -p demo %i/share/doc/%n/examples/lpsolve
ln -s examples/lpsolve/demo %i/share/doc/%n/lpsolve_demo
<<
DocFiles: <<
bfp/bfp_LUSOL/LUSOL/LUSOL-overview.txt:overview_LUSOL
xli/xli_CPLEX/readme.txt:readme_CPLEX
xli/xli_LINDO/readme.txt:readme_LINDO
xli/xli_MathProg/readme.txt:readme_MathProg
<<
DescDetail: <<
External Language Interfaces (XLI) and Basis Factorization Packages (BFP)
for the linear (mixed integer) programming solver lpsolve.
<<
DescPackaging: <<
<<
DescUsage: <<
For doc, cf http://lpsolve.sourceforge.net/%type_raw[maj]/
For a (lpsolve, not lpsolve-extra) demo, type : %p/share/doc/%n/lpsolve_demo
<<
License: LGPL
HomePage: http://sourceforge.net/projects/lpsolve/
Maintainer: JF Mertens <[EMAIL PROTECTED]>
<<
--- NEW FILE: qtiplot.patch ---
diff -urN qtiplot-0.8.9-rc2.orig/fitPlugins/fitRational0/fitRational0.pro
qtiplot-0.8.9-rc2/fitPlugins/fitRational0/fitRational0.pro
--- qtiplot-0.8.9-rc2.orig/fitPlugins/fitRational0/fitRational0.pro
2006-11-21 13:03:43.000000000 +0000
+++ qtiplot-0.8.9-rc2/fitPlugins/fitRational0/fitRational0.pro 2006-12-05
05:44:36.000000000 +0000
@@ -10,13 +10,14 @@
CONFIG += dll
DESTDIR = ../
-unix:LIBS += -L /usr/lib$${libsuff} -lgsl
-
+unix:LIBS += [EMAIL PROTECTED]@/lib -lgsl
+unix:INCLUDEPATH += @PREFIX@/include
+
win32:INCLUDEPATH += C:/WinGsl
win32:LIBS += C:/WinGsl/Lib/WinGsl.lib
win32:DEFINES += GSL_DLL
-#target.path=/usr/lib$${libsuff}
[EMAIL PROTECTED]@/lib
#INSTALLS += target
SOURCES += fitRational0.cpp
diff -urN qtiplot-0.8.9-rc2.orig/fitPlugins/fitRational1/fitRational1.pro
qtiplot-0.8.9-rc2/fitPlugins/fitRational1/fitRational1.pro
--- qtiplot-0.8.9-rc2.orig/fitPlugins/fitRational1/fitRational1.pro
2006-11-21 13:03:43.000000000 +0000
+++ qtiplot-0.8.9-rc2/fitPlugins/fitRational1/fitRational1.pro 2006-12-05
05:44:28.000000000 +0000
@@ -9,14 +9,14 @@
CONFIG += release
CONFIG += dll
-DESTDIR = ../
-unix:LIBS += -L /usr/lib$${libsuff} -lgsl
+unix:LIBS += [EMAIL PROTECTED]@/lib -lgsl
+unix:INCLUDEPATH += @PREFIX@/include
win32:INCLUDEPATH += C:/WinGsl
win32:LIBS += C:/WinGsl/Lib/WinGsl.lib
win32:DEFINES += GSL_DLL
-target.path=/usr/lib$${libsuff}
[EMAIL PROTECTED]@/lib
INSTALLS += target
SOURCES += fitRational1.cpp
diff -urN qtiplot-0.8.9-rc2.orig/qtiplot/qtiplot.pro
qtiplot-0.8.9-rc2/qtiplot/qtiplot.pro
--- qtiplot-0.8.9-rc2.orig/qtiplot/qtiplot.pro 2006-11-21 14:17:42.000000000
+0000
+++ qtiplot-0.8.9-rc2/qtiplot/qtiplot.pro 2006-12-06 21:26:09.000000000
+0000
@@ -1,7 +1,8 @@
QMAKE_PROJECT_DEPTH = 0
linux-g++-64: libsuff=64
-TARGET = qtiplot
+TARGET = qtiplot
+QMAKE_LIBDIR = $(QTDIR)/libQMAKE_LFLAGS_SHLIB = -prebind -dynamiclib
-single_module -headerpad_max_install_names -install_name
@PREFIX@/lib/qt3/lib/$(TARGET1)
TEMPLATE = app
CONFIG += qt warn_on exceptions opengl
CONFIG += release
@@ -15,7 +16,7 @@
SCRIPTING_LANGS = muParser
# Python support is unstable; use at your own risk
-unix:SCRIPTING_LANGS += Python
+#unix:SCRIPTING_LANGS += Python
TRANSLATIONS = translations/qtiplot_de.ts \
translations/qtiplot_es.ts \
@@ -26,19 +27,23 @@
#system(lupdate -verbose qtiplot.pro)
#system(lrelease -verbose qtiplot.pro)
-INCLUDEPATH += ../3rdparty/qwt/include
-INCLUDEPATH += ../3rdparty/liborigin
+INCLUDEPATH += @PREFIX@/lib/qt3/qwt/include
+# INCLUDEPATH += @PREFIX@/lib/liborigin/include
##################### Linux (Mac OS X) settings #####################
+
+unix:INCLUDEPATH += @PREFIX@/include
+unix:INCLUDEPATH += @PREFIX@/lib/qt3/qwtplot3d/include
+unix:LIBS += [EMAIL PROTECTED]@/lib/qt3/qwtplot3d/lib -lqwtplot3d
+unix:LIBS += [EMAIL PROTECTED]@/lib/qt3/qwt/lib -lqwt
+unix:LIBS += [EMAIL PROTECTED]@/lib -lgsl -lgslcblas
+unix:LIBS += -L/usr/lib -lz
+unix:LIBS += [EMAIL PROTECTED]@/lib/liborigin -lorigin
-unix:INCLUDEPATH += -I /usr/include/qwtplot3d
-unix:LIBS += ../3rdparty/qwt/lib$${libsuff}/libqwt.a
-unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas -lqwtplot3d -lz
-lorigin
-
-unix:target.path=/usr/bin
+unix:[EMAIL PROTECTED]@/bin
unix:INSTALLS += target
-unix:documentation.path = /usr/share/doc/qtiplot
+unix:documentation.path = @PREFIX@/share/doc/qtiplot-python2X
unix:documentation.files = doc/*
unix:INSTALLS += documentation
@@ -258,12 +263,12 @@
DEFINES += SCRIPTING_PYTHON
HEADERS += src/PythonScripting.h
SOURCES += src/PythonScripting.cpp
- unix:INCLUDEPATH += /usr/include/python2.4
- LIBS += -lpython2.4 -lm
+ unix:INCLUDEPATH += @PREFIX@/include/python2.X
+ LIBS += [EMAIL PROTECTED]@/lib/python2.X/config/ -lpython2.X -lm
# TODO: is there a way to do this in the Makefile?
unix:system(mkdir -p $${MOC_DIR})
- unix:system(sip -I /usr/share/sip -t Qt_3_3_0 -t WS_X11 -c $${MOC_DIR}
src/qti.sip)
+ unix:system(sip -I @PREFIX@/bin/sip -t Qt_3_3_0 -t WS_X11 -c $${MOC_DIR}
src/qti.sip)
HEADERS +=\
../tmp/qtiplot/sipqtiApplicationWindow.h\
diff -urN qtiplot-0.8.9-rc2.orig/qtiplot.pro qtiplot-0.8.9-rc2/qtiplot.pro
--- qtiplot-0.8.9-rc2.orig/qtiplot.pro 2006-11-21 13:04:47.000000000 +0000
+++ qtiplot-0.8.9-rc2/qtiplot.pro 2006-12-05 05:19:03.000000000 +0000
@@ -1,6 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS = 3rdparty/qwt\
- fitPlugins/fitRational0\
+SUBDIRS = fitPlugins/fitRational0\
fitPlugins/fitRational1\
qtiplot
--- NEW FILE: lpsolve-python.info ---
Info2: <<
Package: lpsolve-python
Version: 0.0
Revision: 1
## rev-up and change next line at every new version of python (or lpsolve)
Type: python (2.5), maj (5.5), full (5.5.0.9)
BuildDepends: lpsolve%type_raw[maj]-dev (>= %type_raw[full]-3),
python%type_pkg[python]
Depends: lpsolve%type_raw[maj]-shlibs (>= %type_raw[maj].0.0-1),
python%type_pkg[python]
Source: mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_Python_source.tar.gz
Source-MD5: 8cc7d76a0e3f80331a869bae2a0f56cc
SourceDirectory: lp_solve_%type_raw[maj]
PatchScript: <<
rm -f */*/*.bat
perl -pi -e 's,malloc\.h,stdlib.h,' */*/hash.c
perl -pi -e 's,\.\./\.\./lpsolve%type_pkg[maj],%p/lib,;
s,(\["lpsolve)%type_pkg[maj],\1,; s,\.\./\.\.,%p/include/lpsolve,'
extra/Python/setup.py
<<
CompileScript: echo ''
InstallScript: <<
#!/bin/sh -ev
cd extra/Python
%p/bin/python%type_raw[python] setup.py install --root=%d
mkdir -p %i/share/doc/%N/examples %i/share/doc/lpsolve%type_raw[maj]-shlibs
ln -s ../%n %i/share/doc/lpsolve%type_raw[maj]-shlibs
cp -p {ex,lpd}*.py %i/share/doc/%N/examples
<<
DocFiles: <<
*/*/*.htm
<<
Description: Python interface to the mixed LP pkg lpsolve
DescPackaging: <<
<<
DescUsage: <<
For doc on lpsolve, cf http://lpsolve.sourceforge.net/%type_raw[maj]/
For doc on this interface from Python, cf %p/share/doc/%n/Python.htm
<<
License: LGPL
HomePage: http://sourceforge.net/projects/lpsolve/
Maintainer: JF Mertens <[EMAIL PROTECTED]>
<<
--- NEW FILE: qtiplot-aqua.patch ---
diff -urN qtiplot-0.8.9-rc2.orig/fitPlugins/fitRational0/fitRational0.pro
qtiplot-0.8.9-rc2/fitPlugins/fitRational0/fitRational0.pro
--- qtiplot-0.8.9-rc2.orig/fitPlugins/fitRational0/fitRational0.pro
2006-11-21 13:03:43.000000000 +0000
+++ qtiplot-0.8.9-rc2/fitPlugins/fitRational0/fitRational0.pro 2006-12-05
05:44:36.000000000 +0000
@@ -10,13 +10,14 @@
CONFIG += dll
DESTDIR = ../
-unix:LIBS += -L /usr/lib$${libsuff} -lgsl
-
+unix:LIBS += [EMAIL PROTECTED]@/lib -lgsl
+unix:INCLUDEPATH += @PREFIX@/include
+QMAKE_LFLAGS_SONAME = [EMAIL
PROTECTED]/../Frameworks/QtiPlot.framework/Versions/A/Resources/lib/
win32:INCLUDEPATH += C:/WinGsl
win32:LIBS += C:/WinGsl/Lib/WinGsl.lib
win32:DEFINES += GSL_DLL
-#target.path=/usr/lib$${libsuff}
[EMAIL
PROTECTED]/../Frameworks/QtiPlot.framework/Versions/A/Resources/lib/lib$${libsuff}
#INSTALLS += target
SOURCES += fitRational0.cpp
diff -urN qtiplot-0.8.9-rc2.orig/fitPlugins/fitRational1/fitRational1.pro
qtiplot-0.8.9-rc2/fitPlugins/fitRational1/fitRational1.pro
--- qtiplot-0.8.9-rc2.orig/fitPlugins/fitRational1/fitRational1.pro
2006-11-21 13:03:43.000000000 +0000
+++ qtiplot-0.8.9-rc2/fitPlugins/fitRational1/fitRational1.pro 2006-12-05
05:44:28.000000000 +0000
@@ -9,14 +9,14 @@
CONFIG += release
CONFIG += dll
-DESTDIR = ../
-unix:LIBS += -L /usr/lib$${libsuff} -lgsl
+unix:LIBS += [EMAIL PROTECTED]@/lib -lgsl
+unix:INCLUDEPATH += @PREFIX@/include
win32:INCLUDEPATH += C:/WinGsl
win32:LIBS += C:/WinGsl/Lib/WinGsl.lib
win32:DEFINES += GSL_DLL
-target.path=/usr/lib$${libsuff}
[EMAIL
PROTECTED]/../Frameworks/QtiPlot.framework/Versions/A/Resources/lib/lib$${libsuff}
INSTALLS += target
SOURCES += fitRational1.cpp
diff -urN qtiplot-0.8.9-rc2.orig/qtiplot/qtiplot.pro
qtiplot-0.8.9-rc2/qtiplot/qtiplot.pro
--- qtiplot-0.8.9-rc2.orig/qtiplot/qtiplot.pro 2006-11-21 14:17:42.000000000
+0000
+++ qtiplot-0.8.9-rc2/qtiplot/qtiplot.pro 2006-12-06 21:26:09.000000000
+0000
@@ -1,7 +1,8 @@
QMAKE_PROJECT_DEPTH = 0
linux-g++-64: libsuff=64
-TARGET = qtiplot
+TARGET = qtiplot
+QMAKE_LFLAGS_SONAME = [EMAIL
PROTECTED]/../Frameworks/QtiPlot.framework/Versions/A/Resources/lib/
TEMPLATE = app
CONFIG += qt warn_on exceptions opengl
CONFIG += release
@@ -15,7 +16,7 @@
SCRIPTING_LANGS = muParser
# Python support is unstable; use at your own risk
-unix:SCRIPTING_LANGS += Python
+#unix:SCRIPTING_LANGS += Python
TRANSLATIONS = translations/qtiplot_de.ts \
translations/qtiplot_es.ts \
@@ -26,19 +27,23 @@
#system(lupdate -verbose qtiplot.pro)
#system(lrelease -verbose qtiplot.pro)
-INCLUDEPATH += ../3rdparty/qwt/include
-INCLUDEPATH += ../3rdparty/liborigin
+INCLUDEPATH += @PREFIX@/lib/qt3mac/qwt/include
+# INCLUDEPATH += @PREFIX@/lib/liborigin/include
##################### Linux (Mac OS X) settings #####################
+
+unix:INCLUDEPATH += @PREFIX@/include
+unix:INCLUDEPATH += @PREFIX@/lib/qt3mac/qwtplot3d/include
+unix:LIBS += [EMAIL PROTECTED]@/lib/qt3mac/qwtplot3d/lib -lqwtplot3d
+unix:LIBS += [EMAIL PROTECTED]@/lib/qt3mac/qwt/lib -lqwt
+unix:LIBS += [EMAIL PROTECTED]@/lib -lgsl -lgslcblas
+unix:LIBS += -L/usr/lib -lz
+unix:LIBS += [EMAIL PROTECTED]@/lib/liborigin -lorigin
-unix:INCLUDEPATH += -I /usr/include/qwtplot3d
-unix:LIBS += ../3rdparty/qwt/lib$${libsuff}/libqwt.a
-unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas -lqwtplot3d -lz
-lorigin
-
-unix:target.path=/usr/bin
+unix:[EMAIL PROTECTED]
unix:INSTALLS += target
-unix:documentation.path = /usr/share/doc/qtiplot
+unix:documentation.path =
@executable_path/../Frameworks/QtiPlot.framework/Versions/A/Resources/doc
unix:documentation.files = doc/*
unix:INSTALLS += documentation
@@ -258,12 +263,12 @@
DEFINES += SCRIPTING_PYTHON
HEADERS += src/PythonScripting.h
SOURCES += src/PythonScripting.cpp
- unix:INCLUDEPATH += /usr/include/python2.4
- LIBS += -lpython2.4 -lm
+
+
# TODO: is there a way to do this in the Makefile?
unix:system(mkdir -p $${MOC_DIR})
- unix:system(sip -I /usr/share/sip -t Qt_3_3_0 -t WS_X11 -c $${MOC_DIR}
src/qti.sip)
+
HEADERS +=\
../tmp/qtiplot/sipqtiApplicationWindow.h\
diff -urN qtiplot-0.8.9-rc2.orig/qtiplot.pro qtiplot-0.8.9-rc2/qtiplot.pro
--- qtiplot-0.8.9-rc2.orig/qtiplot.pro 2006-11-21 13:04:47.000000000 +0000
+++ qtiplot-0.8.9-rc2/qtiplot.pro 2006-12-05 05:19:03.000000000 +0000
@@ -1,6 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS = 3rdparty/qwt\
- fitPlugins/fitRational0\
+SUBDIRS = fitPlugins/fitRational0\
fitPlugins/fitRational1\
qtiplot
--- NEW FILE: qtiplot.info ---
Package: qtiplot
Version: 0.8.9-rc2
Revision: 1
Maintainer: Murali Vadivelu <[EMAIL PROTECTED]>
Depends: x11, qt3-shlibs, gsl-shlibs, liborigin-shlibs, qwtplot3d-shlibs,
qwt-shlibs
BuildDepends: x11-dev, qt3, gsl, qwtplot3d, qwt, liborigin
BuildConflicts: labplot, labplot-shlibs
Description: Data analysis and scientific plotting
Homepage: http://soft.proindependent.com/qtiplot.html
License: GPL
Source: http://soft.proindependent.com/src/%n-%v.tar.bz2
SourceDirectory: %n-%v
Source-MD5: fdf3996b4361c83c7e86ae4d8176bc04
GCC: 4.0
PatchScript: sed 's,@PREFIX@,%p,g' < %a/%n.patch | patch -p1
CompileScript: <<
qmake
make
<<
InstallScript: <<
mkdir -p %i/bin
cp qtiplot/qtiplot %i/bin/
mkdir -p %i/lib/qt3/lib
cp fitPlugins/*.dylib %i/lib/qt3/lib
mkdir -p %i/share/doc/qtiplot
cp -R manual/* %i/share/doc/qtiplot/
<<
DocFiles: gpl_licence.txt README.html
DescDetail: <<
Data analysis and scientific plotting
<<
--- NEW FILE: qtiplot-aqua.info ---
Package: qtiplot-aqua
Version: 0.8.9-rc2
Revision: 1
Maintainer: Murali Vadivelu <[EMAIL PROTECTED]>
GCC: 4.0
Depends: qt3mac-shlibs, qwtplot3dmac-shlibs, qwtmac-shlibs, gsl-shlibs,
liborigin-shlibs
BuildDepends: qt3mac, gsl, qwtplot3dmac, qwtmac, liborigin
BuildConflicts: qwt-designer-plugin, qt3, qt3-designer, labplot, labplot-shlibs
Description: Data analysis and scientific plotting
Homepage: http://soft.proindependent.com/qtiplot.html
License: GPL
Source: http://soft.proindependent.com/src/qtiplot-%v.tar.bz2
SourceDirectory: qtiplot-%v
Source-MD5: fdf3996b4361c83c7e86ae4d8176bc04
PatchScript: sed 's,@PREFIX@,%p,g' < %a/%n.patch | patch -p1
CompileScript: <<
#!/bin/sh -ex
unset QMAKESPEC
export QTDIR=%p/lib/qt3mac
export PATH=%p/lib/qt3mac/bin:$PATH
%p/lib/qt3mac/bin/qmake
make
<<
InstallScript: <<
mkdir -p %i/Applications
/bin/cp -p -R qtiplot/qtiplot.app %i/Applications
mkdir -p
%i/Applications/qtiplot.app/Contents/Frameworks/QtiPlot.framework/Versions/A/Resources/lib
mkdir -p
%i/Applications/qtiplot.app/Contents/Frameworks/QtiPlot.framework/Versions/A/Resources/doc
/bin/cp -p fitPlugins/*.dylib
%i/Applications/qtiplot.app/Contents/Frameworks/QtiPlot.framework/Versions/A/Resources/lib/
cp -R manual/*
%i/Applications/qtiplot.app/Contents/Frameworks/QtiPlot.framework/Versions/A/Resources/doc/
<<
DocFiles: gpl_licence.txt README.html
DescDetail: <<
Data analysis and scientific plotting
<<
Index: lpsolve.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lpsolve.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- lpsolve.info 1 Dec 2006 04:09:53 -0000 1.2
+++ lpsolve.info 20 Jan 2007 15:54:00 -0000 1.2.2.1
@@ -1,41 +1,57 @@
+Info2: <<
Package: lpsolve
Description: Mixed Integer Linear Programming (ILP) solver
+Type: maj (5.5), min (0.9)
+#Version: %type_raw[maj].%type_raw[min]
Version: 5.5.0.9
-Revision: 2
+Revision: 3
-Depends: %N5.5-shlibs (= %v-%r)
+BuildDepends: sed | ssed, bison, flex
+Depends: %N%type_raw[maj]-shlibs (= %v-%r)
Source: mirror:sourceforge:%n/lp_solve_%v_source.tar.gz
Source-MD5: 8c2823c8dc3d4cb80b7510b1d500635d
-SourceDirectory: lp_solve_5.5
+SourceDirectory: lp_solve_%type_raw[maj]
PatchScript: <<
#!/bin/sh -ev
## change the name of the lib, and correct install_name.
sed -i.bak -e '{
- s,liblpsolve55,liblpsolve,g
- s,liblpsolve\.dylib,liblpsolve.5.5.0.dylib -install_name
%p/lib/liblpsolve.5.5.dylib,
-# liblpsolv.a is useless on the link line (except if with -all_load, and then
tail of the cmd is useless..), and let us strip.
- s;b liblpsolve.a;b -single_module -Wl,-x -dead_strip;
- }' lpsolve55/ccc.osx
+ s,lib%N%type_pkg[maj],lib%N,g
+ s,lib%N\.dylib,lib%N.%type_raw[maj].0.dylib -install_name
%p/lib/lib%N.%type_raw[maj].dylib,
+# lib%N.a is useless on the link line (except if with -all_load, and then tail
of the cmd is useless..), and let us strip.
+ s;b lib%N.a;b -single_module -Wl,-x -dead_strip -exported_symbols_list
../exp_sym;
+ }' %N%type_pkg[maj]/ccc.osx
## for executable, use dynamic linking, and -mdynamic-no-pic _ and strip :
- sed -i.bak -e 's;\$src;-mdynamic-no-pic -s -dead_strip lp_solve.c
../lpsolve55/liblpsolve.dylib;' lp_solve/ccc.osx
+ sed -i.bak -e 's;\$src;-mdynamic-no-pic -s -dead_strip lp_solve.c
../%N%type_pkg[maj]/lib%N.dylib;' lp_solve/ccc.osx
## try adding -fstrict-aliasing to CFLAGS (comment out for the moment since
gives a warning in lp_matrix.c 2308-2309)
# sed -i~ -e 's,\-O3,& -fstrict-aliasing -Wall,' lp*/ccc.osx
-## Dynamic library filenames on OS X end with ".dylib", not ".so"
- sed -i.bak -e 's;".so";".dylib";' bfp/bfp_LUSOL/LUSOL/commonlib.c lp_lib.c
shared/commonlib.c shared/myblas.c
+## Dynamic library filenames on darwin end with ".dylib", not ".so". Also,
give full path for dlopen.
+ perl -pi -e 's,lib%N%type_pkg[maj].so,%p/lib/lib%N.dylib,' lp_explicit.h
+## hard-code the paths to the modules, for the user's convenience (preserving
the possibility to specify
+## a full path, absolute or relative), since fink doesn't give us a decent
DYLD(_FALLBACK)_LIBRARY_PATH...
+ perl -pi.bak -e "s:( +) strcat\(((bfp|xli)name), \".so\"\);:$&\n\1char
finklib[127]=\"%p/lib/\";
+\1if(strrchr(\2,'/') != NULL) finklib[0]=0;
+\1strcat(finklib,\2);:;
+ s:(dlopen\().*name:\1finklib:" lp_lib.c
+# make the .bat script useable
+ sed -ri -e 's,^del,rm,' -e 's,\r$,,' lp_rlp.bat
<<
CompileScript: <<
#!/bin/sh -ev
+ # Run bison and flex
+ . ./lp_rlp.bat
+
# Build the library
- cd %n55
+ sed -r -e '/EXPORTS/d' -e 's,^ +,_,' < lp_solve.def > exp_sym
+ cd %N%type_pkg[maj]
sh -ev ccc.osx
# Symbolic links to library
- ln -s lib%n.5.5.0.dylib lib%n.5.5.dylib
- ln -s lib%n.5.5.dylib lib%n.dylib
+ ln -s lib%N.%type_raw[maj].0.dylib lib%N.%type_raw[maj].dylib
+ ln -s lib%N.%type_raw[maj].dylib lib%N.dylib
# Build the lp_solve executable
cd ../lp_solve
@@ -47,44 +63,49 @@
# Libraries
mkdir -p %i/lib
- cp -pPR %n55/lib%n.* %i/lib
+ cp -pPR %N%type_pkg[maj]/lib%N.* %i/lib
# Headers
- mkdir -p %i/include/lp_solve/bfp/bfp_LUSOL/LUSOL
- mkdir -p %i/include/lp_solve/colamd
- mkdir -p %i/include/lp_solve/shared
- cp *.h %i/include/lp_solve
- cp bfp/*.h %i/include/lp_solve/bfp
- cp bfp/bfp_LUSOL/*.h %i/include/lp_solve/bfp/bfp_LUSOL
- cp bfp/bfp_LUSOL/LUSOL/*.h %i/include/lp_solve/bfp/bfp_LUSOL/LUSOL
- cp colamd/*.h %i/include/lp_solve/colamd
- cp shared/*.h %i/include/lp_solve/shared
+ mkdir -p %i/include/%N/bfp/bfp_LUSOL/LUSOL
+ mkdir -p %i/include/%N/colamd
+ mkdir -p %i/include/%N/shared
+ cp *.h %i/include/%N
+ cp bfp/*.h %i/include/%N/bfp
+ cp bfp/bfp_LUSOL/*.h %i/include/%N/bfp/bfp_LUSOL
+ cp bfp/bfp_LUSOL/LUSOL/*.h %i/include/%N/bfp/bfp_LUSOL/LUSOL
+ cp colamd/*.h %i/include/%N/colamd
+ cp shared/*.h %i/include/%N/shared
+# # Additional "headers" (for %N-extra):
+# cp yacc_read.c lp_Hash.c lp_utils.c %i/include/%N
+# cp shared/{commonlib,myblas}.c %i/include/%N/shared
+# cp colamd/colamd.c %i/include/%N/colamd
# Executable
mkdir -p %i/bin
- /usr/bin/install lp_solve/lp_solve %i/bin
+ install lp_solve/lp_solve %i/bin
# link the doc files:
mkdir -p %i/share/doc
- ln -s %N5.5-shlibs %i/share/doc/%n
+ ln -s %N%type_raw[maj]-shlibs %i/share/doc/%n
<<
SplitOff: <<
- Package: %N5.5-shlibs
- Files: lib/lib%N.5*.dylib
- Shlibs: %p/lib/lib%N.5.5.dylib 5.5.0 %n (>= 5.5.0.9-1)
+ Package: %N%type_raw[maj]-shlibs
+ Files: lib/lib%N.*.dylib
+ Shlibs: %p/lib/lib%N.%type_raw[maj].dylib %type_raw[maj].0 %n (>=
%type_raw[maj].0.0-1)
+# Shlibs: %p/lib/lib%N.%type_raw[maj].dylib 5.5.0 %n (>= 5.5.0.0-1)
DocFiles: README.txt
<<
SplitOff2: <<
- Package: %N5.5-dev
- Depends: %N5.5-shlibs (= %v-%r)
+ Package: %N%type_raw[maj]-dev
+ Depends: %N%type_raw[maj]-shlibs (= %v-%r)
BuildDependsOnly: true
Files: include lib
InstallScript: <<
- # link the doc files:
+ # link the doc files:
mkdir -p %i/share/doc
- ln -s %N5.5-shlibs %i/share/doc/%n
+ ln -s %N%type_raw[maj]-shlibs %i/share/doc/%n
<<
<<
@@ -108,19 +129,22 @@
-fno-common, -single-module: 601776
-fno-common, multiple-modules: 609436
common; -single-module: 601832
+
+[Above figures from before using the exported_symbols_list; now size=509312]
<<
DescPackaging: <<
-Library name changed from "lpsolve55" to "lpsolve".
-So the install_name (and the splitoff-names) must contain "5.5"...
+Library name changed from "%N%type_pkg[maj]" to "%N".
+So the install_name (and the splitoff-names) must contain "%type_raw[maj]"...
Use dynamic linking for the executable.
The demo files are not packaged (neither source nor binary).
<<
-DescUsage: documentation in http://lpsolve.sourceforge.net/5.5/
+DescUsage: documentation in http://%N.sourceforge.net/%type_raw[maj]/
License: LGPL
-HomePage: http://sourceforge.net/projects/lpsolve/
+HomePage: http://sourceforge.net/projects/%N/
Maintainer: Trevor Harmon <[EMAIL PROTECTED]>
+<<
--- NEW FILE: lpsolve-octave.info ---
Info2: <<
Package: lpsolve-octave
Version: 0.0
Revision: 1
## It is probably prudent to rev-up and change the next line whenever octave or
lpsolve go to a new version
Type: octave (2.1.73), maj (5.5), full (5.5.0.9)
BuildDepends: fftw3, hdf5, libncurses5, lpsolve%type_raw[maj]-dev (>=
%type_raw[full]-3), octave (>= %type_raw[octave]-1), readline5
Depends: fftw3-shlibs, hdf5-shlibs, libncurses5-shlibs,
lpsolve%type_raw[maj]-shlibs (>= %type_raw[maj].0.0-1), octave (>=
%type_raw[octave]-1), readline5-shlibs
Source: mirror:sourceforge:lpsolve/lp_solve_%type_raw[full]_octave_source.tar.gz
Source-MD5: b8992431ffedc1e6e73e158c54a4b1ce
SourceDirectory: lp_solve_%type_raw[maj]
PatchScript: <<
perl -pi -e 's,malloc\.h,stdlib.h,' */*/*/hash.c
perl -pi -e 's,\.\./\.\./\.\.,%p/include/lpsolve,; s:\*\.o:$& -Wl,-x
-Wl,-dead_strip:' */*/*/ccc
perl -pi -e 's,liblpsolve%type_pkg[maj]\.so,%p/lib/liblpsolve.dylib,'
*/*/*/lp_explicit.h
<<
CompileScript: echo ''
InstallScript: <<
#!/bin/sh -ev
cd extra/octave/lpsolve
sh -ev ccc
mkdir -p %i/lib/octave/site/oct/%m-apple-darwin %i/share/octave/site/m
%i/share/doc/%N/examples %i/share/doc/lpsolve%type_raw[maj]-shlibs
ln -s ../%n %i/share/doc/lpsolve%type_raw[maj]-shlibs
chmod a-x octlpsolve.oct
cp -p octlpsolve.oct %i/lib/octave/site/oct/%m-apple-darwin
cp -p {oct,lp_}*.m %i/share/octave/site/m
cp -p {ex,lpd}*.m %i/share/doc/%N/examples
<<
DocFiles: <<
*/*/*/*.htm
<<
Description: Octave interface to the mixed LP pkg lpsolve
DescPackaging: <<
<<
DescUsage: <<
For doc on lpsolve, cf http://lpsolve.sourceforge.net/%type_raw[maj]/
For doc on this interface from Octave, cf %p/share/doc/%n/Octave.htm
<<
License: LGPL
HomePage: http://sourceforge.net/projects/lpsolve/
Maintainer: JF Mertens <[EMAIL PROTECTED]>
<<
Index: lpsolve-java.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lpsolve-java.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- lpsolve-java.info 1 Dec 2006 04:09:53 -0000 1.2
+++ lpsolve-java.info 20 Jan 2007 15:54:00 -0000 1.2.2.1
@@ -1,19 +1,19 @@
Package: lpsolve-java
Version: 5.5.0.9
-Revision: 2
+Revision: 3
Type: java(1.4)
Source: mirror:sourceforge:lpsolve/lp_solve_%v_java.zip
Source-MD5: d871f56e9421bba6d44cd24ced6d809d
SourceDirectory: lp_solve_5.5_java
-Depends: lpsolve5.5-shlibs (= %v-%r), system-java (>= 1.4)
-BuildDepends: lpsolve5.5-dev (= %v-%r), system-java-dev (>= 1.4)
+Depends: lpsolve5.5-shlibs (>= %v-3), system-java (>= 1.4)
+BuildDepends: lpsolve5.5-dev (>= %v-3), system-java-dev (>= 1.4)
CompileScript: <<
# JNI library
- g++ -fPIC -fno-common -I $JAVA_HOME/include -I %p/include/lp_solve -I src/c
-idirafter /usr/include/sys -c src/c/lpsolve5j.cpp
+ g++ -fPIC -fno-common -I $JAVA_HOME/include -I %p/include/lpsolve -I src/c
-idirafter /usr/include/sys -c src/c/lpsolve5j.cpp
g++ -dynamiclib lpsolve5j.o -compatibility_version 5.5.0 -current_version
5.5.0 -o liblpsolve55j.jnilib -lc -llpsolve -L%p/lib
# Java library
Index: apbs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/apbs.info,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- apbs.info 9 Jul 2006 04:34:01 -0000 1.6
+++ apbs.info 20 Jan 2007 15:54:00 -0000 1.6.2.1
@@ -1,35 +1,43 @@
Package: apbs
-Version: 0.4.0
-Revision: 1006
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: a9d5f8b24a40087998267c9df3eecceb
+Version: 0.5.0
+Revision: 1
+Source: mirror:sourceforge:%n/%n-source.tar.gz
+SourceRename: %n-%v.tar.gz
+Source-MD5: ac49b0406b00e79e2690e2887118e750
SourceDirectory: %n-%v
-Depends: maloc, readline-shlibs (>= 4.3-1028), gnuplot (>= 4.0.0-1002),
pdb2pqr
-BuildDepends: gcc4
-Conflicts: apbs-mpi
-Replaces: apbs-mpi
-ConfigureParams: FETK_INCLUDE=%p/include FETK_LIBRARY=%p/lib FETK_PREFIX=%p
py_path=/usr/bin/python2.3
+Depends: readline-shlibs (>= 4.3-1028), gnuplot (>= 4.0.0-1002), pdb2pqr
+BuildDepends: gcc4 | gcc42
+Conflicts: apbs-mpi, maloc, maloc-mpi-lammpi, maloc-mpi-openmpi
+Replaces: apbs-mpi, maloc, maloc-mpi-lammpi, maloc-mpi-openmpi
+ConfigureParams: py_path=/usr/bin/python2.3
Description: Adaptive Poisson-Boltzmann Solver
CompileScript: <<
#!/bin/zsh -efv
PATH=/usr/bin:$PATH
BLAS_DIR='/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A'
-py_path=/usr/bin/python2.3 F77=gfortran ./configure %c
--with-blas="-L${BLAS_DIR} -lblas -Wl,-framework -Wl,vecLib -Wl,-undefined
-Wl,dynamic_lookup"
- perl -pi.bak -e 's|python2.2|python|g' **/* 2>/dev/null
- perl -pi.bak -e 's|python2 |python |g' **/* 2>/dev/null
+py_path=/usr/bin/python2.3 F77=gfortran ./configure %c \
+--enable-python \
+--with-blas="-L${BLAS_DIR} -lblas -Wl,-framework -Wl,vecLib -Wl,-undefined
-Wl,dynamic_lookup"
+perl -pi -e 's|cp -Rf tools \${prefix}||g' Makefile
+perl -pi -e 's|cp -Rf examples \${prefix}||g' Makefile
+perl -pi -e 's|cp -Rf doc \${prefix}||g' Makefile
+perl -pi -e 's|\$\(DESTDIR\)\$\(libdir\)|share/apbs/lib|g'
contrib/blas/Makefile
make
<<
InstallScript: <<
#!/bin/zsh -efv
make install DESTDIR=%d
-rm -Rf **/CVS # fink validate complains if this junk is left behind.
+rm -Rf **/CVS # fink validate complains if this junk is left behind.
+# rm -Rf **/.svn # fink validate complains if this junk is left behind.
mkdir -p %i/share/%n
-mv tools/manip/psize.py tools/manip/psize.py-dist
-sed s/"usr\/bin\/python2"/"usr\/bin\/python"/g tools/manip/psize.py-dist >
tools/manip/psize.py
+mkdir -p %i/lib
+perl -pi -e 's|/usr/bin/env python|/usr/bin/python2.3|g' examples/**/*.py
+perl -pi -e 's|/usr/bin/env python|/usr/bin/python2.3|g' tools/**/*.py
mv examples %i/share/%n
mv tools %i/share/%n
-mkdir -p %i/bin
-ln -s %p/bin/$(uname -p)-apple-darwin$(uname -r)/apbs %i/bin/apbs
+mv doc %i/share/%n
+rm -Rf %i/src
+rm -f **/*.o
<<
PostInstScript: <<
# per request of software's author
@@ -43,6 +51,20 @@
echo ""
sleep 5
<<
+################################################################################
+SplitOff: <<
+ Package: %N-dev
+ BuildDependsOnly: true
+ Description: apbs headers, static libraries and libtool files
+ Files:<<
+ include/apbs
+ lib/libapbs.a
+ lib/libapbsmainroutines.a
+ lib/libapbs.la
+ lib/libapbsmainroutines.la
+ <<
+<<
+################################################################################
Homepage: http://apbs.sourceforge.net/
RunTimeVars: <<
APBS_PSIZE:%p/share/%n/tools/manip
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
