Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8379

Modified Files:
        coot.info 
Added Files:
        coot.patch 
Log Message:
newer revis and cleaned up packaging a bit

--- NEW FILE: coot.patch ---
diff -ruN coot-0.6-pre-1.orig/README coot-0.6-pre-1/README
--- coot-0.6-pre-1.orig/README  2009-07-08 10:54:25.000000000 -0700
+++ coot-0.6-pre-1/README       2009-10-02 18:33:11.000000000 -0700
@@ -226,7 +226,7 @@
 
 Here is how I configure using MacOS 10.2 (Darwin/fink):
 
-./configure --prefix=$HOME/crystal --with-mmdb-prefix=$HOME/crystal 
--with-clipper-prefix=$HOME/crystal --with-glut-prefix=/sw 
--with-gl-prefix=/usr/X11R6 --with-guile
+./configure --prefix=$HOME/crystal --with-mmdb-prefix=$HOME/crystal 
--with-clipper-prefix=$HOME/crystal --with-glut-pref...@prefix@ 
--with-gl-prefix=/usr/X11R6 --with-guile
 
 Redhat 7.2
  ./configure --prefix=$HOME/coot 
@@ -270,8 +270,8 @@
 directory in my path.  To be explicit:
 
 $ mkdir ~/build/bin
-$ ln -s /sw/bin/guile-1.6 ~/build/bin/guile
-$ ln -s /sw/bin/guile-1.6-config ~/build/bin/guile-config
+$ ln -s @PREFIX@/bin/guile-1.6 ~/build/bin/guile
+$ ln -s @PREFIX@/bin/guile-1.6-config ~/build/bin/guile-config
 
 
 If you want to be able to refine and regularize (and I suggest that
@@ -281,7 +281,7 @@
 Also, it's a good idea to have gtk-canvas (installed in
 $HOME/coot/Darwin) too.  Here's how I configure gtk-canvas:
 
-$ ./configure --prefix=$HOME/coot/Darwin --with-imlib-prefix=/sw
+$ ./configure --prefix=$HOME/coot/Darwin --with-imlib-pref...@prefix@
 
 To compile, you will need to remove line 15 (the malloc line) from
 gtk-canvas/gtk-canvas-load.c
diff -ruN coot-0.6-pre-1.orig/autogen.sh coot-0.6-pre-1/autogen.sh
--- coot-0.6-pre-1.orig/autogen.sh      2009-07-04 05:59:17.000000000 -0700
+++ coot-0.6-pre-1/autogen.sh   2009-10-02 18:33:11.000000000 -0700
@@ -5,8 +5,8 @@
 hostname=`hostname`
 
 if test $sys = Darwin ; then 
-   echo aclocal -I macros -I /sw/share/aclocal
-   aclocal -I macros -I /sw/share/aclocal
+   echo aclocal -I macros -I @PREFIX@/share/aclocal
+   aclocal -I macros -I @PREFIX@/share/aclocal
 else
    # because on bubbles we have automake 1.9.6, we need 1.9.6 on kalypso, but 
system
    # is 1.9.5, so I build my own. But that needs m4 files in /usr/share/aclocal
diff -ruN coot-0.6-pre-1.orig/ccp4mg-utils/Makefile.am 
coot-0.6-pre-1/ccp4mg-utils/Makefile.am
--- coot-0.6-pre-1.orig/ccp4mg-utils/Makefile.am        2009-07-04 
05:59:10.000000000 -0700
+++ coot-0.6-pre-1/ccp4mg-utils/Makefile.am     2009-10-02 18:33:11.000000000 
-0700
@@ -28,7 +28,7 @@
        $(MMDB_CXXFLAGS)
 
 # for ppmutil.cc compilation
-# CXXFLAGS = -DUSE_LIBPNG -I/sw/include
+# CXXFLAGS = -DUSE_LIBPNG -...@prefix@/include
 
 libccp4mg_utils_la_SOURCES = geomutil.cc mgtree.cc cartesian.cc \
        matrix.cc quat.cc ppmutil.cc
diff -ruN coot-0.6-pre-1.orig/ccp4mg-utils/Makefile.in 
coot-0.6-pre-1/ccp4mg-utils/Makefile.in
--- coot-0.6-pre-1.orig/ccp4mg-utils/Makefile.in        2009-10-01 
23:32:15.000000000 -0700
+++ coot-0.6-pre-1/ccp4mg-utils/Makefile.in     2009-10-02 18:33:11.000000000 
-0700
@@ -271,7 +271,7 @@
 
 
 # for ppmutil.cc compilation
-# CXXFLAGS = -DUSE_LIBPNG -I/sw/include
+# CXXFLAGS = -DUSE_LIBPNG -...@prefix@/include
 libccp4mg_utils_la_SOURCES = geomutil.cc mgtree.cc cartesian.cc \
        matrix.cc quat.cc ppmutil.cc
 
