Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4852
Modified Files:
grads.info grads.patch
Log Message:
overhaul deps, clean up some compiler warnings (many printf size mismatches
still remain!)
Index: grads.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/grads.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- grads.patch 1 Jul 2010 01:37:10 -0000 1.1
+++ grads.patch 16 Nov 2010 04:21:45 -0000 1.2
@@ -1,5 +1,6 @@
---- grads-1.9/configure.orig Sat Feb 21 19:47:24 2004
-+++ grads-1.9/configure Sun Feb 22 06:47:19 2004
+diff -Nurd -x'*~' grads-1.9b3.orig/configure grads-1.9b3/configure
+--- grads-1.9b3.orig/configure 2004-03-12 11:24:26.000000000 -0500
++++ grads-1.9b3/configure 2010-11-15 23:03:10.000000000 -0500
@@ -2639,6 +2639,7 @@
echo "${ECHO_T}${SUPPLIBS}" >&6
# This is the "official" variable name for use by other macros
@@ -46,7 +47,7 @@
+ for ga_lib_name in mfhdf df jpeg udunits ; do
hdf_libs="$hdf_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
done
-+ hdf_libs="$hdf_libs ${ga_lib_prefix}netcdf.a -lz"
++ hdf_libs="$hdf_libs ${ga_lib_prefix}netcdf -lz"
extra_bins="$extra_bins gradshdf"
echo "+ gradshdf (HDF-SDS/netCDF) build enabled"
@@ -777,10 +778,24 @@
gadods_def="-DUSEGADODS=0"
echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface
only"
fi
---- grads-1.9/src/Makefile.in.orig Sun Feb 22 06:26:58 2004
-+++ grads-1.9/src/Makefile.in Sun Feb 22 06:27:20 2004
-@@ -132,7 +132,7 @@
- -lX11 $(wi_libadd) $(xlibemu_libs) $(host_ldadd)
+diff -Nurd -x'*~' grads-1.9b3.orig/src/Makefile.in grads-1.9b3/src/Makefile.in
+--- grads-1.9b3.orig/src/Makefile.in 2003-10-30 11:30:46.000000000 -0500
++++ grads-1.9b3/src/Makefile.in 2010-11-15 23:17:35.000000000 -0500
+@@ -94,7 +94,7 @@
+ extra_utils = @extra_utils@
+ gadods_def = @gadods_def@
+ gui_libs = @gui_libs@
+-hdf_libs = @hdf_libs@
++hdf_libs = @hdf_libs@ -lsz
+ host_ldadd = @host_ldadd@
+ install_sh = @install_sh@
+ nc_libs = @nc_libs@
+@@ -129,10 +129,10 @@
+ # Settings used for all GrADS binaries
+ common_ldadd = $(LDADD) $(X_LIBS) $(printim_libs) \
+ $(gui_libs) $(wi_libs) $(readline_libs) \
+- -lX11 $(wi_libadd) $(xlibemu_libs) $(host_ldadd)
++ -L/usr/X11R6/lib -lX11 $(wi_libadd) $(xlibemu_libs)
$(host_ldadd)
# Hack for DODS 3.2 on Mac OS X
-...@dods_darwin_true@dods_darwin_libs = $(supp_lib_dir)/inst.o
@@ -788,6 +803,15 @@
######################################################################
#
+@@ -389,7 +389,7 @@
+
+ EXTRA_gxtran_SOURCES = pcx11e.c
+ gxtran_LDADD = gxmeta.sa.o $(LDADD) $(X_LIBS) $(printim_libs) \
+- -lX11 $(xlibemu_libs)
++ -L/usr/X11R6/lib -lX11 $(xlibemu_libs)
+
+
+ ##############################################################
@@ -463,7 +463,7 @@
@DODS_DARWIN_TRUE@@usedods_t...@gradsdods_dependencies = gaddes-dods.o \
@DODS_DARWIN_TRUE@@USEDODS_TRUE@ gacfg-dods.o gaio-dods.o \
@@ -797,8 +821,20 @@
@DODS_DARWIN_TRUE@@usedods_fa...@gradsdods_dependencies =
gradsdods_LDFLAGS =
@usehdf_t...@am_gradshdf_objects = grads.$(OBJEXT) gxsubs.$(OBJEXT) \
---- grads-1.9/src/gx.h.orig Sun Feb 22 16:53:04 2004
-+++ grads-1.9/src/gx.h Sun Feb 22 16:53:30 2004
+diff -Nurd -x'*~' grads-1.9b3.orig/src/bufrscan.c grads-1.9b3/src/bufrscan.c
+--- grads-1.9b3.orig/src/bufrscan.c 2003-10-30 11:30:46.000000000 -0500
++++ grads-1.9b3/src/bufrscan.c 2010-11-15 23:19:29.000000000 -0500
+@@ -4,6 +4,7 @@
+
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdio.h>
+ #include "gabufr.h"
+
+ enum bufrscan_modes {
+diff -Nurd -x'*~' grads-1.9b3.orig/src/gx.h grads-1.9b3/src/gx.h
+--- grads-1.9b3.orig/src/gx.h 2003-11-13 15:45:10.000000000 -0500
++++ grads-1.9b3/src/gx.h 2010-11-15 22:47:49.000000000 -0500
@@ -45,7 +45,7 @@
/* Default directory containing the stroke and map data sets.
User can override this default via setenv GADDIR */
@@ -808,3 +844,29 @@
/* Option flag. If 0, map data set is only read once into a
dynamically allocated memory area. The memory is held onto
+diff -Nurd -x'*~' grads-1.9b3.orig/src/gxdxwd.c grads-1.9b3/src/gxdxwd.c
+--- grads-1.9b3.orig/src/gxdxwd.c 2002-10-28 14:08:33.000000000 -0500
++++ grads-1.9b3/src/gxdxwd.c 2010-11-15 22:53:03.000000000 -0500
+@@ -22,7 +22,6 @@
+ * writting.
+ */
+
+-char *calloc();
+
+ #include "X11/XWDFile.h"
+
+diff -Nurd -x'*~' grads-1.9b3.orig/src/gxhpng.c grads-1.9b3/src/gxhpng.c
+--- grads-1.9b3.orig/src/gxhpng.c 2004-03-12 11:14:04.000000000 -0500
++++ grads-1.9b3/src/gxhpng.c 2010-11-15 23:00:27.000000000 -0500
+@@ -377,7 +377,10 @@
+ return (retcod);
+ }
+
+-int gdCompareInt(const void *a, const void *b);
++int gdCompareInt(const void *a, const void *b)
++{
++return (*(const int *)a) - (*(const int *)b);
++}
+
+ /* Version of gdImageFilledPolygon to invoke my local
+ version of gdImageLne. Nothing else changed... B.Doty 5/31/01 */
Index: grads.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/grads.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- grads.info 1 Jul 2010 01:37:10 -0000 1.1
+++ grads.info 16 Nov 2010 04:21:45 -0000 1.2
@@ -1,33 +1,40 @@
Package: grads
Version: 1.9
-Revision: 1005
-GCC: 4.0
+Revision: 1006
Source: ftp://grads.iges.org/grads/%v/%n-%vb3-src.tar.gz
Source-MD5: e09427e20cddecd3e57ee9540856ced8
BuildDepends: <<
+ dpkg-base-files,
fink (>= 0.24.12-1),
- gd2,
+ gd2,
+ libjpeg8,
+ libpng14,
netcdf (>= 3.6.0-1002),
- openssl097-dev,
readline5,
- udunits-dev,
+ szip,
+ udunits-dev (>= 1.12.11-1),
x11-dev
<<
Depends: <<
dods (>= 3.4.5-1005),
gd2-shlibs,
hdf (>= 4.2r0-3),
+ libjpeg8-shlibs,
+ libpng14-shlibs,
netcdf-shlibs (>= 3.6.0-1002),
- openssl097-shlibs,
readline5-shlibs,
+ szip-shlibs,
udunits,
x11
<<
PatchFile: %n.patch
-PatchFile-MD5: 8e3a3b1a8bca2203cf1bbe6f79ce351d
-PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+PatchFile-MD5: 119c361d118587c105ec768c396739e7
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+ perl -pi -e 's/(#include <stdio.h>)/\1\n#include <stdlib.h>\n#include
<string.h>/' src/*.[ch]
+<<
SourceDirectory: %n-%vb3
-ConfigureParams: --with-hdf --with-dods --with-lats --with-nc --with-readline
--with-printim --without-gui
+ConfigureParams: --with-hdf --with-dods --with-lats --with-nc --with-readline
--with-printim --without-gui --enable-dyn-supplibs
CompileScript: <<
#!/bin/sh -ev
export DODSDIR=%p/lib/dods
@@ -44,13 +51,23 @@
DescDetail: <<
Interactive desktop tool that is used for easy access, manipulation,
and visualization of earth science data.
+
+ Includes OPeNDAP/DODS, hdf-sds and netcdf support.
+ No GUI.
<<
DescPort: <<
Massively patched configure.
- Includes OPeNDAP/DODS, hdf-sds and netcdf support.
- No GUI.
+
+ Clear lots of inplicit-declaration warnings. Don't locally
+ prototype system function.
+
+ Insert code fragment from old libgd that was prototyped but
+ not implemented locally. See:
+ http://gradsusr.org/pipermail/gradsusr/2005-October/002017.html
+
+ hdf is static-only: must link libsz as internal dependency.
<<
License: Restrictive
-DocFiles: COPYRIGHT INSTALL
+DocFiles: COPYRIGHT INSTALL src/README.sl
Maintainer: None <[email protected]>
Homepage: http://grads.iges.org/grads/grads.html
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
