Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22221/main/finkinfo/sci

Modified Files:
      Tag: pangocairo-branch
        cadabra.info dx.info geda-gnetlist.info mizar-gab-html.info 
        mizar-gab.info mizar-semantic-mml.info mizar.info netcdf.info 
        octave-forge.info prover9.info pygsl-py.info 
Added Files:
      Tag: pangocairo-branch
        dx-hdf5.info dx-hdf5.patch glpk-java.info glpk-java.patch 
        netcdf-g95.info netcdf-gfortran.info netcdf.patch 
Log Message:
merge from head

Index: mizar-semantic-mml.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mizar-semantic-mml.info,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- mizar-semantic-mml.info     23 Jan 2007 18:39:48 -0000      1.2.2.3
+++ mizar-semantic-mml.info     30 Apr 2007 02:48:27 -0000      1.2.2.4
@@ -1,13 +1,13 @@
 Package: mizar-semantic-mml
 Description: Semantic HTML presentation of the MML
-Version: 4.76.959
+Version: 4.81.962
 Revision: 1
 Replaces: mizar-semantic-mml (<= 4.66.942)
 License: Commercial
 Homepage: http://mmlquery.mizar.org
 Source: http://lipa.ms.mff.cuni.cz/~urban/xmlmml/html_abstr.%v.tar.gz
-Source-MD5: 6901f4a96835f14acd32cf5a275a5880
-SourceDirectory: html_abstr.%v
+Source-MD5: 4cb505e2b53bfde61cf8168640702e9a
+SourceDirectory: html
 CompileScript: <<
 <<
 InstallScript: <<
@@ -22,5 +22,3 @@
 <<
 Maintainer: Jesse Alama <[EMAIL PROTECTED]>
 
-
-                

Index: prover9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/prover9.info,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- prover9.info        16 Jan 2007 16:03:13 -0000      1.2.2.2
+++ prover9.info        30 Apr 2007 02:48:28 -0000      1.2.2.3
@@ -1,22 +1,21 @@
 Package: prover9
 Description: Prove theorems and build models
-Version: 2006-11
+Version: 2007-03
 Revision: 1
 License: OSI-Approved
-Source: 
http://www.cs.unm.edu/~mccune/prover9/download/LADR-November-2006.tar.gz
-Source-MD5: 7940527b679ce38a19db2e39fcd26b21
-SourceDirectory: LADR-November-2006
-Source2: http://www.cs.unm.edu/~mccune/prover9/manual/%n-manual-1106.tar.gz
-Source2-MD5: d4e7805330aaa5b44ba41edc7b9ea130
-Source2ExtractDir: LADR-November-2006
-DocFiles: November-2006/*.html
+Source: http://www.cs.unm.edu/~mccune/prover9/download/LADR-March-2007.tar.gz
+Source-MD5: 4e439104533828beb1a331edcb1f23af
+SourceDirectory: LADR-March-2007
+Source2: http://www.cs.unm.edu/~mccune/prover9/manual/%n-manual-0307.tar.gz
+Source2-MD5: e3fcbdc0fec28c2992072c8b9349e138
+Source2ExtractDir: LADR-March-2007
+DocFiles: %n-manual-0307/*.html
 CompileScript: <<
   make all
 <<
 InstallScript: <<
   mkdir -p %i/bin
-  install -m 755 bin/attack2 %i/bin
-  install -m 755 bin/attack3.py %i/bin
+  install -m 755 bin/attack %i/bin
   install -m 755 bin/autosketches4 %i/bin
   install -m 755 bin/clausefilter %i/bin
   install -m 755 bin/clausetester %i/bin
@@ -45,10 +44,5 @@
 logic, and Mace4 searches for finite models and
 counterexamples. Prover9 is the successor of the Otter prover.
 <<
-DescPackaging: <<
-Author has given permission for the package to be distributed by Fink, and 
hasn't
-descided upon an established licensure (e.g. GPL) as of yet.  
-<<
 Homepage: http://www.cs.unm.edu/~mccune/prover9
-Maintainer: Jesse Alama <[EMAIL PROTECTED]>
-                
+Maintainer: Jesse Alama <[EMAIL PROTECTED]>
\ No newline at end of file

--- NEW FILE: glpk-java.patch ---
diff -urN source.orig/LICENSE source/LICENSE
--- source.orig/LICENSE 1969-12-31 16:00:00.000000000 -0800
+++ source/LICENSE      2006-06-15 15:01:02.000000000 -0700
@@ -0,0 +1,339 @@
+                   GNU GENERAL PUBLIC LICENSE
+                      Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                           Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                   GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                           NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                    END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff -urN source.orig/c/glpk_jni.c source/c/glpk_jni.c
--- source.orig/c/glpk_jni.c    2005-11-10 20:21:40.000000000 -0800
+++ source/c/glpk_jni.c 2007-04-19 00:09:58.000000000 -0700
@@ -30,11 +30,14 @@
 
 #include <jni.h>
 #include <glpk.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 
 #include "org_gnu_glpk_GlpkSolver.h"
 
+/* Define undocumented GLPK functions */
+void _glp_lib_print_hook(int (*func)(void *info, char *buf), void *info);
+void _glp_lib_fault_hook(int (*func)(void *info, char *buf), void *info);
 
 /* ***** preparatory functions to communicate between C and Java ***** */
 
@@ -173,8 +176,8 @@
     info->env = env;
     info->obj = obj;
 
-    lib_set_fault_hook((void*)info, enable ? NULL : &_fault_hook_fn);
-    lib_set_print_hook((void*)info, enable ? NULL : &_print_hook_fn);
+    _glp_lib_fault_hook(enable ? NULL : &_fault_hook_fn, (void*)info);
+    _glp_lib_print_hook(enable ? NULL : &_print_hook_fn, (void*)info);
 }
 
 

                 

Index: netcdf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/netcdf.info,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- netcdf.info 4 Feb 2007 15:37:20 -0000       1.3.2.3
+++ netcdf.info 30 Apr 2007 02:48:28 -0000      1.3.2.4
@@ -1,70 +1,79 @@
 Package: netcdf
-Version: 3.6.1
-Revision: 1003
+Version: 3.6.2
+Revision: 6
 BuildDependsOnly: True
 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Depends: %N-shlibs (= %v-%r) | netcdf-absoft-shlibs (>= 3.5.1-3), %N-bin | 
