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

Modified Files:
      Tag: pangocairo-branch
        coot.info geda-gattrib.info geda-gnetlist.info 
        geda-gschem.info geda-gsymcheck.info geda-utils.info 
Log Message:
lots of pangocairo fixes, libxine1 builds everywhere again, and some other misc 
build fixes

Index: geda-gschem.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geda-gschem.info,v
retrieving revision 1.6.2.29
retrieving revision 1.6.2.30
diff -u -d -r1.6.2.29 -r1.6.2.30
--- geda-gschem.info    16 Mar 2008 21:54:13 -0000      1.6.2.29
+++ geda-gschem.info    3 May 2008 03:54:59 -0000       1.6.2.30
@@ -1,19 +1,16 @@
 Package: geda-gschem
 Epoch: 1
 Version: 1.4.0
-Revision: 13
+Revision: 14
 
 # geda-utils 20070216 has gschemdoc, but that's now in geda-gschem.
 Depends: <<
   geda-symbols (>= %e:%v-0),
   geda-utils (>= %e:%v-0),
 
-  atk1-shlibs,
   desktop-file-utils,
   gd2-shlibs,
-  glib2-shlibs (>= 2.12.0-1),
   gmp-shlibs (>= 4.2.2-1001),
-  gtk+2,
   gtk+2-shlibs,
   guile18,
   libgeda33-shlibs,
@@ -23,20 +20,24 @@
   libpng3-shlibs (>= 1:1.2.16-1),
   libstroke-shlibs,
   libtool14-shlibs,
-  pango1-xft2,
-  pango1-xft2-shlibs,
+  pango1-xft2-ft219-shlibs,
   x11
 <<
 
 BuildDepends: <<
   geda-symbols (>= %e:%v-0),
 
-  atk1, 
+  atk1 (>= 1.20.0-1), 
+  cairo (>= 1.6-1),
+  expat1,
+  fontconfig2-dev (>= 2.4.1-1),
+  freetype219 (>= 2.3.5-1),
   gd2,
   gettext-tools,
-  glib2-dev (>= 2.12.0-1), 
+  glib2-dev (>= 2.14.0-1), 
+  glitz,
   gmp (>= 4.2.2-1001),
-  gtk+2-dev, 
+  gtk+2-dev (>= 2.12.0-1), 
   guile18-dev,
   intltool,
   libgeda (>= %e:%v-0),
@@ -45,10 +46,13 @@
   libjpeg,
   libpng3,
   libstroke, 
+  libtiff,
   libtool14,
-  pango1-xft2-dev,
-  pkgconfig, 
-  x11-dev
+  pango1-xft2-ft219-dev (>= 1.18.4-4),
+  pixman (>= 0.10.0-1),
+  pkgconfig (>= 0.22-3), 
+  x11-dev,
+  xft2-dev
 <<
 
 Recommends: geda-examples (>= %e:%v-0), geda-doc (>= %e:%v-0)
@@ -70,9 +74,16 @@
 <<
 
 ConfigureParams: --infodir=%p/share/info --with-rcdir=%p/etc/gEDA 
--mandir=%p/share/man GUILE=%p/bin/guile-1.8 
GUILE_CONFIG=%p/bin/guile-1.8-config GUILEINTERP=%p/bin/guile-1.8 
--disable-dependency-tracking
+CompileScript: <<
+#!/bin/sh -ev
+
+       export 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+       ./configure %c
+       make
+<<
 
 InstallScript: <<
-  make install DESTDIR=%d
+  make -j1 install DESTDIR=%d
   rm %i/share/applications/mimeinfo.cache
 <<
 

Index: geda-utils.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geda-utils.info,v
retrieving revision 1.7.2.31
retrieving revision 1.7.2.32
diff -u -d -r1.7.2.31 -r1.7.2.32
--- geda-utils.info     16 Mar 2008 21:54:13 -0000      1.7.2.31
+++ geda-utils.info     3 May 2008 03:54:59 -0000       1.7.2.32
@@ -1,17 +1,15 @@
 Package: geda-utils
 Epoch: 1
 Version: 1.4.0
