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

Modified Files:
        database-oct.info 
Log Message:
New upstream.  Now uses fink-octave-scripts.


Index: database-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/database-oct.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- database-oct.info   4 Mar 2013 21:01:33 -0000       1.3
+++ database-oct.info   19 Mar 2013 02:51:09 -0000      1.4
@@ -1,6 +1,6 @@
 Info2: <<
 Package: database-oct%type_pkg[oct]
-Version: 2.1.0
+Version: 2.1.1
 Type: oct (3.6.2 3.6.3 3.6.4), forge (database), gcc (4.7)
 Revision: 1
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
@@ -50,6 +50,7 @@
   endian-dev,
   postgresql92-dev (>= 1:9.2.2-6),
   liboctave%type_pkg[oct]-dev, 
+  fink-octave-scripts,
   fftw3,
   hdf5.7
  <<
@@ -59,69 +60,42 @@
 <<
 Conflicts: octave-forge
 
-
-Source-MD5: 4d5696e32f52e9ce5b3e05573bf057b0
+Source-MD5: 937724d94c29d921e9e9d61a377f7277
+# Source is normally invariant form
 Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
 
 PatchScript: <<
-perl -pi -e 's|postgresql/(.*\.h)|\1|g' \
-                               src/configure \
-                               src/configure.ac \
-                               src/converters.cc \
-                               src/converters.h \
-                               src/pq_connection.h \
-                               src/pq_lo.cc
-perl -pi -e 's|-lpq|-L%p/opt/postgresql-9.2/lib -lpq|' src/Makefile.in
+       perl -pi -e 's|postgresql/(.*\.h)|\1|g' src/configure \
+                                                                               
        src/configure.ac \
+                                                                               
        src/converters.cc \
+                                                                               
        src/converters.h \
+                                                                               
        src/pq_connection.h \
+                                                                               
        src/pq_lo.cc
+       perl -pi -e 's|-lpq|-L%p/opt/postgresql-9.2/lib -lpq|' src/Makefile.in
 <<
 
+# These may be changed as appropriate for the package in question
 SetCPPFLAGS: -I%p/opt/postgresql-9.2/include -I%p/lib/endian-dev 
 SetLDFLAGS: -L%p/opt/postgresql-9.2/lib
-
-######################################
-
-# 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.
-
+# These are invariant
 SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
 UseMaxBuildJobs: false
 BuildAsNobody: false
 
 CompileScript: <<
 #!/bin/sh -ev
-if [ $UID -ne 0 ]
-then 
-       echo "%n cannot be built with --build-as-nobody"
-       exit 1
-fi
-# 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]-%v
-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 
-               `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
+# specify package source name, e.g. "%type_raw[forge] (currently most common) 
or 
+# %type_raw[forge]-%v.  
+
+pkgsrc=%type_raw[forge]-%v
+
+##### 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
 <<


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to