Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory 
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20641/10.7/stable/main/finkinfo/sci

Modified Files:
        octcdf-oct.info 
Removed Files:
        octcdf-oct-1.1.2-3.info 
Log Message:
New upstream


--- octcdf-oct-1.1.2-3.info DELETED ---

Index: octcdf-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octcdf-oct.info,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- octcdf-oct.info     18 Apr 2013 02:37:40 -0000      1.26
+++ octcdf-oct.info     12 May 2013 19:42:46 -0000      1.27
@@ -1,8 +1,8 @@
 Info2: <<
 Package: octcdf%type_raw[-nc]-oct%type_pkg[oct]
-Version: 1.1.5
+Version: 1.1.6
 Type: oct (3.4.3 3.6.0 3.6.1 3.6.2 3.6.3 3.6.4), forge (octcdf), -nc (-ncdap 
-nc4), gcc (4.8)
-Revision: 5
+Revision: 1
 
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 # unfortunately, Homepage won't do types
@@ -14,53 +14,42 @@
 (the -ncdap version) or netcdf-c7, AKA netCDF4 (the nc4 version).
 It contains the following functions and examples.
 NetCDF:
-        ncatt
-               @ncatt/datatype.m
-               @ncatt/name.m
-        ncautonan
-        ncautoscale
-        ncbyte
-        ncclose
-        ncchar
-        ncdatatype
-        ncdim
-               @ncdim/isrecord.m
-               @ncdim/name.m
-               @ncfile/att.m
-               @ncfile/close.m
-               @ncfile/dim.m
-               @ncfile/endef.m
-               @ncfile/name.m
-               @ncfile/redef.m
-               @ncfile/sync.m
-               @ncfile/var.m
-        ncdouble
-        ncdump
-        ncenddef
-        ncfillval
-        ncfloat
-               ncinfo
-        ncint
-        ncisrecord
-        nclong
-        ncname
-        ncread
-        ncredef
-        ncshort
-        ncsync
-        ncvar
-               @ncvar/att.m
-               @ncvar/autonan.m
-               @ncvar/autoscale.m
-               @ncvar/datatype.m
-               @ncvar/dim.m
-               @ncvar/fillval.m
-               @ncvar/name.m
-        ncwrite
-        netcdf
+       @ncatt/datatype
+       @ncatt/name
+    ncbyte
+    ncchar
+       @ncdim/isrecord
+       @ncdim/name
+    ncdouble
+       ncdump
+       @ncfile/att
+       @ncfile/close
+       @ncfile/dim
+       @ncfile/endef
+       @ncfile/name
+       @ncfile/redef
+       @ncfile/sync
+       @ncfile/var
+    ncfillval
+    ncfloat
+       ncinfo
+       ncint
+    nclong
+    ncread
+    ncredef
+    ncshort
+       nctest
+       @ncvar/att.m
+       @ncvar/autonan.m
+       @ncvar/autoscale.m
+       @ncvar/datatype.m
+       @ncvar/dim.m
+       @ncvar/fillval.m
+       @ncvar/name.m
+       ncwrite
 Examples:
-        example_netcdf
-        example_opendap
+       example_netcdf
+       example_opendap
 <<
 
 License: GPL2+
@@ -72,7 +61,8 @@
   (%type_raw[-nc] = -ncdap) libdap9,
   (%type_raw[-nc] = -ncdap) libnc-dap3 (>= 1:3.7.3-4),
   (%type_raw[-nc] = -nc4) netcdf-c7, 
-  hdf5.7
+  hdf5.7,
+  fink-octave-scripts (>= 0.2.0-2)
 <<
 Depends: << 
   octave%type_pkg[oct]-interpreter,
@@ -96,16 +86,9 @@
 <<
 
 Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
-Source-MD5: cb0d95fc63665aab930741f12a1aa9a4
+Source-MD5: 6cd17452658d2109af55a5beabcb388b
 SourceDirectory: %type_pkg[forge]
 
-PatchScript: perl -pi -e 's/(ncname\(self\))$/\1;/' inst/@ncfile/name.m
-
-# 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.
-
-
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
@@ -114,48 +97,21 @@
 
 CompileScript: <<
 #!/bin/sh -ev
-if [ $UID -ne 0 ]
-then 
-       echo "%n cannot be built with --build-as-nobody"
-       exit 1
-fi
-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*
-<<
+# Source directory, either %type_raw[forge] or %type_raw[forge]-%v
+pkgsrc=%type_raw[forge]
 
-PostInstScript:  <<
-       if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
-       then 
-               `which xvfb-run` 
%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
+##### Invariant stuff begins here #####
+%p/share/fink-octave-scripts/octave-forge-patch.sh %type_raw[forge] %v 
%type_raw[oct] %b %i $pkgsrc
+./octave-forge-compile.sh
 <<
 
-PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+InstallScript: ./octave-forge-install.sh
+PostInstScript:  
%p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-postinst.sh
+PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-prerm.sh
 
 DescPackaging: <<
 This package:
-Patch in a semicolon to suppress output.
-
 This package can use netCDF4 (netcdf7 or netcdf-c7 in Fink), or if that isn't 
 found, libnc-dap (libnc-dap3 in Fink).  We allow for both possibilities and 
 specify a BuildConflicts: netcdf7, netcdf-c7 for the -ncdap variant to remove
@@ -170,6 +126,7 @@
 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.
+using this .info file as a template, or when the package name doesn't match 
+the archive name.
 <<
 <<


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and 
their applications. This 200-page book is written by three acclaimed 
leaders in the field. The early access version is available now. 
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to