-Revision: 13
+Revision: 14
 
 # When updating libgeda31-shlibs, don't forget the gsch2pcb splitoff below.
 Depends: <<
   geda-symbols (>= %e:%v-0), 
-  atk1-shlibs,
   gd2-shlibs,
-  glib2-shlibs (>= 2.12.0-1),
+  glib2-shlibs (>= 2.14.0-1),
   gmp-shlibs,
-  gtk+2,
-  gtk+2-shlibs,
+  gtk+2-shlibs (>= 2.12.0-1),
   guile18,
   libgeda33-shlibs,
   libgettext3-shlibs,
@@ -19,18 +17,22 @@
   libjpeg-shlibs,
   libpng3-shlibs (>= 1:1.2.16-1),
   libstroke-shlibs,
-  pango1-xft2,
-  pango1-xft2-shlibs,
+  pango1-xft2-ft219-shlibs (>= 1.18.4-4),
   x11
 <<
 
 BuildDepends: <<
-  atk1, 
+  atk1 (>= 1.20.0-1), 
+  cairo (>= 1.6-1),
+  expat1,
+  fontconfig2-dev (>= 2.4.1-1),
+  freetype219 (>= 2.3.5-1),
   gd2,
   gettext-tools,
-  glib2-dev (>= 2.12.0-1), 
+  glib2-dev (>= 2.14.0-1), 
+  glitz,
   gmp,
-  gtk+2-dev, 
+  gtk+2-dev (>= 2.12.0-1), 
   guile18-dev,
   intltool,
   libgeda (>= %e:%v-0),
@@ -39,9 +41,12 @@
   libjpeg,
   libpng3,
   libstroke, 
-  pango1-xft2-dev,
-  pkgconfig, 
-  x11-dev
+  libtiff,
+  pango1-xft2-ft219-dev (>= 1.18.4-4),
+  pixman (>= 0.10.0-1),
+  pkgconfig (>= 0.22-3), 
+  x11-dev,
+  xft2-dev
 <<
 
 Provides: geda-gsch2pcb
@@ -59,9 +64,9 @@
 
 ConfFiles: %p/etc/gEDA/system-gschlasrc
 
-ConfigureParams: --with-rcdir=%p/etc/gEDA --mandir=%p/share/man 
GUILE=%p/bin/guile-1.8 GUILE_CONFIG=%p/bin/guile-1.8-config 
--disable-dependency-tracking
+ConfigureParams: --with-rcdir=%p/etc/gEDA --mandir=%p/share/man 
GUILE=%p/bin/guile-1.8 GUILE_CONFIG=%p/bin/guile-1.8-config 
--disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 
-InstallScript: make install DESTDIR=%d
+InstallScript: make -j1 install DESTDIR=%d
 
 DocFiles: AUTHORS README
 

Index: geda-gattrib.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geda-gattrib.info,v
retrieving revision 1.8.2.32
retrieving revision 1.8.2.33
diff -u -d -r1.8.2.32 -r1.8.2.33
--- geda-gattrib.info   16 Mar 2008 21:54:13 -0000      1.8.2.32
+++ geda-gattrib.info   3 May 2008 03:54:59 -0000       1.8.2.33
@@ -1,18 +1,15 @@
 Package: geda-gattrib
 Epoch: 1
 Version: 1.4.0
-Revision: 13
+Revision: 14
 
 Depends: <<
   geda-symbols (>= %e:%v-0), 
 
-  atk1-shlibs,
   desktop-file-utils,
   gd2-shlibs,
-  glib2-shlibs (>= 2.12.0-1),
   gmp-shlibs (>= 4.2.2-1001),
-  gtk+2,
-  gtk+2-shlibs,
+  gtk+2-shlibs (>= 2.12.0-1),
   guile18,
   libgeda33-shlibs,
   libgettext3-shlibs,
