Revision: 75543 http://trac.macports.org/changeset/75543 Author: takeshi@macports.org Date: 2011-01-29 05:27:50 -0800 (Sat, 29 Jan 2011) Log Message: ----------- grads2: updated for v2.0.a9.oga.1. added shapefile support Modified Paths: -------------- trunk/dports/science/grads2/Portfile Removed Paths: ------------- trunk/dports/science/grads2/files/patch-src-Makefile.in.diff Modified: trunk/dports/science/grads2/Portfile =================================================================== --- trunk/dports/science/grads2/Portfile 2011-01-29 10:50:14 UTC (rev 75542) +++ trunk/dports/science/grads2/Portfile 2011-01-29 13:27:50 UTC (rev 75543) @@ -4,8 +4,7 @@ PortSystem 1.0 name grads2 -version 2.0.a7.oga.3 -revision 2 +version 2.0.a9.oga.1 platforms darwin maintainers takeshi categories science @@ -13,9 +12,9 @@ master_sites sourceforge:opengrads distname grads-${version}-bundle worksrcdir grads-${version} -checksums md5 0cf98ccf59cc81996e3b139ffaf3dfd8 \ - sha1 d5a6f10578e4d8af75047b211b0af2cce46db6fd \ - rmd160 7861998b9f9d84c92c6c51eef03e00afc0f9d071 +checksums md5 d8f11e55f4d1f43eedb59e81cac177c4 \ + sha1 b54c63c3124765561426453a5e13148d046acb09 \ + rmd160 9b3cec052c57cb13e406242b9b516c4884209087 homepage http://www.opengrads.org/ long_description \ The Grid Analysis and Display System (GrADS) is an interactive \ @@ -25,18 +24,27 @@ GrADS has been implemented worldwide on a variety of commonly used \ operating systems and is freely distributed over the Internet. -depends_lib port:libwww port:readline port:rx \ +#depends_lib port:libwww port:readline port:rx +depends_lib port:readline port:rx \ port:netcdf port:udunits \ port:hdf4 port:gd2 port:libnc-dap \ port:gadap port:wgrib2 \ - port:curl port:libgeotiff + port:curl port:libgeotiff port:shapelib depends_build port:pkgconfig -patchfiles patch-src-Makefile.in.diff +#patchfiles patch-src-Makefile.in.diff +patchfiles patch-configure.diff -pre-configure { - reinplace "s|lwww|lwwwcore|g" ${worksrcpath}/configure -} +#post-patch { +# reinplace "s|png12|png|g" ${worksrcpath}/configure +# reinplace "s|printim_libs=.*$|printim_libs=-lgd|" ${worksrcpath}/configure +# reinplace "s|readline_libs=.*$|readline_libs=-lreadline|" ${worksrcpath}/configure +# reinplace "s|hdf5_libs=.*$|hdf5_libs=-lhdf5|" ${worksrcpath}/configure +# reinplace "s|nc_libs=.*$|nc_libs=-lnetcdf|" ${worksrcpath}/configure +# reinplace "s|geotiff_libs=.*$|geotiff_libs=-lgeotiff|" ${worksrcpath}/configure +# reinplace "s|shp_libs=.*$|shp_libs=-lshp|" ${worksrcpath}/configure +# reinplace "s|gadap_libs=.*$|gadap_libs=-lgadap -ldap -ldapserver -ldapclient -lcurl -lidn -lssl -lcrypto -lz -lxml2 -lpthread -lz -liconv -lm|" ${worksrcpath}/configure +#} configure.env-append SUPPLIBS="${prefix}" configure.args --with-readline \ @@ -45,6 +53,7 @@ --with-netcdf=${prefix} \ --with-geotiff \ --with-x --with-printim --without-gui \ + --with-shp \ --program-suffix="-2" configure.cppflags-delete -I${prefix}/include set jpegdir ${prefix}/lib/jpeg6b @@ -54,8 +63,8 @@ post-configure { reinplace "s|^INCLUDES = |INCLUDES = -I${jpegdir}/include |" ${worksrcpath}/src/Makefile - reinplace "s|libwww.a|libwwwcore.a|g" ${worksrcpath}/src/Makefile - reinplace "s|\$(supp_lib_dir)/inst.o| |g" ${worksrcpath}/src/Makefile +# reinplace "s|libwww.a|libwwwcore.a|g" ${worksrcpath}/src/Makefile +# reinplace "s|\$(supp_lib_dir)/inst.o| |g" ${worksrcpath}/src/Makefile } test.run yes Deleted: trunk/dports/science/grads2/files/patch-src-Makefile.in.diff =================================================================== --- trunk/dports/science/grads2/files/patch-src-Makefile.in.diff 2011-01-29 10:50:14 UTC (rev 75542) +++ trunk/dports/science/grads2/files/patch-src-Makefile.in.diff 2011-01-29 13:27:50 UTC (rev 75543) @@ -1,26 +0,0 @@ ---- src/Makefile.in.orig 2010-05-21 17:37:35.000000000 +0900 -+++ src/Makefile.in 2010-05-21 17:39:00.000000000 +0900 -@@ -348,23 +348,7 @@ - # Settings used for most binaries - # (do not add those with multiple versions such as netcdf/hdf/nc-dap - INCLUDES = -I$(supp_include_dir) \ -- -I$(supp_include_dir)/curl \ -- -I$(supp_include_dir)/xml2 \ -- -I$(supp_include_dir)/gd \ -- -I$(supp_include_dir)/gadap \ -- -I$(supp_include_dir)/udunits \ -- -I$(supp_include_dir)/hdf \ -- -I$(supp_include_dir)/hdf5 \ -- -I$(supp_include_dir)/netcdf \ -- -I$(supp_include_dir)/jpeg \ -- -I$(supp_include_dir)/libpng \ -- -I$(supp_include_dir)/zlib \ -- -I$(supp_include_dir)/X11/neXtaw \ -- -I$(supp_include_dir)/libsx \ -- -I$(supp_include_dir)/grib2c \ - -I$(supp_include_dir)/jasper \ -- -I$(supp_include_dir)/tiff \ -- -I$(supp_include_dir)/geotiff \ - $(X_CFLAGS) $(XAW_CFLAGS) $(GD_CFLAGS) \ - $(HDF4_CFLAGS) -