diff -ruN coot-0.6-pre-1.orig/configure coot-0.6-pre-1/configure
--- coot-0.6-pre-1.orig/configure       2009-10-01 23:32:22.000000000 -0700
+++ coot-0.6-pre-1/configure    2009-10-02 18:34:04.000000000 -0700
@@ -23343,14 +23343,14 @@
  # added lz, we should have proper autoconf check for this.
  #
  CLIPPER_LDOPTS="-L$clipper_prefix/lib -lclipper-mtz -lclipper-cif 
-lclipper-phs -lclipper-contrib -lclipper-mmdb -lclipper-mmdbold -lclipper-core 
-lmccp4 $MMDB_LIBS -lrfftw -lfftw -lz -lm"
- CLIPPER_LDOPTS="-L$clipper_prefix/lib -lclipper-ccp4 -lclipper-cif 
-lclipper-phs -lclipper-contrib -lclipper-minimol -lclipper-cns -lclipper-mmdb 
-lclipper-core -lccp4c $MMDB_LIBS -lrfftw -lfftw -lz -lm"
+ CLIPPER_LDOPTS="-L$clipper_prefix/lib -lclipper-ccp4 -lclipper-cif 
-lclipper-phs -lclipper-contrib -lclipper-minimol -lclipper-cns -lclipper-mmdb 
-lclipper-core -lgpp4 $MMDB_LIBS -lrfftw -lfftw -lz -lm"
 # -L$clipper_prefix/boost/lib -lclipper-cctbx -L$clipper_prefix/cctbx/lib 
-lsgtbx -luctbx
 else
  # the compiler looks in the "standard" places for clipper.  In real life,
  # it would be quite unlikely that clipper would be installed in /usr/include,
  # /usr/lib etc. so this code will not usually find the right dependencies.
  CLIPPER_CXXFLAGS=""
- CLIPPER_LDOPTS="-lclipper-ccp4 -lclipper-cif -lclipper-phs -lclipper-contrib 
-lclipper-mmdb -lclipper-minimol -lclipper-cns -lclipper-core -lccp4c 
$MMDB_LIBS -lrfftw -lfftw -lz -lm"
+ CLIPPER_LDOPTS="-lclipper-ccp4 -lclipper-cif -lclipper-phs -lclipper-contrib 
-lclipper-mmdb -lclipper-minimol -lclipper-cns -lclipper-core -lgpp4 $MMDB_LIBS 
-lrfftw -lfftw -lz -lm"
 fi
 
 # BL: workaround needed for new MinGW
@@ -23650,7 +23650,7 @@
 if test -z "$ac_cv_path_GUILE" ; then
    have_goosh=not_installed
 else
-   guile -c '(use-modules (goosh))'
+   guile -c '(use-modules (goosh goosh))'
    if test "$?" = 0  ; then
       have_goosh=yes
    else
diff -ruN coot-0.6-pre-1.orig/scheme/coot-utils.scm 
coot-0.6-pre-1/scheme/coot-utils.scm
--- coot-0.6-pre-1.orig/scheme/coot-utils.scm   2009-09-28 09:32:04.000000000 
-0700
+++ coot-0.6-pre-1/scheme/coot-utils.scm        2009-10-02 18:33:13.000000000 
-0700
@@ -23,7 +23,7 @@
             (ice-9 format)
             (ice-9 rdelim))
 ;; (use-modules (goosh goosh))