@@ -21,20 +18,23 @@
   libpng3-shlibs (>= 1:1.2.16-1),
   libstroke-shlibs,
   libtool14-shlibs (>= 1.5.26-1),
-  pango1-xft2,
-  pango1-xft2-shlibs,
   x11
 <<
 
 BuildDepends: <<
   geda-symbols (>= %e:%v-0), 
 
-  atk1, 
+  atk1 (>= 1.20.0-1), 
+  cairo (>= 1.6-1),
+  expat1,
+  fontconfig2-dev (>= 2.4.1-1),
+  freetype219 (>= 2.3.5-1),
   gd2,
   gettext-tools,
-  glib2-dev (>= 2.12.0-1), 
+  glib2-dev (>= 2.14.0-1), 
+  glitz,
   gmp (>= 4.2.2-1001),
-  gtk+2-dev, 
+  gtk+2-dev (>= 2.12.0-1), 
   guile18-dev,
   intltool,
   libgeda (>= %v-0),
@@ -43,10 +43,13 @@
   libjpeg,
   libpng3,
   libstroke, 
+  libtiff,
   libtool14 (>= 1.5.26-1),
-  pango1-xft2-dev,
-  pkgconfig, 
-  x11-dev
+  pango1-xft2-ft219-dev (>= 1.18.4-4),
+  pixman (>= 0.10.0-1),
+  pkgconfig (>= 0.22-3), 
+  x11-dev,
+  xft2-dev
 <<
 
 # 1.4
@@ -63,10 +66,10 @@
 
 ConfFiles: %p/etc/gEDA/system-gattribrc
 
-ConfigureParams: --infodir=%p/share/info --with-rcdir=%p/etc/gEDA 
--mandir=%p/share/man GUILE=%p/bin/guile-1.8 
GUILE_CONFIG=%p/bin/guile-1.8-config --disable-dependency-tracking 
--disable-update-desktop-database --localedir=%p/share/locale
+ConfigureParams: --infodir=%p/share/info --with-rcdir=%p/etc/gEDA 
--mandir=%p/share/man GUILE=%p/bin/guile-1.8 
GUILE_CONFIG=%p/bin/guile-1.8-config --disable-dependency-tracking 
--disable-update-desktop-database --localedir=%p/share/locale 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 
 InstallScript: <<
-  make install DESTDIR=%d
+  make -j1 install DESTDIR=%d
   mv %i/lib/locale %i/share/locale
 <<
   

Index: geda-gnetlist.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geda-gnetlist.info,v
retrieving revision 1.8.2.32
retrieving revision 1.8.2.33
diff -u -d -r1.8.2.32 -r1.8.2.33
--- geda-gnetlist.info  16 Mar 2008 21:54:13 -0000      1.8.2.32
+++ geda-gnetlist.info  3 May 2008 03:54:59 -0000       1.8.2.33
@@ -1,32 +1,34 @@
 Package: geda-gnetlist
 Epoch: 1
 Version: 1.4.0
-Revision: 13
+Revision: 14
 
 Depends: <<
-  atk1-shlibs,
   geda-symbols (>= %e:%v-0), 
-  glib2-shlibs (>= 2.12.0-1),
+  glib2-shlibs (>= 2.14.0-1),
   gmp-shlibs (>= 4.2.2-1001),
-  gtk+2,
-  gtk+2-shlibs,
+  gtk+2-shlibs (>= 2.12.0-1),
   guile18,
   libgeda33-shlibs,
   libgettext3-shlibs,
   libiconv,
   libtool14-shlibs (>= 1.5.26-1),
-  pango1-xft2,
-  pango1-xft2-shlibs,
+  pango1-xft2-ft219-shlibs (>= 1.18.4-1),
   x11
 <<
 BuildDepends: <<
-  atk1,
+  atk1 (>= 1.20.0-1),
+  cairo (>= 1.6-1),
+  expat1,
+  fontconfig2-dev (>= 2.4.1-1),
+  freetype219 (>= 2.3.5-1),
   gd2,
   gettext-tools,
   geda-symbols (>= %e:%v-0),