netcdf-absoft-bin
-BuildDepends: g95 (>= 0.50-20060321)
-Conflicts: netcdf-absoft
-Replaces: netcdf-absoft
-GCC: 4.0
-Source: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%v.tar.gz
-SourceDirectory: %N-%v/src
-Source-MD5: 07a9db424337c5e4833fb84136e09a1e
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
-NoSetLDFLAGS: true
-SetCPPFLAGS: -DNDEBUG -Df2cFortran
-CompileScript: <<
-  #!/bin/sh -ev
-  CXX="g++" CC="gcc" CXXFLAGS="-O2" CFLAGS='-O2' FC='%p/bin/g95' FFLAGS='-O2' 
F90='%p/bin/g95' ./configure --prefix=%p/%n
-  make
-  #make check
+Depends: %n-shlibs (= %v-%r), %n-bin (= %v-%r)
+Conflicts: %n-absoft
+Replaces: %n-absoft
+Source: ftp://ftp.unidata.ucar.edu/pub/%n/%n-%v.tar.gz
+Source-MD5: a7d450da9081e4a6e440705ea31868d3
+SourceDirectory: %n-%v
+NoSetCPPFlags: true
+Patch: %n.patch
+ConfigureParams: <<
+  --enable-shared CFLAGS=-O2 CXXFLAGS=-O2 \
+  --mandir='${prefix}/share/man' --enable-docs-install 
--docdir='${prefix}/share/doc/%n' \
+  --disable-dependency-tracking --disable-fortran-compiler-check --disable-f77 
--disable-f90
 <<
 InstallScript: <<