-(use-modules (goosh)) 
+(use-modules (goosh goosh)) 
 
 ;; 3D annotations - a bit of a hack currently
 (define *annotations* '())
diff -ruN coot-0.6-pre-1.orig/scheme/group-settings.scm 
coot-0.6-pre-1/scheme/group-settings.scm
--- coot-0.6-pre-1.orig/scheme/group-settings.scm       2009-07-04 
05:57:36.000000000 -0700
+++ coot-0.6-pre-1/scheme/group-settings.scm    2009-10-02 18:33:47.000000000 
-0700
@@ -49,3 +49,4 @@
         #f)))
 
 
+(set-display-lists-for-maps 0)
diff -ruN coot-0.6-pre-1.orig/scheme/povray.scm coot-0.6-pre-1/scheme/povray.scm
--- coot-0.6-pre-1.orig/scheme/povray.scm       2009-07-04 05:57:34.000000000 
-0700
+++ coot-0.6-pre-1/scheme/povray.scm    2009-10-02 18:33:13.000000000 -0700
@@ -14,7 +14,7 @@
   (lambda ()
     
     ; this is directory that contains colors.inc
-    (list (string-append "+L/sw/share/povray-" povray-version "/include")
+    (list (string-append "+...@prefix@/share/povray-" povray-version 
"/include")
          "+FN16")))
 
 ;; Run provray using current displayed image and write .pov file to
diff -ruN coot-0.6-pre-1.orig/scheme/raster3d.scm 
coot-0.6-pre-1/scheme/raster3d.scm
--- coot-0.6-pre-1.orig/scheme/raster3d.scm     2009-07-04 05:57:34.000000000 
-0700
+++ coot-0.6-pre-1/scheme/raster3d.scm  2009-10-02 18:33:35.000000000 -0700
@@ -1,7 +1,7 @@
 
 (define coot-r3d-file-name "coot.r3d")
 (define coot-png-file-name "coot.png")
-(define coot-png-display-program "display")
+(define coot-png-display-program "open")
 
 ;; run raster3d
 (define render-image
diff -ruN coot-0.6-pre-1.orig/tw/Makefile.am coot-0.6-pre-1/tw/Makefile.am
--- coot-0.6-pre-1.orig/tw/Makefile.am  2009-07-04 05:58:51.000000000 -0700
+++ coot-0.6-pre-1/tw/Makefile.am       2009-10-02 18:33:13.000000000 -0700
@@ -19,8 +19,8 @@
 # 02110-1301, USA
 
 # Do it properly with configure (not like this)
-# OGG_VORBIS_CFLAGS=-I/sw/include/vorbis -I/usr/include/vorbis
-# AO_CFLAGS=-I/sw/include -I/usr/include
+# ogg_vorbis_cflags...@prefix@/include/vorbis -I/usr/include/vorbis
+# ao_cflags...@prefix@/include -I/usr/include
 
 AM_CXXFLAGS = \
        -DPKGDATADIR='"$(pkgdatadir)"'
@@ -49,5 +49,5 @@
        @GTK_LIBS@
 
 
-# cootsound_LDADD = -L/sw/lib -lvorbisfile -logg -lao
+# cootsound_LDADD = -...@prefix@/lib -lvorbisfile -logg -lao
 
diff -ruN coot-0.6-pre-1.orig/tw/Makefile.in coot-0.6-pre-1/tw/Makefile.in
--- coot-0.6-pre-1.orig/tw/Makefile.in  2009-10-01 23:32:22.000000000 -0700
+++ coot-0.6-pre-1/tw/Makefile.in       2009-10-02 18:33:13.000000000 -0700
@@ -35,8 +35,8 @@
 # 02110-1301, USA
 
 # Do it properly with configure (not like this)
-# OGG_VORBIS_CFLAGS=-I/sw/include/vorbis -I/usr/include/vorbis
-# AO_CFLAGS=-I/sw/include -I/usr/include
+# ogg_vorbis_cflags...@prefix@/include/vorbis -I/usr/include/vorbis
+# ao_cflags...@prefix@/include -I/usr/include
 
 
 
@@ -596,7 +596,7 @@
        uninstall-info-am uninstall-libLTLIBRARIES
 
 
-# cootsound_LDADD = -L/sw/lib -lvorbisfile -logg -lao
+# cootsound_LDADD = -...@prefix@/lib -lvorbisfile -logg -lao
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- coot.info   27 Sep 2009 21:03:15 -0000      1.135
+++ coot.info   3 Oct 2009 02:10:10 -0000       1.136
@@ -1,10 +1,10 @@
 Package: coot
-Version: 0.6-pre-1-revision-2347
+Version: 0.6-pre-1-revision-2396
 Revision: 1
 SourceDirectory: %n-0.6-pre-1
 GCC: 4.0 
 Source: http://www.biop.ox.ac.uk/%n/software/source/pre-releases/%n-%v.tar.gz
-Source-MD5: d968229edabb55d65b40b4f475551422
+Source-MD5: dee0e63939872061b5a0d6c1a3293923
 Source2: http://www.ysbl.york.ac.uk/refmac/data/refmac_dictionary.tar.gz
 Source2-MD5: d6eab829728608d0b8eade38debcedd3
 Source3: 
http://www.ysbl.york.ac.uk/~emsley/software/extras/reference-structures.tar.gz
@@ -127,22 +127,9 @@
 BuildDependsOnly: false
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
-#
-PatchScript:  <<
-#!/bin/zsh -exf
-perl -pi.bak -e 's|use-modules \(goosh\)|use-modules \(goosh goosh\)|g' 
scheme/coot-utils.scm
-# 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
-# Hopefully temporary hacks to configure
-perl -pi -e 's|have_goosh=no|have_goosh=yes|g' configure
-perl -pi -e "s|guile-config|guile-1.8-config|g" configure
-perl -pi -e 's|\(goosh\)|\(goosh goosh\)|g' configure
-perl -pi -e 's|lccp4c|lgpp4|g' configure
-<<
+PatchFile: %n.patch
+PatchFile-MD5: f3fa6d8d568edeafa32a6118ef192884
+PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
 ###############################################################################
 ConfigureParams: <<  
 --with-gpp4=%p --with-mmdb=%p --with-ssmlib-prefix=%p --with-clipper-prefix=%p 
 \
@@ -180,17 +167,7 @@
     mv libtool.fixed libtool
 fi
 #
-
-
-#remake the  src/coot_wrap_python.cc and src/coot_wrap_guile.cc files
-   /bin/zsh -c  '/bin/rm -f **/coot_wrap_**.cc'
-   cd src
-   touch c-interface-database.hh
-   make coot_wrap_guile.cc
-   make coot_wrap_python.cc
-   cp coot_wrap_guile_pre.cc coot_wrap_guile.cc
-   cd ..
-   make
+  make
 <<
 ###############################################################################
 InstallScript: <<


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to