-  glib2-dev (>= 2.12.0-1),
+  glib2-dev (>= 2.14.0-1),
+  glitz,
   gmp,
-  gtk+2-dev,
+  gtk+2-dev (>= 2.12.0-1),
   guile18-dev,
   intltool,
   libgeda (>= %e:%v-0),
@@ -34,10 +36,13 @@
   libiconv-dev,
   libjpeg,
   libpng3,
+  libtiff,
   libtool14 (>= 1.5.26-1),
-  pango1-xft2-dev,
-  pkgconfig,
-  x11-dev
+  pango1-xft2-ft219-dev (>= 1.18.4-4),
+  pixman (>= 0.10.0-1),
+  pkgconfig (>= 0.22-3),
+  x11-dev,
+  xft2-dev
 <<
 
 CustomMirror: <<
@@ -52,9 +57,15 @@
 ConfFiles: %p/etc/gEDA/system-gnetlistrc
 
 ConfigureParams: --infodir=%p/share/info --with-rcdir=%p/etc/gEDA 
--mandir=%p/share/man GUILE=%p/bin/guile-1.8 
GUILE_CONFIG=%p/bin/guile-1.8-config --disable-dependency-tracking
+CompileScript: <<
+#!/bin/sh -ev
+       export 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+       ./configure %c
+       make
+<<
 
 InstallScript: <<
-    make install DESTDIR=%d
+    make -j1 install DESTDIR=%d
     mkdir -p %d/%p/share/gEDA/%n-%v
     mv examples %d/%p/share/gEDA/%n-%v
 <<

Index: geda-gsymcheck.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geda-gsymcheck.info,v
retrieving revision 1.7.2.28
retrieving revision 1.7.2.29
diff -u -d -r1.7.2.28 -r1.7.2.29
--- geda-gsymcheck.info 16 Mar 2008 21:54:13 -0000      1.7.2.28
+++ geda-gsymcheck.info 3 May 2008 03:54:59 -0000       1.7.2.29
@@ -1,17 +1,14 @@
 Package: geda-gsymcheck
 Epoch: 1
 Version: 1.4.0
-Revision: 13
+Revision: 14
 
 Depends: <<
   geda-symbols (>= %e:%v-0),
 
-  atk1-shlibs,
   gd2-shlibs,
-  glib2-shlibs (>= 2.12.0-1),
   gmp-shlibs (>= 4.2.2-1001),
-  gtk+2,
-  gtk+2-shlibs,
+  gtk+2-shlibs (>= 2.12.0-1),
   guile18,
   libgeda33-shlibs,
   libgettext3-shlibs,
@@ -19,16 +16,20 @@
   libjpeg-shlibs,
   libpng3-shlibs (>= 1:1.2.16-1),
   libstroke-shlibs,
-  pango1-xft2,
-  pango1-xft2-shlibs,
+  pango1-xft2-ft219-shlibs (>= 1.18.4-4),
   x11
 <<
 
 BuildDepends: <<
-  atk1, 
+  atk1 (>= 1.20.0-1), 
+  cairo (>= 1.6-1),
+  expat1,
+  fontconfig2-dev (>= 2.4.1-1),
+  freetype219 (>= 2.3.5-1),
   gd2,
   gettext-tools,
-  glib2-dev (>= 2.12.0-1), 
+  glib2-dev (>= 2.14.0-1), 
+  glitz,
   gmp (>= 4.2.2-1001),
   gtk+2-dev, 
   guile18-dev,
@@ -39,9 +40,12 @@
   libjpeg,
   libpng3,
   libstroke, 
-  pango1-xft2-dev,
-  pkgconfig, 
-  x11-dev
+  libtiff,
+  pango1-xft2-ft219-dev (>= 1.18.4-4),
+  pixman (>= 0.10.0-1),
+  pkgconfig (>= 0.22-3), 
+  x11-dev,
+  xft2-dev
 <<
 
 CustomMirror: <<
