Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19156
Modified Files:
cwp-su.info cwp-su.patch
Log Message:
upgraded to seismic unix 38
Hopefully also fixed X11 linking issues that have been reported that
needed -lICE. Was not able to see this problem, but the fix does not
break anything either.
Index: cwp-su.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/cwp-su.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cwp-su.info 15 Nov 2004 13:35:17 -0000 1.5
+++ cwp-su.info 19 Mar 2005 19:20:19 -0000 1.6
@@ -1,20 +1,18 @@
Package: cwp-su
-Version: 37
-Revision: 6
-Source: http://www.cwp.mines.edu/cwpcodes/cwp.su.all.%v.tar.gz
-Source-MD5: 34cce3a11ed9a92702cf1b6fbc030ab3
+Version: 38
+Revision: 1
+Source: http://www.cwp.mines.edu/cwpcodes/cwp_su_all_%v.tgz
+Source-MD5: 6e880416c84047ee94b9f2175b46685d
SourceDirectory: src
BuildDepends: lesstif, g77
Depends: lesstif-shlibs
PatchScript: sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | patch -p1
CompileScript: <<
make install CWPROOT=%b/..
- # Does not work do to hfs case insensitivity
- #make xtinstall CWPROOT=%b/..
- (cd Xtcwp && make CWPROOT=%b/..)
- (cd xplot && make CWPROOT=%b/..)
- # FIX: get this to work... needs glut
- #(cd xtri && make install CWPROOT=%b/..)
+ # This command has been changed in the makefile via patch
+ # Otherwise the rule is ignored because a directory Xtcwp exists, which
kill xtinstall
+ make xtinstall CWPROOT=%b/..
+
make finstall CWPROOT=%b/..
# Need to patch for GLUT/glut.h and clash with par.o _err
@@ -22,8 +20,7 @@
make xminstall CWPROOT=%b/..
make sfremake CWPROOT=%b/..
- # Not needed! Only makes a lib*.a file which can't be used if it is at the
end
- #make utils CWPROOT=%b/..
+ make utils CWPROOT=%b/..
<<
InstallScript: <<
mkdir -p %i/lib/%n
@@ -35,9 +32,14 @@
# so delete the symbolic links
rm %i/bin/pscontour
rm %i/bin/psimage
+ # replace is in mysql
rm %i/bin/replace
rm %i/bin/Grep
+ # Programs that clash with gmt
+ (cd %i/bin && ln -s ../lib/%n/bin/psimage _psimage)
+ (cd %i/bin && ln -s ../lib/%n/bin/pscontour _pscontour)
+
mkdir -p %i/share/doc/%n
cp -rp doc/* %i/share/doc/%n/
Index: cwp-su.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/cwp-su.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cwp-su.patch 16 Aug 2004 09:36:50 -0000 1.1
+++ cwp-su.patch 19 Mar 2005 19:20:19 -0000 1.2
@@ -1,7 +1,45 @@
-diff -u -r su-37-orig/src/Makefile.config su-37/src/Makefile.config
---- src.orig/Makefile.config Mon Dec 22 09:26:27 2003
-+++ src/Makefile.config Sun Jun 6 08:40:48 2004
-@@ -228,14 +228,14 @@
+diff -u -r src.orig/Makefile src/Makefile
+--- src.orig/Makefile 2004-12-24 07:59:14.000000000 -0800
++++ src/Makefile 2005-03-19 09:26:22.000000000 -0800
+@@ -57,8 +57,8 @@
+
+ install: checkroot LICENSE_38_ACCEPTED MAILHOME_38 makedirs cwpstuff plot
sustuff tristuff tetrastuff compstuff reflstuff
+
+-xtinstall: xtcwp
+-xminstall: xmcwp
++xtinstall: xtcwp_progs
++xminstall: xmcwp_prog
+ mglinstall: mglstuff
+
+ # automatic mail message (ask once)
+@@ -91,12 +91,12 @@
+ sustuff :
+ cd ./su ; $(MAKE)
+
+-xtcwp :
++xtcwp_progs :
+ cd ./Xtcwp; $(MAKE)
+ cd ./xplot; $(MAKE)
+ cd ./xtri; $(MAKE)
+
+-xmcwp :
++xmcwp_prog :
+ cd ./Xmcwp; $(MAKE)
+
+ complex :
+diff -u -r src.orig/Makefile.config src/Makefile.config
+--- src.orig/Makefile.config 2005-01-11 10:09:59.000000000 -0800
++++ src/Makefile.config 2005-03-19 09:29:10.000000000 -0800
+@@ -152,7 +152,7 @@
+ #OPTC = -O -s
+ #
+ # Default-- this works on many systems
+-OPTC = -O
++#OPTC = -O
+
+ # O3 optimization full ansi (Linux)
+ OPTC = -O3 -Wall -ansi -pedantic -D_POSIX_SOURCE
+@@ -239,14 +239,14 @@
# Rules for standard `make' installs
# leave the next line uncommented if you are using the standard Unix "make"
# command. Make sure the gnumake.rules line is commented out in this case.
@@ -18,26 +56,25 @@
########################################################################
-@@ -268,6 +268,9 @@
+@@ -277,7 +277,7 @@
+ #LD_LIBRARY_PATH += $(CWPROOT)/lib:/usr/local/lesstif/lib
+
# under SUN OS and RedHat Linux uncomment the next line
- #LD_LIBRARY_PATH += $(CWPROOT)/lib:/usr/X11R6/LessTif/lib
+-LD_LIBRARY_PATH += $(CWPROOT)/lib:/usr/X11R6/LessTif/lib
++DYLD_LIBRARY_PATH += $(CWPROOT)/lib:@FINKPREFIX@/lib:/usr/X11/lib
-+# Mac OSX 10.x with http://fink.sf.net
-+LD_LIBRARY_PATH += $(CWPROOT)/lib:@FINKPREFIX@/lib:/usr/X11/lib
-+
#############################################################################
# the archiver
- AR = ar
-@@ -322,7 +325,7 @@
- #CPP = /opt/ctl/bin/cpp
-
- # use this on Mac OS X and Free BSD
--#CPP = /usr/bin/cpp
+@@ -315,7 +315,7 @@
+ # Default C preprocessor (cpp) definition
+ # this is the one you will use on most systems
+ # AIX, IRIX if using the native cc compiler, Linux
+-CPP = /lib/cpp
+CPP = /usr/bin/cpp
- ######################################################################
- ######################################################################
-@@ -383,10 +386,10 @@
+
+ # under Solaris, IRIX, AIX, and possibly other with gcc compiler, use:
+@@ -394,10 +394,10 @@
####
# Generic (RS6000, SGI)
# X11 include path
@@ -50,16 +87,7 @@
####
####
-@@ -401,7 +404,7 @@
- ####
-
- ####
--## The following paths would be used under Linux
-+## The following paths would be used under Linux, Mac OSX,
- ## and possibly under SCO Unix installs
- # X11 include path
- IX11 = /usr/X11R6/include
-@@ -426,39 +429,39 @@
+@@ -437,39 +437,39 @@
# if you have these include files and libraries.
#
# include path
@@ -92,26 +120,51 @@
#### Open GL/Mesa include and library paths (generic example)
# Open GL/Mesa include path
-IGL = /usr/local/include
-+IGL = /usr/X11/include
++IGL = /usr/X11R6/include
# Open GL/Mesa library path
-LGL = /usr/local/lib
-+LGL = /usr/X11/lib
++LGL = /usr/X11R6/lib
## GLUT include and library paths
# include path
-IGLUT = /usr/local/include
-+#IGLUT = /usr/local/include
++IGLUT = @FINKPREFIX@/include
# library path
-LGLUT = /usr/local/lib
-+#LGLUT = /usr/local/lib
++LGLUT = @FINKPREFIX@/lib
#### examples for SGI with glut installed in /usr/local/glut-3.3
## GLUT include and library paths
+@@ -489,10 +489,10 @@
+
+ #### Red Hat 7.2 Linux example
+ ## GLUT include and library paths
+-IGLUT = /usr/include
++#IGLUT = /usr/include
+
+ # Open GL/Mesa library path
+-LGLUT = /usr/lib
++#LGLUT = /usr/lib
+ ###
+
+ ################################################################
+diff -u -r src.orig/Xtcwp/main/Makefile src/Xtcwp/main/Makefile
+--- src.orig/Xtcwp/main/Makefile 2003-04-01 13:06:11.000000000 -0800
++++ src/Xtcwp/main/Makefile 2005-03-19 09:35:16.000000000 -0800
+@@ -6,7 +6,7 @@
+ D = $L/libXtcwp.a $L/libpar.a $L/libcwp.a
+
+ # use the first LDFLAGS if on a non-motif system
+-LDFLAGS= $(PRELFLAGS) -L$L $(XLFLAGSADD) -lXtcwp -lpar -lcwp -L$(LX11) -lXt
-lX11 -lm $(POSTLFLAGS)
++LDFLAGS= $(PRELFLAGS) -L$L $(XLFLAGSADD) -lXtcwp -lpar -lcwp -L$(LX11) -lSM
-lICE -lXt -lX11 $(POSTLFLAGS)
+ #LDFLAGS= $(PRELFLAGS) -L$L -lXtcwp $(XLFLAGSADD) -lpar -lcwp -L$(LX11) -lXm
-lXt -lX11 -lXaw -lm $(POSTLFLAGS)
+
+ PROGS = $B/xgraph \
diff -u -r src.orig/chkroot.sh src/chkroot.sh
---- src.orig/chkroot.sh Mon Dec 10 09:12:45 2001
-+++ src/chkroot.sh Sun Jun 6 08:46:59 2004
+--- src.orig/chkroot.sh 2001-12-10 09:12:45.000000000 -0800
++++ src/chkroot.sh 2005-03-19 09:00:25.000000000 -0800
@@ -15,14 +15,14 @@
fi
@@ -138,13 +191,12 @@
+# esac
exit 0
diff -u -r src.orig/par/lib/filestat.c src/par/lib/filestat.c
---- src.orig/par/lib/filestat.c Fri Dec 19 15:15:18 2003
-+++ src/par/lib/filestat.c Sun Jun 6 08:50:17 2004
-@@ -76,7 +76,10 @@
+--- src.orig/par/lib/filestat.c 2005-01-11 09:46:05.000000000 -0800
++++ src/par/lib/filestat.c 2005-03-19 09:03:44.000000000 -0800
+@@ -76,7 +76,9 @@
#define __USE_BSD 1
#endif
-+/* For Mac OSX/Darwin turn off posix source for a moment */
+#undef _POSIX_SOURCE
#include <sys/stat.h>
+#define _POSIX_SOURCE
@@ -152,8 +204,8 @@
diff -u -r src.orig/su/graphics/psplot/supscontour.c
src/su/graphics/psplot/supscontour.c
---- src.orig/su/graphics/psplot/supscontour.c Fri Dec 19 15:15:34 2003
-+++ src/su/graphics/psplot/supscontour.c Wed Jun 23 21:23:51 2004
+--- src.orig/su/graphics/psplot/supscontour.c 2005-01-11 09:46:19.000000000
-0800
++++ src/su/graphics/psplot/supscontour.c 2005-03-19 10:38:03.000000000
-0800
@@ -284,13 +284,13 @@
rewind(x2fp);
fread(x2string,sizeof(char),x2len,x2fp);
@@ -171,8 +223,8 @@
}
diff -u -r src.orig/su/graphics/psplot/supsimage.c
src/su/graphics/psplot/supsimage.c
---- src.orig/su/graphics/psplot/supsimage.c Fri Dec 19 15:15:34 2003
-+++ src/su/graphics/psplot/supsimage.c Wed Jun 23 21:34:08 2004
+--- src.orig/su/graphics/psplot/supsimage.c 2005-01-11 09:46:19.000000000
-0800
++++ src/su/graphics/psplot/supsimage.c 2005-03-19 10:35:21.000000000 -0800
@@ -216,7 +216,7 @@
/* Set up psimage command line */
@@ -182,21 +234,9 @@
nt, ntr, d1, d2, f1, f2);
for (--argc, ++argv; argc; --argc, ++argv) {
-Only in src/su/graphics/xplot: INSTALL
-Only in src/su/include: INSTALL
-diff -u -r src.orig/su/include/hdr.h src/su/include/hdr.h
---- src.orig/su/include/hdr.h Fri Dec 19 15:15:35 2003
-+++ src/su/include/hdr.h Sun Jun 6 08:51:23 2004
-@@ -1,6 +1,3 @@
--/* Copyright (c) Colorado School of Mines, 2003.*/
--/* All rights reserved. */
--
- /*
- * hdr.h - include file for segy offset array
- * THIS HEADER FILE IS GENERATED AUTOMATICALLY -
diff -u -r src.orig/xplot/main/xcontour.c src/xplot/main/xcontour.c
---- src.orig/xplot/main/xcontour.c Fri Dec 19 15:15:43 2003
-+++ src/xplot/main/xcontour.c Wed Jun 23 21:27:17 2004
+--- src.orig/xplot/main/xcontour.c 2005-01-11 09:46:27.000000000 -0800
++++ src/xplot/main/xcontour.c 2005-03-19 10:37:06.000000000 -0800
@@ -581,7 +581,7 @@
int nbpi;
@@ -207,12 +247,12 @@
strcat(cmdline," ");
strcat(cmdline,argv[iargc]);
diff -u -r src.orig/xplot/main/ximage.c src/xplot/main/ximage.c
---- src.orig/xplot/main/ximage.c Fri Dec 19 15:15:43 2003
-+++ src/xplot/main/ximage.c Wed Jun 23 21:37:05 2004
-@@ -595,7 +595,7 @@
- int iargc;
+--- src.orig/xplot/main/ximage.c 2005-01-11 09:46:27.000000000 -0800
++++ src/xplot/main/ximage.c 2005-03-19 10:36:04.000000000 -0800
+@@ -976,7 +976,7 @@
+ FILE *plotfp; /*fp for plot data*/
- efseeko(infp,(off_t)0,SEEK_SET);
+ cmdline = (char *) emalloc(BUFSIZ);
- strcpy(cmdline,"psimage");
+ strcpy(cmdline,"_psimage");
for(iargc = 1; iargc < argc; iargc++) {
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
