Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14456
Modified Files:
whatcheck.info whatcheck.patch
Log Message:
synced with the ever-changing tarball upstream
Index: whatcheck.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/whatcheck.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- whatcheck.patch 8 Mar 2009 21:10:52 -0000 1.3
+++ whatcheck.patch 31 Oct 2009 23:33:20 -0000 1.4
@@ -1,10 +1,9 @@
-diff -uNr whatcheck/Makefile_whatcheck whatcheck.new/Makefile_whatcheck
---- whatcheck/Makefile_whatcheck 2008-04-07 18:17:15.000000000 -0400
-+++ whatcheck.new/Makefile_whatcheck 2008-04-10 23:16:54.000000000 -0400
+--- whatcheck/Makefile_whatcheck.orig 2009-09-04 04:33:14.000000000 -0400
++++ whatcheck/Makefile_whatcheck 2009-09-06 12:21:12.000000000 -0400
@@ -3,12 +3,12 @@
DEFINES=-DUNIX -DCTEXT -DF2C -DGLX11 -DX11 -DDX4 -DLITE -DWHATCHECK
- OPTFLAGS=-O3
+ OPTFLAGS=-O0
-LIBS= -L/usr/X11R6/lib -lX11 -lm -lcrypt
+LIBS= -L/usr/X11R6/lib -lX11 -lm
ANSICC=cc
@@ -30,8 +29,7 @@
sed -r "s/^[Cc].+//" $< | g77 -xf77-cpp-input -E $(DEFINES) - | sed -r
"s/^#.+//" > $@
%.INC: ../whatif/src/%.INC
-@@ -67,8 +67,8 @@
- obfuscated.f: $(DSTFILES)
+@@ -68,7 +68,7 @@
cat $(DSTFILES) > obfuscated.f
support.o: support.c
@@ -50,9 +48,9 @@
-/home/vriend/whatcheck/qualty/
+...@finkprefix@/share/whatcheck/qualty/
IRIF FFTFFFTFFFFFFFTFFFFF
-diff -uNr whatcheck/scatterdir/support.c whatcheck.new/scatterdir/support.c
---- whatcheck/scatterdir/support.c 2007-07-26 09:13:28.000000000 -0400
-+++ whatcheck.new/scatterdir/support.c 2008-04-10 21:23:52.000000000 -0400
+diff -uNr whatcheck/scatter/support.c whatcheck.new/scatter/support.c
+--- whatcheck/scatter/support.c 2007-07-26 09:13:28.000000000 -0400
++++ whatcheck.new/scatter/support.c 2008-04-10 21:23:52.000000000 -0400
@@ -15,7 +15,8 @@
#endif
#if !defined(ESV)
@@ -63,19 +61,8 @@
#else
#include "/usr/include/unistd.h"
#endif
---- whatcheck.org/support.c 2008-04-11 19:05:12.000000000 -0400
-+++ whatcheck/support.c 2008-04-11 19:05:26.000000000 -0400
-@@ -52,7 +52,7 @@
- #include "/usr/include/unistd.h"
- #else
- #include <unistd.h>
--/* #include <malloc.h> */
-+ #include <sys/malloc.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>
---- whatcheck.org/scatterdir/Makefile 2008-04-11 19:31:50.000000000 -0400
-+++ whatcheck/scatterdir/Makefile 2008-04-11 19:32:32.000000000 -0400
+--- whatcheck.org/scatter/Makefile 2008-04-11 19:31:50.000000000 -0400
++++ whatcheck/scatter/Makefile 2008-04-11 19:32:32.000000000 -0400
@@ -5,8 +5,8 @@
OBJS = data.o general_fit.o figfile.o lines.o\
polyno.o recipes.o scatter.o tools.o support.o
@@ -96,17 +83,6 @@
umask 001
stty intr '^C' > /dev/null
[ -f WHATIF.FIG -a ! $DIR = `pwd` ] && /bin/rm WHATIF.FIG
-diff -uNr whatcheck/coot.F whatcheck.fink/coot.F
---- whatcheck/coot.F 2008-08-07 10:07:48.000000000 -0400
-+++ whatcheck.fink/coot.F 2009-01-01 13:39:40.000000000 -0500
-@@ -387,7 +387,6 @@
- REAL TVAL
- CHARACTER*1 LCHANAM, LALTATM, LINSRTC, MCHANAM, MALTATM, MINSRTC
- CHARACTER*4 CHAR4, CHAR5, LONESA3, T4, LNUMNAM, MONESA3, MNUMNAM
-- CHARACTER*(*) QUAL
-
-
-
diff -uNr whatcheck/supertab.sty whatcheck.fink/supertab.sty
--- whatcheck/supertab.sty 1969-12-31 19:00:00.000000000 -0500
+++ whatcheck.fink/supertab.sty 2009-01-01 13:56:45.000000000 -0500
Index: whatcheck.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/whatcheck.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- whatcheck.info 22 Apr 2009 03:47:06 -0000 1.8
+++ whatcheck.info 31 Oct 2009 23:33:20 -0000 1.9
@@ -1,23 +1,24 @@
Package: whatcheck
-Version: 7.0
+Version: 8.0
Revision: 1001
GCC: 4.0
BuildDepends: fink (>= 0.24.12), gcc44
-Depends: gcc44-shlibs
-Maintainer: Jack Howarth <[email protected]>
+Depends: gcc44-shlibs, xfig
+Maintainer: None <[email protected]>
Source: http://swift.cmbi.ru.nl/gv/whatcheck/whatcheck.tar.bz2
-Source-MD5: cb97ed2f5b3bbededa29c06cac8564d1
+Source-MD5: 66f4398ac459a1742128209c5285de03
Source2: ftp://ftp.cmbi.kun.nl/pub/molbio/software/dsspcmbi.zip
Source2-MD5: 718779c6c5469429994a2ca284777050
SourceDirectory: whatcheck
PatchFile: %n.patch
-PatchFile-MD5: 6bf5a7b4bbd631e9dc980b5acd64a0f4
+PatchFile-MD5: 0de8ef47738446a5a2aa43656a3a4a55
PatchScript: <<
#!/bin/bash -ev
-rm -fr *.o scatter dbdata/fonts/.svn
+rm -fr *.o dbdata/fonts/.svn
sed 's|@FINKPREFIX@|%p|g' <%{PatchFile} | patch -p1
rm -fr dssp
mv ../dssp .
+perl -pi -e 's|-O0|-O3|g' ./Makefile_whatcheck
perl -pi -e 's|-static||g' ./dssp/DsspCompileGCC
perl -pi -e 's|-O|-O3|g' ./dssp/DsspCompileGCC
if [ "%m" == "powerpc" ]; then
@@ -28,11 +29,10 @@
#!/bin/sh -ev
touch *
make -f Makefile_whatcheck
-cd scatterdir
+cd scatter
export FC=gfortran
make clean
make
-cp scatter ../scatter
cd ../dssp
./DsspCompileGCC
mv dsspcmbi DSSP.EXE
@@ -46,8 +46,12 @@
cp -r dbdata %i/share/whatcheck
cp -r nqual %i/share/whatcheck
cp -r qualty %i/share/whatcheck
+mkdir -p %i/share/whatcheck/scatter
+cp scatter/scatter %i/share/whatcheck/scatter
+cp scatter/SCATTER.fig %i/share/whatcheck/scatter
+cp scatter/scatter.html %i/share/whatcheck/scatter
+ln -s %p/bin/fig2dev %i/share/whatcheck/scatter/fig2dev
cp dssp/DSSP.EXE %i/share/whatcheck/dssp
-cp scatter %i/share/whatcheck
cp supertab.sty %i/share/whatcheck
cp whatcheck %i/share/whatcheck
cp DO_WHATCHECK.COM %i/share/whatcheck
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) 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 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
