Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9671/main/finkinfo/sci
Modified Files:
Tag: pangocairo-branch
classicladder.info coot.info fftw3.info proj.info
scipy-core-py.info xcircuit-testing.info
Log Message:
another merge from HEAD
Index: xcircuit-testing.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/xcircuit-testing.info,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -d -r1.19.2.1 -r1.19.2.2
--- xcircuit-testing.info 20 Dec 2006 18:01:15 -0000 1.19.2.1
+++ xcircuit-testing.info 9 Jan 2007 18:04:33 -0000 1.19.2.2
@@ -1,16 +1,21 @@
Package: xcircuit-testing
-Version: 3.6.73
+Version: 3.6.77
Revision: 1
Depends: x11, ghostscript, tcltk
BuildDepends: m4, tcltk-dev, x11-dev, automake1.9
Conflicts: xcircuit
Replaces: xcircuit
Source: http://opencircuitdesign.com/xcircuit/archive/xcircuit-%v.tgz
-Source-MD5: 465ee663c664377ec13c06cf15a77cf0
+Source-MD5: eac5d85c3ccff3dc5cd2d7d0b46e9bb4
Patch: %n.patch
ConfigureParams: --with-gnu-ld --mandir=%p/share/man
SetCFLAGS: -I/usr/X11R6/include -fno-common
-InstallScript: make install DESTDIR=%d
+InstallScript: <<
+make install DESTDIR=%d
+mkdir -p %i/share/man/man1
+mv %i/lib/xcircuit-3.6/man/xcircuit.1 %i/share/man/man1
+rm -r %i/lib/xcircuit-3.6/man
+<<
DocFiles: COPYRIGHT README* TODO CHANGES
Description: Circuit drawing app with schematic capture
DescDetail: <<
@@ -41,11 +46,14 @@
Added -I/usr/X11R6/include to CFLAGS because it wouldn't work with
CPPFLAGS. This is needed because the linker apparently can't find
the X11 headers by default on XFree86 or Xorg.
-Patch Makefile.in to install manpage in Fink-appropriate location because
-Makefile doesn't honor --mandir=foo and to make sure that xcircuit.dylib
-has a proper install_name.
+Patch Makefile.in to make sure that xcircuit.dylib has a proper install_name.
%p/lib/xcircuit-3.6/xcircuit.dylib is a private library, not to be linked
by any other package.
+
+Prior versions of this package patched Makefile.in to make the manpage work
+under Fink, but that doesn't seem to work anymore. They seem to want to
+have wanted install it in PREFIX/lib/xcircuit-3.6/man for a while, so I'll
treat
+that as a robust location and move the manpage in the InstallScript.
<<
DescPackaging: <<
Prior versions by Max Horn.
Index: proj.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/proj.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- proj.info 26 Jun 2006 13:10:40 -0000 1.2
+++ proj.info 9 Jan 2007 18:04:33 -0000 1.2.2.1
@@ -20,7 +20,7 @@
License: BSD
Homepage: http://remotesensing.org/proj/
DescDetail: <<
-PROJ.4 Catographic Projections library provides a library and command
+PROJ.4 Cartographic Projections library provides a library and command
line tools to go between different coordinate frames (e.g. geographic
lat/lon and utm). PROJ.4 is in use by GRASS, MapServer, PostGIS,
Thuban, OGDI and OGRCoordinateTransformation and many other programs.
Index: classicladder.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/classicladder.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
--- classicladder.info 22 Dec 2006 05:02:20 -0000 1.3.2.3
+++ classicladder.info 9 Jan 2007 18:04:32 -0000 1.3.2.4
@@ -1,10 +1,10 @@
Package: classicladder
-Version: 0.7.80
-Revision: 2
+Version: 0.7.100
+Revision: 12
Maintainer: Alexander Hansen <[EMAIL PROTECTED]>
Description: Free ladder logic simulator in C
Source: mirror:sourceforge:%n/%n-%v.zip
-Source-MD5: 54a6ca19ea8ae9b84c8f9202c735444c
+Source-MD5: 58f291cd7ecc1242af4ae9251a56c534
SourceDirectory:%n
Depends: <<
gtk+2-shlibs (>= 2.10.0-1), x11, x11-shlibs, atk1-shlibs (>= 1.12.3-1),
pango1-xft2-ft219-shlibs (>= 1.14.9-1), glib2-shlibs (>= 2.12.0-1),
Index: scipy-core-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-core-py.info,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- scipy-core-py.info 28 Oct 2006 22:10:17 -0000 1.10
+++ scipy-core-py.info 9 Jan 2007 18:04:33 -0000 1.10.2.1
@@ -1,13 +1,13 @@
Info2: <<
Package: scipy-core-py%type_pkg[python]
-Version: 1.0
-Revision: 4
+Version: 1.0.1
+Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Type: python (2.3 2.4 2.5)
Depends: python%type_pkg[python] | python%type_pkg[python]-nox
Source: mirror:sourceforge:numpy/numpy-%v.tar.gz
-Source-MD5: 47dd0daa82e7b3f0fe74b969b388d7b3
+Source-MD5: 13a29244cbe03e0d45e56d8d90ecb55d
Conflicts: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4)
Replaces: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4)
Provides: numpy-py%type_pkg[python], f2py-py%type_pkg[python]
Index: fftw3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/fftw3.info,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- fftw3.info 22 Nov 2006 17:16:39 -0000 1.9
+++ fftw3.info 9 Jan 2007 18:04:32 -0000 1.9.2.1
@@ -1,6 +1,6 @@
Package: fftw3
Version: 3.1.1
-Revision: 3
+Revision: 4
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Source: ftp://ftp.fftw.org/pub/fftw/fftw-%v.tar.gz
Source-MD5: b35813b88a046e4e74a603017794ddcd
@@ -49,6 +49,7 @@
DocFiles: README NEWS TODO COPYING INSTALL COPYRIGHT AUTHORS CONVENTIONS
<<
DocFiles: README NEWS TODO COPYING INSTALL COPYRIGHT AUTHORS CONVENTIONS
+InfoDocs: fftw3.info
Description: Discrete Fourier Transform Lib (Ver 3)
DescDetail: <<
Performs the DFT in one or more dimensions, of both real and complex data,
Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.23.2.5
retrieving revision 1.23.2.6
diff -u -d -r1.23.2.5 -r1.23.2.6
--- coot.info 7 Jan 2007 02:35:46 -0000 1.23.2.5
+++ coot.info 9 Jan 2007 18:04:32 -0000 1.23.2.6
@@ -1,6 +1,6 @@
Package:coot
Version: 0.2
-Revision: 2
+Revision: 3
GCC: 4.0
Source: http://www.ysbl.york.ac.uk/~emsley/software/%n-%v.tar.gz
#Source:
http://www.ysbl.york.ac.uk/~emsley/software/pre-release/%n-%v-revision-%r.tar.gz
@@ -25,7 +25,9 @@
guile16-gui, guile16-goosh (>= 1.3-2), guile16, guile16-net-http,
freeglut-shlibs, libart2-shlibs (>= 2.3.16-2), coot-shlibs (= %v-%r),
imlib-shlibs, libjpeg-shlibs, giflib-shlibs, libpng3-shlibs,
-glib2-shlibs (>= 2.12.0-1), gtk+2-shlibs (>= 2.10.0-1), gnome-libs-shlibs,
libgettext3-shlibs
+glib2-shlibs (>= 2.12.0-1), gtk+2-shlibs (>= 2.10.0-1), gnome-libs-shlibs,
libgettext3-shlibs, povray, raster3d
+imlib-shlibs, libjpeg-shlibs, giflib-shlibs, libpng3-shlibs,
+glib-shlibs, gtk+2-shlibs, gnome-libs-shlibs, povray, raster3d
<<
#
BuildDependsOnly: false
@@ -45,9 +47,13 @@
PatchScript: <<
#!/bin/zsh -exf
perl -pi.bak -e 's|use-modules \(goosh\)|use-modules \(goosh goosh\)|g'
scheme/coot-utils.scm
-perl -pi.bak -e 's/include <malloc.h>//g' **/*.c
-#perl -pi -e 's|no_tips = _coot.no_tips|#no_tips = _coot.no_tips|g' src/coot.py
-#perl -pi -e 's|_coot.set_ncs_homology_leve|_coot.set_ncs_homology_level|g'
src/coot.py
+#perl -pi.bak -e 's/include <malloc.h>//g' **/*.c
+# Use the correct povray directory
+perl -pi.bak -e 's|povray-3.5|povray-3.6|g' scheme/povray.scm
+# Use "open" to display the png snapshot in Preview.app (or the user's default
application)
+perl -pi.bak -e 's|coot-png-display-program
\"display\"|coot-png-display-program \"open\"|g' scheme/raster3d.scm
+# This is required to get the map displayed on both sides of side-by-side
stereo
+echo "(set-display-lists-for-maps 0)" >>| scheme/group-settings.scm
<<
###############################################################################
ConfigureParams: <<
@@ -134,34 +140,34 @@
lib/libcoot-*.dylib
<<
Shlibs: <<
-%p/lib/libccp4mg-surface.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libccp4mg-utils.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-analysis.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-AngleInfo.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-atomutils.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-cabuild.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-compat.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-coord-extras.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-coord-utils.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-coords.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-db-main.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-geometry.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-high-res.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-ideal.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-isosurface.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-ligand.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-map-heavy.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-map-utils.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-mini-mol.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-mmtz-extras.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-sequence-view.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-shelx.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-skeleton.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-surface.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-tw.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-utils.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-wrap-guile.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
-%p/lib/libcoot-wrap-python.0.0.0.dylib 0.1.2 %n (>= 0.1.2-1001)
+%p/lib/libccp4mg-surface.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libccp4mg-utils.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-analysis.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-AngleInfo.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-atomutils.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-cabuild.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-compat.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-coord-extras.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-coord-utils.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-coords.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-db-main.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-geometry.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-high-res.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-ideal.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-isosurface.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-ligand.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-map-heavy.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-map-utils.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-mini-mol.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-mmtz-extras.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-sequence-view.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-shelx.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-skeleton.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-surface.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-tw.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-utils.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-wrap-guile.0.0.0.dylib 0.2 %n (>= 0.2-1)
+%p/lib/libcoot-wrap-python.0.0.0.dylib 0.2 %n (>= 0.2-1)
<<
<<
#
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