- #!/bin/sh -ev
- mkdir -p %i/share/man
- make install prefix=%i MANDIR=%i/share/man
- gcclib=`%p/bin/g95 --print-lib`
- FLIBDIR=`dirname $gcclib`
- (mkdir libtmp; cd libtmp; ar -x ../libsrc/libnetcdf.a) || exit 1
- (mkdir libtmp2; cd libtmp2; ar -x ../cxx/libnetcdf_c++.a) || exit 1
- (cd libtmp; objfiles=`ls -1 *.o`; cc -dynamiclib -single_module -o 
libnetcdf.%v.dylib $objfiles -L$FLIBDIR -lf95 -install_name 
%p/lib/libnetcdf.3.dylib -current_version %v -compatibility_version 3.5; cp 
libnetcdf.%v.dylib %i/lib) || exit 1
- (cd %i/lib; ln -s %p/lib/libnetcdf.%v.dylib libnetcdf.3.dylib; ln -s 
%p/lib/libnetcdf.3.dylib libnetcdf.dylib;  ln -s %p/lib/libnetcdf.%v.dylib 
libnetcdf.3.5.0.dylib) || exit 1
- (cd libtmp2; objfiles=`ls -1 *.o`; c++ -dynamiclib -flat_namespace -undefined 
suppress -o libnetcdf_c++.%v.dylib $objfiles -install_name 
%p/lib/libnetcdf_c++.3.dylib -current_version %v -compatibility_version 3.5; cp 
libnetcdf_c++.%v.dylib %i/lib)  || exit 1
- (cd %i/lib; ln -s %p/lib/libnetcdf_c++.%v.dylib libnetcdf_c++.3.dylib; ln -s 
%p/lib/libnetcdf_c++.3.dylib libnetcdf_c++.dylib) || exit 1
- rm -rf %i/share/man/man3f
- rm -rf %i/share/man/cat1
- rm -rf %i/share/man/cat3
- rm -f %i/share/man/whatis.db
+  #!/bin/sh -ev
+  make prefix=%i install
+  # Add C, CDL and CXX examples
+  mkdir -p %i/share/doc/%N/examples
+  cp -r examples/C* %i/share/doc/%N/examples
+  # Remove duplicate and Fortran documentation
+  rm -f %i/share/doc/%N/*.{ps,txt,info}
+  rm -f %i/share/info/netcdf-f*.info
+  # For backward compatability of old shlibs
+  cd %i/lib
+  ln -s libnetcdf.{4,3}.dylib
+  ln -s libnetcdf_c++.{4,3}.dylib
 <<
 SplitOff: <<
- Package: %N-shlibs
- Shlibs: <<
-   %p/lib/libnetcdf.3.5.0.dylib 3.5.0 %n (>= 3.5.1-14) | netcdf-absoft-shlibs 
(>= 3.5.1-3)
-   %p/lib/libnetcdf.3.dylib 3.5.0 %n (>= 3.5.1-14)  | netcdf-absoft-shlibs (>= 
3.5.1-3)
-   %p/lib/libnetcdf_c++.3.dylib 3.5.0 %n (>= 3.5.1-14)  | netcdf-absoft-shlibs 
(>= 3.5.1-3)
- <<
- Conflicts: netcdf-absoft-shlibs
- Replaces: %N (<= 3.5.0-6), netcdf-absoft-shlibs, netcdf-absoft (<= 3.5.1-2)
- Files: lib/libnetcdf*.*.dylib
- DocFiles: COPYRIGHT README RELEASE_NOTES
+  Package: %N-shlibs
+  Conflicts: %N-absoft-shlibs
+  Replaces: %N-absoft-shlibs, %N (<= 3.5.0-6), %N-absoft (<= 3.5.1-2)
+  Suggests: %N-bin
+  Files: lib/libnetcdf.*.dylib lib/libnetcdf_c++.*.dylib
+  Shlibs: <<
+    %p/lib/libnetcdf.4.dylib 5.0.0 %n (>= 3.6.2-1)
+    %p/lib/libnetcdf_c++.4.dylib 5.0.0 %n (>= 3.6.2-1)
+  <<
+  DocFiles: COPYRIGHT README RELEASE_NOTES
 <<
 SplitOff2: <<
   Package: %N-bin
-  Conflicts: netcdf-absoft-bin
-  Replaces: %N (<= 3.5.0-6), netcdf-absoft-bin, netcdf-absoft (<= 3.5.1-2)
-  Files:  bin 
+  Depends: %N-shlibs (= %v-%r)
+  Conflicts: %N-absoft-bin
+  Replaces: %N-absoft-bin, %N (<= 3.5.0-6), %N-absoft (<= 3.5.1-2)
+  Files: bin share/man/man1 share/doc/%N/*-man-1.html
   DocFiles: COPYRIGHT README RELEASE_NOTES
 <<
 DocFiles: COPYRIGHT README RELEASE_NOTES
+InfoDocs: netcdf-install.info netcdf-tutorial.info netcdf.info netcdf-c.info 
netcdf-cxx.info
 Description: Interface & lib for array-based data access
 DescDetail: <<
-The NetCDF (network Common Data Form) library defines a machine-independent
+The netCDF (network Common Data Form) library defines a machine-independent
 format for representing scientific data. Together, the interface, library,
 and format support the creation, access, and sharing of scientific data.
 
-Uses g95 to build fortran77 and fortran95 interface.
+This package provides libraries, documentation and examples for interfacing
+with C and C++ code. For libraries, documentation and examples for interfacing
+with Fortran 77 (and Fortran 90) code install package,
+`%N-g95', or `%N-gfortran'.
 <<
-Homepage: http://www.unidata.ucar.edu/packages/netcdf/
+DescPackaging: <<
+The Fortran interface is moved to a different package so that users
+do not have to install a Fortran compiler to just get the C/C++ interface.
+<<
+DescPort: <<
+CFLAGS=-O2 CXXFLAGS=-O2 is essential to avoid debugging mode flags (-g).
+Included examples in documents directory.
+Removed non-essential duplicate documentation (.ps and .txt).
+Added links to new shlibs for backwards compatibility. This works for the C
+interface only, not for the Fortran interface. But since Fink did not have
+any dependencies on the Fortran interface, there is no reason to create 
netcdf4.
+<<
+Homepage: http://www.unidata.ucar.edu/software/netcdf/
 License: OSI-Approved

Index: mizar-gab.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mizar-gab.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- mizar-gab.info      13 Feb 2007 19:58:11 -0000      1.1.2.3
+++ mizar-gab.info      30 Apr 2007 02:48:27 -0000      1.1.2.4
@@ -1,11 +1,11 @@
 Package: mizar-gab
 Description: Generated ABstracts for articles in the MML
-Version: 4.76.959
+Version: 4.81.962
 Revision: 1
 License: Commercial
 Recommends: mizar, mizar-gab-html
 Source: http://merak.pb.bialystok.pl/mmlquery/downloads/gab-%v.tgz
-Source-MD5: e78a0c6d1ca10d9d2956ef5b1c8c8e3a
+Source-MD5: a8f6ed9a1a5eda9e93a337982070002c
 SourceDirectory: %v
 CompileScript: <<
 <<
@@ -24,5 +24,3 @@
 <<
 Homepage: http://merak.pb.bialystok.pl
 Maintainer: Jesse Alama <[EMAIL PROTECTED]>
-
-                

Index: geda-gnetlist.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geda-gnetlist.info,v
retrieving revision 1.8.2.15
retrieving revision 1.8.2.16
diff -u -d -r1.8.2.15 -r1.8.2.16
--- geda-gnetlist.info  20 Apr 2007 16:25:29 -0000      1.8.2.15
+++ geda-gnetlist.info  30 Apr 2007 02:48:27 -0000      1.8.2.16
@@ -9,10 +9,10 @@
   gtk+2 (>= 2.10.0-1), atk1-shlibs (>= 1.17.0-1), pango1-xft2-ft219 (>= 
1.16.0-1)
 <<
 BuildDepends: <<
-  glitz, expat1, libjpeg, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, gd2,
+  glitz, expat1, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13), 
freetype219 (>= 2.3.1-1), xft2-dev, gd2,
   guile16-dev (>= 1.6.7-1010), libgeda (>= %v-0), geda-symbols,
   x11-dev, pkgconfig (>= 0.21-1), libiconv-dev, libgettext3-dev,
-  glib2-dev (>= 2.12.0-1), gtk+2-dev (>= 2.10.0-1), atk1 (>= 1.17.0-1), 
pango1-xft2-ft219-dev (>= 1.16.0-1)
+  glib2-dev (>= 2.12.0-1), gtk+2-dev (>= 2.10.0-1), atk1 (>= 1.17.0-1), 
pango1-xft2-ft219-dev (>= 1.16.0-1), libjpeg
 <<
 
 CustomMirror: <<

Index: cadabra.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/cadabra.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- cadabra.info        15 Mar 2007 00:58:46 -0000      1.1.2.3
+++ cadabra.info        30 Apr 2007 02:48:27 -0000      1.1.2.4
@@ -1,5 +1,5 @@
 Package: cadabra
-Version: 0.102
+Version: 0.111
 Revision: 1
 Description: Computer algebra system for field theory
 License: GPL
@@ -13,13 +13,13 @@
   glibmm2.4, breqn, applesystemfonts, gnome-icon-theme
 <<
 BuildDepends: <<
-  modglue, gtk+2-dev, x11-dev, pcre, gmp, libsigc++2, glib2-dev, 
+  modglue (>= 1.8-1), gtk+2-dev, x11-dev, pcre, gmp, libsigc++2, glib2-dev, 
   pango1-xft2-dev, atk1, glibmm2.4-dev, gtkmm2.4-dev
 <<
 
 # Unpack Phase:
 Source: http://www.aei.mpg.de/~peekas/cadabra/cadabra-%v.tar.gz
-Source-MD5: 9c22dfc8e2d9cd925af2ebc5d8ac053e
+Source-MD5: f3ff6339d22634340b4a9c60278184c1
 
 # Compile Phase:
 # GCC: 4.0
@@ -28,8 +28,8 @@
 # Install Phase:
 DocFiles: AUTHORS ChangeLog history COPYING
 InstallScript: << 
- # make test
- # make advtest
+# make test
+# make advtest
  make -j1 install DESTDIR=%d DEVDESTDIR=%d
  rm -fr %i/share/TeXmacs
  mkdir -p %i/share/doc/%n/examples

--- NEW FILE: netcdf-g95.info ---
Package: netcdf-g95
Version: 3.6.2
Revision: 6
BuildDepends: g95
BuildDependsOnly: True
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Depends: %n-shlibs (= %v-%r)
Conflicts: netcdf (<= 3.6.1-1003), netcdf-absoft
Replaces: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-gfortran
Source: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%v.tar.gz
Source-MD5: a7d450da9081e4a6e440705ea31868d3
SourceDirectory: netcdf-%v
NoSetCPPFlags: true
Patch: netcdf.patch
ConfigureParams: <<
  --prefix=%p/lib/netcdf-g95 \
  --enable-shared CFLAGS=-O2 FFLAGS=-O2 FCFLAGS=-O2 FC=g95 F77=g95 F90=g95 \
  --mandir='${prefix}/share/man' --enable-docs-install 
--docdir='${prefix}/share/doc/netcdf' \
  --disable-dependency-tracking --disable-fortran-compiler-check --disable-c 
--with-netcdf-c-lib=%p/lib \
  --disable-cxx --disable-utilities
<<
InstallScript: <<
  #!/bin/sh -ev
  make install prefix=%i/lib/netcdf-g95
  mkdir -p %i/share
  mv %i/lib/netcdf-g95/share/man %i/share
  mv %i/lib/netcdf-g95/share/doc %i/share
  mv %i/lib/netcdf-g95/share/info %i/share
  /bin/rm -rf %i/lib/netcdf-g95/share
  # Add examples for F77 and F90
  mkdir -p %i/share/doc/netcdf/examples
  cp -r examples/F* %i/share/doc/netcdf/examples
  # Remove duplicate and C and CXX documentation
  rm -f %i/share/doc/netcdf/*.{ps,txt,info}
  rm -f %i/share/doc/netcdf/netcdf{-*,}.*
  rm -f %i/share/info/netcdf{-[a-eg-z]*,}.info
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: netcdf-shlibs (= %v-%r)
  Files: lib/netcdf-g95/lib/libnetcdff.*.dylib
  Shlibs: %p/lib/netcdf-g95/lib/libnetcdff.4.dylib 5.0.0 %n (>= 3.6.2-1001)
  DocFiles: COPYRIGHT README RELEASE_NOTES
<<
InfoDocs: netcdf-f77.info netcdf-f90.info
DocFiles: COPYRIGHT README RELEASE_NOTES
Description: Interface & lib for array-based data access
DescDetail: <<
The netCDF (network Common Data Form) library defines a machine-independent
format for representing scientific data. Together, the interface, library,
and format support the creation, access, and sharing of scientific data.

This package provides libraries, documentation and examples for interfacing
with Fortran 77 and Fortran 90 code using the g95 compiler.

Installs library and include files in %p/lib/netcdf-g95 to avoid 
conflicting with the netcdf-gfortran package.
<<
DescPackaging: <<
This Fortran interface is created as a different package so that users
do not have to install a Fortran compiler to just get the C/C++ interface.
<<
DescPort: <<
CFLAGS=-O2 FFLAGS=-O2 FCFLAGS=-O2 is essential to avoid debugging mode flags 
(-g).
All docs are moved into the directory /sw/share/doc/netcdf.
Removed non-essential duplicate documentation (.ps and .txt).
<<
Homepage: http://www.unidata.ucar.edu/software/netcdf/
License: OSI-Approved

--- NEW FILE: netcdf-gfortran.info ---
Package: netcdf-gfortran
Version: 3.6.2
Revision: 6
BuildDepends: gcc42
BuildDependsOnly: True
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Depends: %n-shlibs (= %v-%r)
Conflicts: netcdf (<= 3.6.1-1003), netcdf-absoft
Replaces: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95
Source: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%v.tar.gz
Source-MD5: a7d450da9081e4a6e440705ea31868d3
SourceDirectory: netcdf-%v
NoSetCPPFlags: true
Patch: netcdf.patch
PatchScript: <<
  perl -pi.bak -e 's|\$rpath|%p/lib/netcdf-gfortran|g' **/configure