@@ -56,9 +60,16 @@
 ConfFiles: %p/etc/gEDA/system-gsymcheckrc
 
 ConfigureParams: --infodir=%p/share/info --with-rcdir=%p/etc/gEDA 
--mandir=%p/share/man GUILE=%p/bin/guile-1.8 
GUILE_CONFIG=%p/bin/guile-1.8-config --disable-dependency-tracking
+CompileScript: <<
+#!/bin/sh -ev
+
+       export 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+       ./configure %c
+       make
+<<
 
 InstallScript: <<
-  make install DESTDIR=%d
+  make -j1 install DESTDIR=%d
 <<
 
 DocFiles: AUTHORS BUGS COPYING NEWS README TODO

Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.23.2.35
retrieving revision 1.23.2.36
diff -u -d -r1.23.2.35 -r1.23.2.36
--- coot.info   27 Apr 2008 23:16:32 -0000      1.23.2.35
+++ coot.info   3 May 2008 03:54:59 -0000       1.23.2.36
@@ -1,6 +1,6 @@
 Package:coot
 Version: 0.5-pre-1
-Revision: 958.2
+Revision: 958.3
 GCC: 4.0 
 Source: 
http://www.ysbl.york.ac.uk/~emsley/software/pre-release/%n-%v-revision-958.tar.gz
 # Source: http://www.ysbl.york.ac.uk/~emsley/software/%n-%v.tar.gz
@@ -13,7 +13,6 @@
 #
 ###############################################################################
 Description: Crystallographic molecular graphics
-Conflicts: guile, guile-shlibs
 DescDetail: <<
 Coot stands for Crystallograhic Object Oriented Toolkit. It is a testbest 
 toolkit for (Protein) Crystallography. Coot uses professional (and free) 
@@ -34,13 +33,20 @@
 ###############################################################################
 Recommends:  povray, ccp4, raster3d                        
 BuildDepends: <<
+ autoconf (>= 2.60-1)            ,
+ automake1.10                    ,
+ libtool14                       ,
  ccp4-onlylibs-dev   (>= 6.0.2-9),
- atk1                                   ,
+ atk1 (>= 1.20.0-1)              ,
+ cairo (>= 1.6-1)                ,
+ expat1                          ,
+ fontconfig2-dev (>= 2.4.1-1)    ,
+ freetype219 (>= 2.3.5-1)        ,
  freeglut                        ,
  giflib                          ,
- glib2-dev                       ,
- gmp                                    ,
- gnome-libs-dev                  ,
+ glib2-dev (>= 2.12.0-1)         ,
+ glitz                           ,
+ gmp                             ,
  gsl                             ,
  gtk+2-dev (>= 2.12.0-1)         ,
  gtkglext1                       ,
@@ -55,23 +61,26 @@
  libgnomecanvas2-dev (>= 2.20.0-1)             ,
  libiconv-dev                    ,
  libjpeg                         ,
- libpng3                         ,
+ libpng3 (>= 1.2.5-4)            ,
  librsvg2-gtk                    ,
- libtool14                              ,
- pango1-xft2-dev                        ,
+ libtiff                         ,
+ libtool14                       ,
+ pango1-xft2-ft219-dev (>= 1.18.4-1) ,
+ pixman (>= 0.10.0-1)            ,
  pygtk2-gtk-py25-dev             ,
  python25                        ,
- swig            
+ swig                            ,
+ x11-dev                         ,
+ xft2-dev
 <<
 # Note: gtkglext1 IS required at runtime for stereo functionality
 Depends: <<
- atk1-shlibs (>= 1.20.0-1)                      ,             
  coot-shlibs (= %v-%r)            ,
+ atk1-shlibs (>= 1.20.0-1)                      ,             
  freeglut-shlibs                  ,
  giflib-shlibs                    ,
  glib2-shlibs                     ,
  gmp-shlibs                       , 
