Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv30250/10.7/stable/main/finkinfo/sci
Modified Files:
netcdf7-gfortran.info netcdf7.info
Log Message:
Improve nc-config
Index: netcdf7-gfortran.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/netcdf7-gfortran.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- netcdf7-gfortran.info 29 Jan 2012 21:34:15 -0000 1.8
+++ netcdf7-gfortran.info 25 Feb 2012 14:51:08 -0000 1.9
@@ -1,10 +1,10 @@
Info4: <<
Package: netcdf7-gfortran
Version: 4.1.3
-Revision: 5
+Revision: 6
BuildDependsOnly: True
Maintainer: Alexander Hansen <[email protected]>
-BuildDepends: hdf5.7, gcc46, fink-package-precedence, netcdf7 (>= %v-1),
libcurl4, szip
+BuildDepends: hdf5.7, gcc46, fink-package-precedence, netcdf7 (>= %v-3),
libcurl4, szip
Depends: %n-shlibs (= %V)
Conflicts: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95, netcdf-gfortran
Replaces: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95, netcdf-gfortran
@@ -48,8 +48,20 @@
rm %i/share/info/netcdf-c* %i/share/info/netcdf-install.info
%i/share/info/netcdf-tutorial.info %i/share/info/netcdf.info
rm %i/share/man/man3/netcdf.3
rm %i/bin/nc-config
- #fix libtool archive file
- #perl -pi -e "s,%i,%p," %i/lib/%n/lib/libnetcdff.la
+ perl -p -e 's|(fc=).*|\1"%p/bin/gfortran"|; \
+ s/(flibs=).*/\1"-L\$\{libdir\} -lnetcdff
-lnetcdf"/; \
+ s/(has_f\d{2}=).*/\1"yes"/g' \
+ %p/bin/nc-config-nc7 > %i/bin/nc-config-nc7g
+<<
+PostInstScript: <<
+ if [ "$1" != "upgrade" ]
+ then update-alternatives --install %p/bin/nc-config nc-config
%p/bin/nc-config-nc7g 100
+ fi
+<<
+PreRmScript: <<
+ if [ "$1" = "remove" ]
+ then update-alternatives --remove %p/bin/nc-config
%p/bin/nc-config-nc7g
+ fi
<<
SplitOff: <<
Package: %N-shlibs
@@ -73,9 +85,11 @@
<<
DescUsage: <<
Installs library and include files in %p/opt/netcdf7 to allow
-the netcdf-gfortran and %N packages to coexist. Packages building
-against this one must ensure that they point to %p/opt/netcdf7 and also
-BuildDepend on netcdf7.
+the netcdf-gfortran and %N packages to coexist.
+Fink packages building against this one must ensure that they point
+to %p/opt/netcdf7 and also BuildDepend on netcdf7.
+
+When building by hand, make sure netcdf7 is installed.
<<
DescPackaging: <<
This Fortran interface is created as a different package so that users
@@ -89,6 +103,6 @@
manually feed "-lsz" and "-I%p/include" to the configure script to find szlib
and hdf5.7, respectively.
<<
-Homepage: http://www.unidata.ucar.edu/software/netcdf/
+Homepage: http://www.unidata.ucar.edu/software/netcdf/
License: OSI-Approved
<<
\ No newline at end of file
Index: netcdf7.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/netcdf7.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- netcdf7.info 29 Jan 2012 21:34:15 -0000 1.3
+++ netcdf7.info 25 Feb 2012 14:51:08 -0000 1.4
@@ -1,6 +1,6 @@
Package: netcdf7
Version: 4.1.3
-Revision: 2
+Revision: 3
BuildDependsOnly: True
GCC: 4.0
Maintainer: Alexander Hansen <[email protected]>
@@ -43,6 +43,21 @@
rm %i/share/info/netcdf-f*
pushd %i/share/doc/%N
rm *f77* *f90*
+ perl -pi -e 's/gfortran// ; \
+ s/(flibs=).*/\1""/; \
+ s/(has_szlib=).*/\1"yes"/' \
+ %i/bin/nc-config
+ mv %i/bin/nc-config %i/bin/nc-config-nc7
+<<
+PostInstScript: <<
+ if [ "$1" != "upgrade" ]
+ then update-alternatives --install %p/bin/nc-config nc-config
%p/bin/nc-config-nc7 50
+ fi
+<<
+PreRmScript: <<
+ if [ "$1" = "remove" ]
+ then update-alternatives --remove %p/bin/nc-config
%p/bin/nc-config-nc7
+ fi
<<
SplitOff: <<
Package: %N-shlibs
@@ -107,5 +122,5 @@
e.g. via ConfigureParams, *FLAGS variables, setting PKG_CONFIG_PATH,
or explicit patching.
<<
-Homepage: http://www.unidata.ucar.edu/software/netcdf/
+Homepage: http://www.unidata.ucar.edu/software/netcdf/
License: OSI-Approved
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