<<
ConfigureParams: <<
  --prefix=%i/lib/netcdf-gfortran \
  --enable-shared CFLAGS=-O2 FFLAGS=-O2 FCFLAGS=-O2 FC=gfortran F77=gfortran 
F90=gfortran \
  --mandir='${prefix}/share/man' --enable-docs-install 
--docdir='${prefix}/share/doc/netcdf' \
  --disable-dependency-tracking --disable-fortran-compiler-check --disable-c 
--with-netcdf-c-lib=%p/lib \
  --disable-cxx --disable-utilities
<<
InstallScript: <<
  #!/bin/sh -ev
  make install prefix=%i/lib/netcdf-gfortran
  #make install DESTDIR=%d/lib/netcdf-gfortran
  mkdir -p %i/share
  mv %i/lib/netcdf-gfortran/share/man %i/share
  mv %i/lib/netcdf-gfortran/share/doc %i/share
  mv %i/lib/netcdf-gfortran/share/info %i/share
  /bin/rm -rf %i/lib/netcdf-gfortran/share
  # Add examples for F77 and F90
  mkdir -p %i/share/doc/netcdf/examples
  cp -r examples/F* %i/share/doc/netcdf/examples
  # Remove duplicate and C and CXX documentation
  rm -f %i/share/doc/netcdf/*.{ps,txt,info}
  rm -f %i/share/doc/netcdf/netcdf{-*,}.*
  rm -f %i/share/info/netcdf{-[a-eg-z]*,}.info
<<
SplitOff: <<
  Package: %N-shlibs
  Depends: netcdf-shlibs (= %v-%r), gcc42-shlibs
  Files: lib/netcdf-gfortran/lib/libnetcdff.*.dylib
  Shlibs: %p/lib/netcdf-gfortran/lib/libnetcdff.4.dylib 5.0.0 %n (>= 3.6.2-1001)
  DocFiles: COPYRIGHT README RELEASE_NOTES
<<
InfoDocs: netcdf-f77.info netcdf-f90.info
DocFiles: COPYRIGHT README RELEASE_NOTES
Description: Interface & lib for array-based data access
DescDetail: <<
The netCDF (network Common Data Form) library defines a machine-independent
format for representing scientific data. Together, the interface, library,
and format support the creation, access, and sharing of scientific data.

This package provides libraries, documentation and examples for interfacing
with Fortran 77 and Fortran 90 code using the gfortran compiler.

Installs library and include files in %p/lib/netcdf-g95 to avoid 
conflicting with the netcdf-g95 package.
<<
DescPackaging: <<
This Fortran interface is created as a different package so that users
do not have to install a Fortran compiler to just get the C/C++ interface.
<<
DescPort: <<
CFLAGS=-O2 FFLAGS=-O2 FCFLAGS=-O2 is essential to avoid debugging mode flags 
(-g).
All docs are moved into the directory /sw/share/doc/netcdf.
Removed non-essential duplicate documentation (.ps and .txt).
<<
Homepage: http://www.unidata.ucar.edu/software/netcdf/
License: OSI-Approved

--- NEW FILE: dx-hdf5.patch ---
diff -urN dxhdf5-0.4.5/Makefile.in dxhdf5-new/Makefile.in
--- dxhdf5-0.4.5/Makefile.in    2006-12-08 05:49:14.000000000 -0500
+++ dxhdf5-new/Makefile.in      2007-04-16 17:03:02.000000000 -0400
@@ -629,7 +629,7 @@
        @echo "In order to use OpenDX with all loadable modules,"
        @echo "also the ones installed before installing dxhdf5,"
        @echo "use this command:"
-       @echo "dx -mdf $(prefix)/[EMAIL PROTECTED]@/all.mdf"
+       @echo "dx -mdf $(prefix)/share/dx/[EMAIL PROTECTED]@/all.mdf"
        @echo ""
        @echo "It may useful to set this up as an alias."
        @echo ""
diff -urN dxhdf5-0.4.5/docs/ImportHDF5Field.html.in 
dxhdf5-new/docs/ImportHDF5Field.html.in
--- dxhdf5-0.4.5/docs/ImportHDF5Field.html.in   2004-11-19 03:06:26.000000000 
-0500
+++ dxhdf5-new/docs/ImportHDF5Field.html.in     2007-04-16 17:03:02.000000000 
-0400
@@ -339,7 +339,7 @@
 
         <P>After the module is installed, this example is available
         as an OpenDX program in the file:
-        <pre>@prefix@/samples/moduleTryOut/ImportHDF5FieldUsage.net</pre>
+        
<pre>@prefix@/share/dx/samples/moduleTryOut/ImportHDF5FieldUsage.net</pre>
         
         <P>In the example the file ImportHDF5FieldUsage.h5 is used
         which was generated by VORPAL
diff -urN dxhdf5-0.4.5/docs/ImportHDF5Species.html.in 
dxhdf5-new/docs/ImportHDF5Species.html.in
--- dxhdf5-0.4.5/docs/ImportHDF5Species.html.in 2004-12-13 05:06:05.000000000 
-0500
+++ dxhdf5-new/docs/ImportHDF5Species.html.in   2007-04-16 17:03:02.000000000 
-0400
@@ -549,7 +549,7 @@
 
         <P>After the module is installed, this example is available
         as an OpenDX program in the file:
-        <PRE>@prefix@/samples/moduleTryOut/ImportHDF5SpeciesUsage.net</PRE>
+        
<PRE>@prefix@/share/dx/samples/moduleTryOut/ImportHDF5SpeciesUsage.net</PRE>
         
         <P>In the example the file ImportHDF5SpeciesUsage.h5 is used,
         which was generated by VORPAL
diff -urN dxhdf5-0.4.5/docs/Makefile.in dxhdf5-new/docs/Makefile.in
--- dxhdf5-0.4.5/docs/Makefile.in       2006-12-08 05:49:14.000000000 -0500
+++ dxhdf5-new/docs/Makefile.in 2007-04-16 17:03:02.000000000 -0400
@@ -145,7 +145,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-datadir = $(prefix)/html/modules
+datadir = @prefix@/share/dx/html/modules
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
diff -urN dxhdf5-0.4.5/modules/Makefile.in dxhdf5-new/modules/Makefile.in
--- dxhdf5-0.4.5/modules/Makefile.in    2006-12-08 05:49:15.000000000 -0500
+++ dxhdf5-new/modules/Makefile.in      2007-04-16 17:03:02.000000000 -0400
@@ -192,7 +192,7 @@
 target_alias = @target_alias@
 
 # installation directories
-modulesdir = $(prefix)/[EMAIL PROTECTED]@
+modulesdir = $(prefix)/share/dx/[EMAIL PROTECTED]@
 
 # to be installed
 bin_SCRIPTS = dxhdf5
@@ -550,8 +550,8 @@
 
 # for producing the all.mdf file
 all.mdf: dxhdf5.mdf
-       @if test -d "$(prefix)/[EMAIL PROTECTED]@"; then                        
\
-                       MODULES=`cd $(prefix)/[EMAIL PROTECTED]@;               
\
+       @if test -d "$(prefix)/share/dx/[EMAIL PROTECTED]@"; then               
        \
+                       MODULES=`cd $(prefix)/share/dx/[EMAIL PROTECTED]@;      
        \
                                    ls | grep '\.mdf$$'`;               \
                else                                                    \
                        MODULES="";                                     \
@@ -561,8 +561,8 @@
                                                                        \
        for i in $$MODULES; do                                          \
          if test "$$i" != "all.mdf" -a "$$i" != "dxhdf5.mdf"; then     \
-              echo "Adding $(prefix)/[EMAIL PROTECTED]@/$$i to all.mdf";       
\
-              cat $(prefix)/[EMAIL PROTECTED]@/$$i >> ./all.mdf;               
\
+              echo "Adding $(prefix)/share/dx/[EMAIL PROTECTED]@/$$i to 
all.mdf";      \
+              cat $(prefix)/share/dx/[EMAIL PROTECTED]@/$$i >> ./all.mdf;      
        \
               echo "" >> ./all.mdf;                                    \
          fi;                                                           \
        done;                                                           \
diff -urN dxhdf5-0.4.5/modules/dxhdf5.in dxhdf5-new/modules/dxhdf5.in
--- dxhdf5-0.4.5/modules/dxhdf5.in      2006-11-12 03:44:02.000000000 -0500
+++ dxhdf5-new/modules/dxhdf5.in        2007-04-16 17:03:02.000000000 -0400
@@ -5,4 +5,4 @@
 
 dxargs="$@"
 
[EMAIL PROTECTED]@ -mdf @prefix@/[EMAIL PROTECTED]@/dxhdf5.mdf $dxargs
[EMAIL PROTECTED]@ -mdf @prefix@/share/dx/[EMAIL PROTECTED]@/dxhdf5.mdf $dxargs
diff -urN dxhdf5-0.4.5/modules/dxhdf5.mdf.tmp.in 
dxhdf5-new/modules/dxhdf5.mdf.tmp.in
--- dxhdf5-0.4.5/modules/dxhdf5.mdf.tmp.in      2003-10-07 01:17:29.000000000 
-0400
+++ dxhdf5-new/modules/dxhdf5.mdf.tmp.in        2007-04-16 17:03:02.000000000 
-0400
@@ -1,7 +1,7 @@
 MODULE ImportHDF5Field
 CATEGORY Import and Export
 DESCRIPTION imports a field or a slab of a field from an HDF5 file
-LOADABLE "@prefix@/[EMAIL PROTECTED]@/@dlname@"
+LOADABLE "@DXROOT@/[EMAIL PROTECTED]@/@dlname@"
 INPUT filename; string;  (none); file name
 INPUT fieldname; string;  NULL; field name
 INPUT lowercorner; integer list;  NULL; coordinates the lower corner
@@ -14,7 +14,7 @@
 MODULE ImportHDF5Species
 CATEGORY Import and Export
 DESCRIPTION imports from an HDF5 file particles that meet given conditions
-LOADABLE "@prefix@/[EMAIL PROTECTED]@/@dlname@"
+LOADABLE "@DXROOT@/[EMAIL PROTECTED]@/@dlname@"
 INPUT filename; string; (none); file name
 INPUT datasetname; string; NULL; dataset name
 INPUT x0min[visible:0]; scalar; NULL; minimal value of coordinate in 1st 
dimension
diff -urN dxhdf5-0.4.5/samples/Makefile.in dxhdf5-new/samples/Makefile.in
--- dxhdf5-0.4.5/samples/Makefile.in    2006-12-08 05:49:15.000000000 -0500
+++ dxhdf5-new/samples/Makefile.in      2007-04-16 17:03:02.000000000 -0400
@@ -145,7 +145,7 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-datadir = $(prefix)/samples/moduleTryOut
+datadir = $(prefix)/share/dx/samples/moduleTryOut
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@

--- NEW FILE: glpk-java.info ---
Package: glpk-java
Version: 4.14
Revision: 2
Type: java(1.4)

Source: http://bjoern.dapnet.de/glpk/source.zip
Source-MD5: 00a0a23e027677f22d9cf141ea52c534
SourceRename: %n-%v.zip
SourceDirectory: source

Depends: glpk (= %v-%r), system-java (>= 1.4)
BuildDepends: system-java-dev (>= 1.4)

Patch: %n.patch

CompileScript: <<

 # Java library
 cd java && mkdir -p classes && javac -d classes *.java
 cd java/classes && jar cf ../%n.jar .
 cd java && javah -classpath classes -jni org.gnu.glpk.GlpkSolver
 
 # Javadocs
 mkdir -p java/doc/api
 cp  java/*.java java/doc/api
 cd java/doc/api && javadoc *
 rm -f java/doc/api/*.java
 
 # JNI library
 cd c && gcc -fPIC -fno-common -I $JAVA_HOME/include -I ../java/ -I %p/include/ 
-idirafter /usr/include/sys -c glpk_jni.c
 cd c && gcc -dynamiclib glpk_jni.o -compatibility_version %v -current_version 
%v -o libglpk_jni.jnilib -lc -lglpk -L%p/lib
 
<<

InstallScript: <<

 # JNI library
 mkdir -p %i/lib
 cp c/libglpk_jni.jnilib %i/lib
 
 # Docs
 mkdir -p %i/share/doc/%n/api
 cp -R java/doc/api/* %i/share/doc/%n/api/
 cp LICENSE %i/share/doc/%n/

<<

JarFiles: java/%n.jar

HomePage: http://bjoern.dapnet.de/glpk/index.htm
Maintainer: Trevor Harmon <[EMAIL PROTECTED]>
Description: Java bindings for GLPK
License: GPL

DescDetail: <<
This package provides a Java Native Interface (JNI) for the GNU Linear
Programming Kit (GLPK). It allows GLPK functions to be called from Java.
<<

DescUsage: <<
To run Java programs that use this library, you will need to set the
java.library.path property. For example:

  java -Djava.library.path=%p/lib MyGLPKProgram

As an alternative, it is possible to accomplish the same results by setting
the DYLD_LIBRARY_PATH environment variable. For example:

  export DYLD_LIBRARY_PATH=%p/lib

However, changing this variable can cause other programs to fail.
<<

Index: mizar-gab-html.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mizar-gab-html.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- mizar-gab-html.info 13 Feb 2007 19:58:11 -0000      1.1.2.3
+++ mizar-gab-html.info 30 Apr 2007 02:48:27 -0000      1.1.2.4
@@ -1,11 +1,11 @@
 Package: mizar-gab-html
 Description: HTML presentation of Generated ABstracts
-Version: 4.76.959
+Version: 4.81.962
 Revision: 1
 Homepage: http://merak.pb.bialystok.pl
 License: Commercial
 Source: http://merak.pb.bialystok.pl/mmlquery/downloads/html-%v.tgz
-Source-MD5: e04dddcb8320686233db4efa241a70f2
+Source-MD5: afd148fd436ef68694610f9e07f63c0c
 SourceDirectory: %v
 Maintainer: Jesse Alama <[EMAIL PROTECTED]>
 CompileScript: <<
@@ -22,5 +22,4 @@
 
 For more information on the MML Query tool, which is used to produce
 the GAB's, see http://merak.pb.bialystok.pl .
-<<
-                
+<<
\ No newline at end of file

Index: octave-forge.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave-forge.info,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- octave-forge.info   16 Jan 2007 16:03:12 -0000      1.10.2.1
+++ octave-forge.info   30 Apr 2007 02:48:28 -0000      1.10.2.2
@@ -1,9 +1,9 @@
 Package: octave-forge
 Version: 2006.03.17
-Revision: 1003
+Revision: 1004
 Maintainer: Corey Halpin <[EMAIL PROTECTED]>
 BuildDepends: <<
-  texinfo, g95, libjpeg, fftw3, textutils,  gsl, pcre,
+  texinfo, g95, libjpeg, fftw3, gsl, pcre,
   hdf5 (>= 1.6.5-1002),
   readline5 (>= 5.0-1004), imagemagick-dev
 <<
@@ -18,6 +18,7 @@
 Source-MD5: d054fa8de6d2494c3efbddaa823da42f
 #Patch: %n.patch
 UpdateConfigGuess: true
+#SetCPPFLAGS: -no-cpp-precomp
 SetLDFLAGS:
 SetLIBRARY_PATH: %p/lib
 ConfigureParams: <<

Index: pygsl-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pygsl-py.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- pygsl-py.info       22 Sep 2006 18:27:46 -0000      1.3
+++ pygsl-py.info       30 Apr 2007 02:48:28 -0000      1.3.2.1
@@ -1,17 +1,20 @@
 Info2: <<
 Package: pygsl-py%type_pkg[python]
-Version: 0.3.2
+Version: 0.9.0
 Revision: 1
 Type: python(2.3 2.4 2.5)
 Description: Python interface for the GNU Scientific Library
 License: GPL
 Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
-Depends: python%type_pkg[python] | python%type_pkg[python]-nox, gsl-shlibs 
(>=1.4), numeric-py%type_pkg[python]
+Depends: <<
+  python%type_pkg[python] | python%type_pkg[python]-nox, gsl-shlibs (>=1.4),
+  numpy-py%type_pkg[python]
+<<
 BuildDepends: gsl (>=1.4)
 Source: mirror:sourceforge:pygsl/pygsl-%v.tar.gz
-Source-MD5: dde5f5a23dba8e63818dbfadb12e9a09
+Source-MD5: c69c3deed25525f153f2f03942e99040
 CompileScript: <<
-  python%type_raw[python] setup.py build
+  python%type_raw[python] setup.py build --array-object=numpy
 <<
 InstallScript: <<
   python%type_raw[python] setup.py install --root=%d

--- NEW FILE: netcdf.patch ---
--- netcdf-3.6.2/Makefile.am.orig       2007-02-21 16:25:37.000000000 -0500
+++ netcdf-3.6.2/Makefile.am    2007-03-23 20:45:58.000000000 -0400
@@ -24,6 +24,11 @@
 F77_TEST = nf_test
 endif
 
+# Does the user want C API?
+if BUILD_C
+LIBSRC = libsrc
+endif
+
 # Does the user want C++ API?
 if BUILD_CXX
 CXX_DIR = cxx
@@ -57,7 +62,7 @@
 # This is the list of subdirs for which Makefiles will be constructed
 # and run. ncgen must come before ncdump and cxx, because their tests
 # depend on it. nf_test depends upon ncgen as well.
-SUBDIRS = $(F90_DIR) $(F77_DIR) libsrc $(V2_TEST) $(NCGEN) $(NCDUMP)   \
+SUBDIRS = $(F90_DIR) $(F77_DIR) $(LIBSRC) $(V2_TEST) $(NCGEN) $(NCDUMP)        
\
 $(F77_TEST) ${CXX_DIR} nc_test $(MAN) $(EXAMPLES)
 
 # make test should do the same as make check.
--- netcdf-3.6.2/Makefile.in.orig       2007-03-01 17:46:18.000000000 -0500
+++ netcdf-3.6.2/Makefile.in    2007-03-23 20:46:07.000000000 -0400
@@ -263,6 +263,9 @@
 @[EMAIL PROTECTED] = fortran
 @[EMAIL PROTECTED] = nf_test
 
+# Does the user want C API?
[EMAIL PROTECTED]@LIBSRC = libsrc
+
 # Does the user want C++ API?
 @[EMAIL PROTECTED] = cxx
 
@@ -283,7 +286,7 @@
 # This is the list of subdirs for which Makefiles will be constructed
 # and run. ncgen must come before ncdump and cxx, because their tests
 # depend on it. nf_test depends upon ncgen as well.
-SUBDIRS = $(F90_DIR) $(F77_DIR) libsrc $(V2_TEST) $(NCGEN) $(NCDUMP)   \
+SUBDIRS = $(F90_DIR) $(F77_DIR) $(LIBSRC) $(V2_TEST) $(NCGEN) $(NCDUMP)        
\
 $(F77_TEST) ${CXX_DIR} nc_test $(MAN) $(EXAMPLES)
 
 
--- netcdf-3.6.2/f90/netcdf_f90.3.orig  2006-08-14 15:32:52.000000000 -0400
+++ netcdf-3.6.2/f90/netcdf_f90.3       2007-03-23 23:12:15.000000000 -0400
@@ -456,7 +456,7 @@
 and the name of the variable.
 .RE
 .HP
-\fBfunction nf90_Inqire_Variable(\fIncid\fP, \fIvarid\fP, \fIname\fP, 
+\fBfunction nf90_inquire_variable(\fIncid\fP, \fIvarid\fP, \fIname\fP, 
 \fIxtype\fP, \fIndims\fP, \fIdimids\fP, \fInatts\fP)\fR
 .RS
 .nf
--- netcdf-3.6.2/man/netcdf_f90-man.html.orig   2007-03-01 17:48:13.000000000 
-0500
+++ netcdf-3.6.2/man/netcdf_f90-man.html        2007-03-23 23:12:59.000000000 
-0400
@@ -713,7 +713,7 @@
 <tr valign="top" align="left">
 <td width="10%"></td>
 <td width="89%">
-<p><b>function nf90_Inqire_Variable(</b><i>ncid</i><b>,</b>
+<p><b>function nf90_inquire_variable(</b><i>ncid</i><b>,</b>
 <i>varid</i><b>,</b> <i>name</i><b>,</b>
 <i>xtype</i><b>,</b> <i>ndims</i><b>,</b>
 <i>dimids</i><b>,</b> <i>natts</i><b>)</b></p></td>
--- netcdf-3.6.2/cxx/Makefile.am.orig   2007-02-27 10:44:33.000000000 -0500
+++ netcdf-3.6.2/cxx/Makefile.am        2007-03-24 15:32:32.000000000 -0400
@@ -68,9 +68,8 @@
 
 else # not USE_NETCDF4
 
-# Point pre-processor and linker to netcdf-3 directory (libsrc).
+# Point pre-processor to netcdf-3 directory (libsrc).
 AM_CPPFLAGS += -I$(top_srcdir)/libsrc
-AM_LDFLAGS = -L. -L$(top_builddir)/libsrc
 
 # Link to the netCDF-3 library and the C++ library.
 LDADD = $(top_builddir)/cxx/libnetcdf_c++.la 
$(top_builddir)/libsrc/libnetcdf.la 
--- netcdf-3.6.2/cxx/Makefile.in.orig   2007-03-01 17:46:14.000000000 -0500
+++ netcdf-3.6.2/cxx/Makefile.in        2007-03-24 15:33:51.000000000 -0400
@@ -318,7 +318,6 @@
 tst_failure_SOURCES = tst_failure.cpp
 XFAIL_TESTS = tst_failure$(EXEEXT)
 TESTS = $(TESTFILES) $(am__append_1) $(am__append_6)
[EMAIL PROTECTED]@AM_LDFLAGS = -L. -L$(top_builddir)/libsrc
 @[EMAIL PROTECTED] = -L. -L$(top_builddir)/libsrc4 \
 @USE_NETCDF4_TRUE@     $(am__append_4)
 

Index: mizar.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mizar.info,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- mizar.info  13 Feb 2007 19:58:11 -0000      1.2.2.3
+++ mizar.info  30 Apr 2007 02:48:28 -0000      1.2.2.4
@@ -1,6 +1,6 @@
 Package: mizar
 Depends: mizar-bin, mizar-mml, mizar-doc
-Version: 7.8.03-4.76.959
+Version: 7.8.04-4.81.962
 Revision: 2
 Description: Build and check first-order formal proofs
 Recommends: mizar-semantic-mml, mizar-gab, mizar-mode, mizar-gab-html
@@ -25,8 +25,8 @@
 << 
 Maintainer: Jesse Alama <[EMAIL PROTECTED]>
 Homepage: http://www.mizar.org/
-Source: 
ftp://mizar.uwb.edu.pl/pub/system/ppc-darwin/%n-7.8.03_4.76.959-ppc-darwin.tar
-Source-MD5: 48cbb2bef1b01edb7eb490acc233e570
+Source: 
ftp://mizar.uwb.edu.pl/pub/system/ppc-darwin/%n-7.8.04_4.81.962-ppc-darwin.tar
+Source-MD5: 0633cb2dbfae2974cc9a3c5c99dfdcc9
 NoSourceDirectory: true
 DocFiles: README
 License: Commercial
@@ -121,5 +121,4 @@
     share/doc/mizar/syntax.txt
     share/doc/mizar/xml
   <<
-<<
-                
+<<
\ No newline at end of file

--- NEW FILE: dx-hdf5.info ---
Package: dx-hdf5
Version: 0.4.5
Revision: 1000
Source: http://www-beams.colorado.edu/dxhdf5/download/dxhdf5-%v.tar.gz
Source-MD5: 0946bc46ae70a3848a26899ed7b03da3
Depends: hdf5-shlibs, dx (>=4.3.2-3), szip-shlibs
BuildDepends: hdf5, szip
Patch: %n.patch
GCC:4.0
DocFiles: README AUTHORS NEWS LICENSE
Description: Modules for importing hdf5 files into opendx 
ConfigureParams: --with-hdf5-incdir=%p/include --datadir=%p/share/dx
InstallScript: <<
make install DESTDIR=%d
<<
DescDetail: <<
The package contains two OpenDX modules:
The ImportHDF5Field module imports a field or a slab of a field from an HDF5
file. The field can be either scalar or vector and must be described on a 
regular grid. The ImportHDF5Species module imports from an HDF5 file particles
which satisfy the user's conditions.
<<
DescUsage:<<
The script %p/bin/dxhd5 automatically loads the hdf5 module description files.
Sample nets are located in %p/share/dx/samples/moduleTryOut. Run dx from 
that directory-- certain sample filenames are hard coded into the sample
programs.
<<
DescPort:<<
Changed the install locations to comply with fink. Rewrote some of the scripts 
to take advantage of these new locations.
<<
License: Restrictive/Distributable
Maintainer: Jeremy Erwin <[EMAIL PROTECTED]>
Homepage: http://www-beams.colorado.edu/dxhdf5/

Index: dx.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/dx.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- dx.info     1 Jun 2006 22:34:46 -0000       1.3
+++ dx.info     30 Apr 2007 02:48:27 -0000      1.3.2.1
@@ -1,11 +1,11 @@
 Package: dx
-Version: 4.4.0
+Version: 4.4.4
 Revision: 1000
 Source:  http://opendx.npaci.edu/source/%n-%v.tar.gz
-Source-MD5: 8fe6a09faea4aa713a1540f51371b719 
+Source-MD5: 6da0c4cd21d3c08f97b7662e3aee5b7b
 Patch: %n.patch
-BuildDepends: openmotif3 (>= 2.2.3-11), libtiff (>= 3.7.2-1001), netcdf (>= 
3.6.1-1001), automake1.7, libtool14, imagemagick-dev (>= 6.1.8-1003), x11-dev
-Depends: openmotif3-shlibs (>= 2.2.3-11), imagemagick (>= 6.1.8-1003), 
netcdf-shlibs (>= 3.6.1-1001), libtiff-shlibs (>= 3.7.2-1001), hdf (>= 
4.2r1-1001), x11 
+BuildDepends: openmotif3 (>= 2.2.3-11), libtiff (>= 3.7.2-1001), netcdf (>= 
3.6.1-1001), automake1.7, libtool14, imagemagick-dev (>= 6.1.8-1002), 
x11-dev,lcms,libpng3,libxml2
+Depends: openmotif3-shlibs (>= 2.2.3-11), imagemagick-shlibs (>= 6.1.8-1003), 
netcdf-shlibs (>= 3.6.1-1001), libtiff-shlibs (>= 3.7.2-1001), hdf (>= 
4.2r1-1001), 
x11,libiconv,lcms-shlibs,libpng3-shlibs,libtool14-shlibs,libxml2-shlibs
 ConfigureParams:  --prefix=%p/share --exec_prefix=%p  --with-motif-libs=%p/lib 
--with-motif-includes=%p/include --without-javadx --with-large-arenas
 GCC:4.0
 SetCXX:g++-4.0
@@ -24,10 +24,6 @@
 <<
 DocFiles: <<
 LICENSE NEWS README doc/README COPYING doc/README_SMP
-doc/README_alphax doc/README_aviion doc/README_hp700 
-doc/README_ibm6000 doc/README_ibmpvs doc/README_indigo
-doc/README_intelnt doc/README_sgi doc/README_sgi4 doc/README_solaris 
-doc/README_sun4
 <<
 License: OSI-Approved
 Description: Open Visualization Data Explorer
@@ -52,9 +48,6 @@
  in %p/bin, %p/include, %p/share/man etc. Using %p/lib breaks things, so 
 I've left the "libraries"  in %/p/share/dx/lib. 
 Disables java dx.
-During compilation, the build will seem to hang. zClipQ.C is resistant to 
-aggressive optimization. On my G4/1.25, compilation of this file may take 
-up to thirty minutes.
 Fixed the -morehelp option.
 Now uses openmotif3, as lesstif doesn't render some widgets correctly.
 Corrected configure.ac so all necesary hdf libaries are compiled in.


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to