- gnome-libs-shlibs                , 
  gnome-themes-glossy-p            ,
  gsl-shlibs                       ,
  gtk+2-shlibs (>= 2.12.0-1)       ,
@@ -96,7 +105,7 @@
  libtiff-shlibs                   ,
  libtool14-shlibs                 ,
  librsvg2-gtk                     ,
- pango1-xft2-shlibs               ,
+ pango1-xft2-ft219-shlibs         ,
  pygtk2-gtk-py25                  ,
  python25
 <<
@@ -121,15 +130,17 @@
 # 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
 # Fix configure to work with gpp4 library instead of ccp4c
-# perl -pi -e 's|ccp4c|gpp4|g' configure
-perl -pi -e "s|guile -c|guile-1.8  -c|g" configure
-perl -pi -e 's|\(goosh\)|\(goosh goosh\)|g' configure
+# perl -pi -e 's|ccp4c|gpp4|g' macros/*.m4
+perl -pi -e "s|guile -c|guile-1.8  -c|g" macros/*.m4
+perl -pi -e 's|\(goosh\)|\(goosh goosh\)|g' macros/*.m4
+perl -pi -e 's|guile-config|guile-1.8-config|g' macros/*.m4 configure.in
+autoreconf -fvi
 <<
 ###############################################################################
 ConfigureParams: <<  
---with-mmdb-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.2 
--with-clipper-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.2  
--with-fftw=%p/share/xtal/ccp4-onlylibs-dev-6.0.2 \
+--with-mmdb-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.2 
--with-clipper-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.2  \
 --with-glut-prefix=%p --with-gl-prefix=/usr/X11R6 --with-gtk2 \
---with-gnomecanvas-prefix=%p 
--with-ssmlib-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.2  \
+--with-ssmlib-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.2  \
 --with-imlib-prefix=%p --with-gtkgl-prefix=%p --with-glib-prefix=%p \
 --with-guile-gtk --with-guile-gtk-prefix=%p  \
 --with-gsl-prefix=%p --with-guile --with-python 
@@ -138,12 +149,12 @@
 CompileScript: <<
 #!/bin/zsh -efx
 export 
PATH=%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH:%p/share/guile/1.8/goosh
-export SED=/usr/bin/sed
-+export COOT_REFMAC_LIB_DIR=%p/share/coot/lib
-+export 
PYTHONPATH=%p/share/coot/python:%p/lib/python2.5:%p/lib/python2.5/site-packages:%p/lib/python2.5/site-packages/gtk-2.0:%p/lib/python2.5/site-packages/gtk-2.0
+export COOT_REFMAC_LIB_DIR=%p/share/coot/lib
+export 
PYTHONPATH=%p/share/coot/python:%p/lib/python2.5:%p/lib/python2.5/site-packages:%p/lib/python2.5/site-packages/gtk-2.0:%p/lib/python2.5/site-packages/gtk-2.0
+export 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 FLIBS="-L%p/lib" \
-CPPFLAGS="-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/include 
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib 
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib/ssm -I%p/include 
-I$PWD/ccp4mg-utils -I$PWD/src" \
-LDFLAGS="-L%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib -L%p/lib -L/usr/lib 
-lSystemStubs -flat_namespace -L%p/lib/python2.5/config 
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
+CPPFLAGS="-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/include 
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib 
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib/ssm -I%p/include 
-I/usr/X11R6/include -I$PWD/ccp4mg-utils -I$PWD/src" \
+LDFLAGS="-L%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib -L%p/lib -L/usr/lib 
-lSystemStubs -Wl,-undefined,dynamic_lookup -L%p/lib/python2.5/config 
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
 CXX="/usr/bin/g++" \
 CC="/usr/bin/gcc" \
 ./configure %c
@@ -165,7 +176,6 @@
 export PATH=%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH
 export PYTHONPATH=""
 export 
PYTHONPATH=%p/share/coot/python:%p/lib/python2.5:%p/lib/python2.5/site-packages:%p/lib/python2.5/site-packages/gtk-2.0:%p/lib/python2.5/site-packages/gtk-2.0
-export SED=/usr/bin/sed
 export COOT_REFMAC_LIB_DIR=%p/share/coot/lib
 cp src/coot.py python/coot.py
 make install prefix=%i
@@ -217,37 +227,38 @@
 lib/libccp4mg-*.dylib  
 lib/libcoot-*.dylib  
 lib/libcootaneer*.dylib
+
 <<
        Shlibs: <<
-               %p/lib/libccp4mg-surface.0.0.0.dylib                    1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libccp4mg-utils.0.0.0.dylib                              
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-analysis.0.0.0.dylib                     1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-AngleInfo.0.0.0.dylib                    1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-atomutils.0.0.0.dylib                    1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-cabuild.0.0.0.dylib                              
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-compat.0.0.0.dylib                               
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-coord-extras.0.0.0.dylib                 1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-coord-utils.0.0.0.dylib                  1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-coords.0.0.0.dylib                               
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-db-main.0.0.0.dylib                              
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-geometry.0.0.0.dylib                     1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-high-res.0.0.0.dylib                     1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-ideal.0.0.0.dylib                                
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-isosurface.0.0.0.dylib                   1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-ligand.0.0.0.dylib                               
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-map-heavy.0.0.0.dylib                    1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-map-utils.0.0.0.dylib                    1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-mini-mol.0.0.0.dylib                     1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-mmtz-extras.0.0.0.dylib                  1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-sequence-view.0.0.0.dylib                1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-shelx.0.0.0.dylib                                
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-skeleton.0.0.0.dylib                     1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-surface.0.0.0.dylib                              
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-tw.0.0.0.dylib                                   
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-utils.0.0.0.dylib                                
1.0.0 %n (>= 0.4.1-1)
-               %p/lib/libcoot-wrap-guile.0.0.0.dylib                   1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcoot-wrap-python.0.0.0.dylib                  1.0.0 
%n (>= 0.4.1-1)
-               %p/lib/libcootaneer.0.0.0.dylib                                 
1.0.0 %n (>= 0.4.1-1)
+               %p/lib/libccp4mg-surface.0.dylib                        1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libccp4mg-utils.0.dylib                          1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-analysis.0.dylib                         1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-AngleInfo.0.dylib                        1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-atomutils.0.dylib                        1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-cabuild.0.dylib                          1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-compat.0.dylib                           1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-coord-extras.0.dylib             1.0.0 %n (>= 
0.4.1-1)
+               %p/lib/libcoot-coord-utils.0.dylib                      1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-coords.0.dylib                           1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-db-main.0.dylib                          1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-geometry.0.dylib                         1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-high-res.0.dylib                         1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-ideal.0.dylib                            1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-isosurface.0.dylib                       1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-ligand.0.dylib                           1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-map-heavy.0.dylib                        1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-map-utils.0.dylib                        1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-mini-mol.0.dylib                         1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-mmtz-extras.0.dylib                      1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-sequence-view.0.dylib            1.0.0 %n (>= 
0.4.1-1)
+               %p/lib/libcoot-shelx.0.dylib                            1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-skeleton.0.dylib                         1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-surface.0.dylib                          1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-tw.0.dylib                                       
1.0.0 %n (>= 0.4.1-1)
+               %p/lib/libcoot-utils.0.dylib                            1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-wrap-guile.0.dylib                       1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcoot-wrap-python.0.dylib                      1.0.0 
%n (>= 0.4.1-1)
+               %p/lib/libcootaneer.0.dylib                                     
1.0.0 %n (>= 0.4.1-1)
        <<
 << 
 #
@@ -255,6 +266,7 @@
 #
 SplitOff2: <<
 Package: %N-dev
+Depends: %N (= %v-%r)
 BuildDependsOnly: True
 Files: <<   
 lib/*.a


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to