Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv17505
Modified Files:
control-oct.info
Added Files:
dicom-oct.info
Log Message:
Octave-forge dicom.
Control now builds without patch.
More packages soon.
Index: control-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/control-oct.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- control-oct.info 11 Jan 2012 21:32:01 -0000 1.8
+++ control-oct.info 19 Jan 2012 15:15:09 -0000 1.9
@@ -1,8 +1,8 @@
Info2: <<
Package: control-oct%type_pkg[oct]
Version: 2.2.4
-Type: oct (3.4.3), forge (control)
-Revision: 1
+Type: oct (3.4.3, 3.6.0), forge (control)
+Revision: 2
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/control/index.html
@@ -137,10 +137,9 @@
# not use the conditional, of course.
BuildDepends: <<
- liboctave%type_pkg[oct]-dev,
+ liboctave%type_pkg[oct]-v2-dev,
fftw3,
- ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
- ( %type_pkg[oct] != 305 ) hdf5.7
+ hdf5.7
<<
Depends: <<
octave%type_pkg[oct]-interpreter
@@ -152,18 +151,7 @@
#### Insert required changes here ####
SourceDirectory: %type_pkg[forge]
-#TODO: fix FLIBS, BLAS_LIBS, and LAPACK_LIBS in Octave.
-PatchScript: <<
-#!/bin/sh -ev
-# all variants
-perl -pi -e 's|\$.*mkoctfile.*FLIBS.*|"-L%p/lib/gcc4.6/lib -lgfortran"|'
src/Makefile
-# only -atlas
-if [ "x" != "x"`mkoctfile -p LAPACK_LIBS | grep dylib` ]
- then perl -pi -e 's|^LAPACK_LIBS.*|LAPACK_LIBS = "-L%p/lib -llapack"|;
- s|^BLAS_LIBS.*|BLAS_LIBS =
"-L%p/lib -lf77blas -lcblas"|' \
- src/Makefile
-fi
-<<
+
######################################
# Do not change anything from this point down, unless absolutely necessary,
@@ -216,7 +204,9 @@
DescPackaging: <<
For this package:
-Patch because FLIBS is currently not set up correctly in our Octave packages.
+Due to changes in the upstream build process, this package requires FLIBS,
LAPACK_LIBS,
+and BLAS_LIBS to be in -lfoo form, rather than absolute filenames as they had
been.
+This change (plus compiler symlinks) is in "liboctaveN-v2"
Common for all octave-forge packages:
--- NEW FILE: dicom-oct.info ---
Info2: <<
Package: dicom-oct%type_pkg[oct]
Version: 0.1.1
Type: oct (3.4.3, 3.6.0), forge (dicom)
Revision: 1
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/dicom/index.html
Description: Octave DICOM interface.
DescDetail: <<
Digital communications in medicine (DICOM) file io.
Depends on Grassroots DICOM (GDCM).
This package provides the following functions:
_gendicomdict
dicomdict
dicominfo
dicomlookup
dicomread
dicomwrite
<<
License: GPL
# Most octave-forge packages have to have the following BuildDepends:
# liboctave%type_pkg[oct]-dev,
# fftw3,
# ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
# ( %type_pkg[oct] != 305 ) hdf5.7
#
# Packages which serve only Octave-3.0.5 or only Octave > 3.0.5 need
# not use the conditional, of course.
BuildDepends: <<
liboctave%type_pkg[oct]-v2-dev,
fftw3,
hdf5.7,
gdcm-dev
<<
Depends: <<
octave%type_pkg[oct]-interpreter,
gdcm-shlibs
<<
Conflicts: octave-forge
Source-MD5: 93f5667502c5f7376f2588fec35eb0de
#### Insert required changes here ####
SourceDirectory: %type_pkg[forge]
PatchScript: perl -pi -e 's/gdcm\-2\.0/gdcm-2.2/' src/*.cpp
######################################
# Do not change anything from this point down, unless absolutely necessary,
# since the foo-oct%type_pkg[oct] packages are designed to be built/installed
# in the same way.
Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
CompileScript: <<
#!/bin/sh -ev
export OCTAVE=%p/bin/octave-%type_raw[oct]
# repack tarball, since octave-3.4.3+ appears not to want to install
# from directories
cd ..
tar -cf %type_raw[forge].tar %type_raw[forge]
cd %b
pkgsrc=%type_raw[forge].tar
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh $pkgsrc
<<
InstallScript: <<
#!/bin/sh -ev
%p/share/octave/%type_raw[oct]/scripts/octave-forge-install.sh
%type_raw[forge]-%v %i %b
mkdir -p %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
# copy template scripts
cp %p/share/octave/%type_raw[oct]/scripts/octave-forge-prerm
%p/share/octave/%type_raw[oct]/scripts/octave-forge-postinst
%i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
cd %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
sed -i -e 's/@PKGNAME@/%type_raw[forge]-%v/' octave-forge-postinst
sed -i -e 's/@PKGNAME@/%type_raw[forge]/' octave-forge-prerm
chmod a+x octave-forge*
<<
PostInstScript: <<
if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f
%p/var/octave/%type_raw[oct]/octave_packages ]
then
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
else
mv
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages
%p/var/octave/%type_raw[oct]/octave_packages
fi
<<
PreRmScript:
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
DescPackaging: <<
For this package:
Assumes gdcm-2.0.x, so patch it for gdcm-2.2.x .
Common for all octave-forge packages:
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
cope with non-literal arguments.
The Type: forge (pkgname) is used to minimize what needs to be changed when
using this .info file as a template.
<<
<<
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
