diff options
| author | wennmach <wennmach@pkgsrc.org> | 2006-11-14 13:16:00 +0000 |
|---|---|---|
| committer | wennmach <wennmach@pkgsrc.org> | 2006-11-14 13:16:00 +0000 |
| commit | 11f5afe35bdb901e9f3cdcd4cfb9be3b00b17217 (patch) | |
| tree | a15741855d7fe46797534bd85d5e79caa4d813c3 /graphics | |
| parent | 4fdd5d0a214f251929b8690d1c44a7537fd5c971 (diff) | |
| download | pkgsrc-11f5afe35bdb901e9f3cdcd4cfb9be3b00b17217.tar.gz | |
Update GMT to the most recent, supported, version 4.1.4.
The most significant changes in 4.0 include:
o Time-series support
o New Tools:
- gmt2rgb
- grdblend
- pslegend:
o 30 new program options
o More than 23 general enhancements
The releases 4.1 and 4.1.1 to 4.1.4 include the following changes:
o numerous significant bug fixes
o many added program options
o added features and capabilities
For a complete list of changes, see
http://gmt.soest.hawaii.edu/gmt/gmt_releases.html
Diffstat (limited to 'graphics')
33 files changed, 1564 insertions, 1079 deletions
diff --git a/graphics/GMT/DESCR b/graphics/GMT/DESCR index 08743535d56..9f61673eeb6 100644 --- a/graphics/GMT/DESCR +++ b/graphics/GMT/DESCR @@ -1,12 +1,12 @@ -GMT is a free collection of ~60 UNIX tools that allow users to -manipulate (x,y) and (x,y,z) data sets (including filtering, trend -fitting, gridding, projecting, etc.) and produce Encapsulated -PostScript File (EPS) illustrations ranging from simple x-y plots -through contour maps to artificially illuminated surfaces and 3-D -perspective views in black and white, gray tone, hachure patterns, and -24-bit color. GMT supports 25 common map projections plus linear, log, -and power scaling, and comes with support data such as coastlines, -rivers, and political boundaries. +GMT is a free collection of UNIX tools that allow users to manipulate +(x,y) and (x,y,z) data sets (including filtering, trend fitting, +gridding, projecting, etc.) and produce Encapsulated PostScript File +(EPS) illustrations ranging from simple x-y plots through contour maps +to artificially illuminated surfaces and 3-D perspective views in black +and white, gray tone, hachure patterns, and 24-bit color. GMT supports +25 common map projections plus linear, log, and power scaling, and +comes with support data such as coastlines, rivers, and political +boundaries. -The package also includes 39 supplemental programs, html documentation, +The package also includes supplemental programs, html documentation, and examples. diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile index 3cd0659c5bf..816c243ad47 100644 --- a/graphics/GMT/Makefile +++ b/graphics/GMT/Makefile @@ -1,18 +1,23 @@ -# $NetBSD: Makefile,v 1.28 2006/03/04 21:29:45 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2006/11/14 13:16:00 wennmach Exp $ -DISTNAME= GMT3.4 -PKGNAME= GMT-3.4 -PKGREVISION= 1 +DISTNAME= GMT4.1.4 +PKGNAME= GMT-4.1.4 +#PKGREVISION= 1 CATEGORIES= graphics -MASTER_SITES= ftp://gmt.soest.hawaii.edu/pub/gmt/ \ - ftp://falcon.grdl.noaa.gov/pub/gmt/ \ - ftp://ftp.iag.usp.br/pub/gmt/ \ - ftp://ftp.geologi.uio.no/pub/gmt/ \ - ftp://life.csu.edu.au/pub/gmt/ \ - ftp://ftp.eos.hokudai.ac.jp/pub/gmt/ -DISTFILES= GMT3.4_progs.tar.bz2 GMT3.4_suppl.tar.bz2 GMT_share.tar.bz2 \ - GMT3.4_ps.tar.bz2 GMT3.4_man.tar.bz2 GMT3.4_tut.tar.bz2 \ - GMT3.4_scripts.tar.bz2 GMT3.4_web.tar.bz2 +MASTER_SITES= ftp://ftp.soest.hawaii.edu/gmt/4/ \ + ftp://falcon.grdl.noaa.gov/pub/gmt/4/ \ + ftp://ftp.iris.washington.edu/pub/gmt/4/ \ + ftp://ftp.iag.usp.br/pub/gmt/4/ \ + ftp://ftp.geologi.uio.no/pub/gmt/4/ \ + ftp://gd.tuwien.ac.at/pub/gmt/4/ \ + ftp://life.csu.edu.au/pub/gmt/4/ \ + ftp://ftp.scc.u-tokai.ac.jp/pub/gmt/4/ +DISTFILES= GMT4.1.4_man.tar.bz2 GMT4.1.4_pdf.tar.bz2 \ + GMT4.1.4_scripts.tar.bz2 GMT4.1.4_share.tar.bz2 \ + GMT4.1.4_src.tar.bz2 GMT4.1.4_suppl.tar.bz2 \ + GMT4.1.4_tut.tar.bz2 GMT4.1.4_web.tar.bz2 \ + GMT4.1_coast.tar.bz2 GMT4.1_high.tar.bz2 \ + GMT4.1_full.tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://gmt.soest.hawaii.edu/ @@ -27,37 +32,40 @@ USE_LIBTOOL= yes CONFIGURE_ARGS+=--includedir=${PREFIX}/include/gmt CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gmt CONFIGURE_ARGS+=--enable-eps +CONFIGURE_ARGS+=--enable-netcdf=${BUILDLINK_PREFIX.netcdf:Q} CONFIGURE_ARGS+=--enable-www=${PREFIX}/share/doc/html CONFIGURE_ARGS+=--enable-mansect=1 -MAKE_ENV+= NETCDFHOME=${BUILDLINK_PREFIX.netcdf:Q} -MAKE_ENV+= LIBTOOL=${LIBTOOL:Q} +CONFIGURE_ARGS+=--disable-mex BUILD_TARGET= all suppl INSTALL_TARGET= install-all +.include "../../mk/x11.buildlink3.mk" + post-extract: - ${MV} -f ${WRKSRC}/www/gmt/doc/ps ${WRKSRC} + ${MV} -f ${WRKSRC}/www/gmt/doc/pdf ${WRKSRC} ${RM} -f ${WRKSRC}/examples/*.bat ${WRKSRC}/examples/*/*.bat - for f in ${WRKSRC}/examples/do_view.bash \ - ${WRKSRC}/examples/do_view.csh; do \ - ${SED} -e 's:ghostview:gv:g' $$f > $$f.tmp && \ - ${MV} -f $$f.tmp $$f; \ - done post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gmt - cd ${WRKSRC}/ps && ${INSTALL_DATA} GMT_Docs.ps GMT_Tutorial.ps \ - ${PREFIX}/share/doc/gmt + cd ${WRKSRC}/pdf && ${INSTALL_DATA} GMT_Docs.pdf \ + GMT_Tutorial.pdf ${PREFIX}/share/doc/gmt (cd ${PREFIX}/share/doc/html/gmt/doc && ${LN} -sf \ - ../../../gmt ps) + ../../../gmt pdf) ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt/tutorial - cd ${WRKSRC}/tutorial && ${INSTALL_DATA} bermuda.grd quakes.cpt \ - ship.xyz us.grd data quakes.ngdc \ + cd ${WRKSRC}/tutorial && ${INSTALL_DATA} bermuda.nc quakes.cpt \ + ship.xyz us.nc data quakes.ngdc topo.cpt \ ${PREFIX}/share/examples/gmt/tutorial; - ${INSTALL_DATA} ${WRKDIR}/share/* ${PREFIX}/share/gmt + ${INSTALL_DATA_DIR} ${PREFIX}/share/gmt + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/share + cd ${WRKSRC}/share && ${PAX} -rw . ${PREFIX}/share/gmt ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/examples/ cd ${WRKSRC}/examples && ${PAX} -rw . ${PREFIX}/share/examples/gmt + ${RM} ${PREFIX}/share/gmt/.gmtdefaults_SI.orig + ${RM} ${PREFIX}/share/gmt/.gmtdefaults_US.orig + ${RM} ${PREFIX}/share/gmt/gmt.conf.orig + cd ${WRKDIR}/share && ${PAX} -rw . ${PREFIX}/share/gmt .include "../../devel/netcdf/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/GMT/PLIST b/graphics/GMT/PLIST index e684a93d1f9..56d2d061967 100644 --- a/graphics/GMT/PLIST +++ b/graphics/GMT/PLIST @@ -1,19 +1,19 @@ -@comment $NetBSD: PLIST,v 1.3 2005/11/03 22:30:35 rillig Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/11/14 13:16:00 wennmach Exp $ bin/GMT bin/backtracker bin/binlegs bin/blockmean bin/blockmedian bin/blockmode -bin/cpsdecode -bin/cpsencode bin/dat2gmt bin/filter1d bin/fitcircle bin/gmt2bin bin/gmt2dat +bin/gmt2rgb bin/gmtconvert bin/gmtdefaults +bin/gmtdigitize bin/gmtinfo bin/gmtlegs bin/gmtlist @@ -21,9 +21,11 @@ bin/gmtmath bin/gmtpath bin/gmtselect bin/gmtset +bin/gmtstitch bin/gmttrack bin/grd2cpt bin/grd2xyz +bin/grdblend bin/grdclip bin/grdcontour bin/grdcut @@ -41,6 +43,7 @@ bin/grdpaste bin/grdproject bin/grdraster bin/grdreformat +bin/grdrotater bin/grdsample bin/grdtrack bin/grdtrend @@ -53,13 +56,21 @@ bin/hotspotter bin/img2grd bin/img2mercgrd bin/makecpt -bin/makepattern bin/mapproject +bin/mgd77convert +bin/mgd77info +bin/mgd77list +bin/mgd77path +bin/mgd77manage +bin/mgd77sniffer bin/mgd77togmt +bin/mgd77track bin/minmax +bin/nc2xy bin/nearneighbor bin/originator bin/project +bin/ps2raster bin/psbasemap bin/psclip bin/pscoast @@ -67,6 +78,7 @@ bin/pscontour bin/pscoupe bin/pshistogram bin/psimage +bin/pslegend bin/psmask bin/psmeca bin/psmegaplot @@ -80,15 +92,22 @@ bin/psvelo bin/pswiggle bin/psxy bin/psxyz +bin/rotconverter bin/sample1d +bin/segy2grd bin/spectrum1d bin/splitxyz bin/surface bin/trend1d bin/trend2d bin/triangulate +bin/x2sys_binlist bin/x2sys_cross bin/x2sys_datalist +bin/x2sys_get +bin/x2sys_init +bin/x2sys_put +bin/xgridedit bin/x_edit bin/x_init bin/x_list @@ -102,23 +121,46 @@ bin/xyz2grd include/gmt/gmt.h include/gmt/gmt_bcr.h include/gmt/gmt_boundcond.h +include/gmt/gmt_calclock.h include/gmt/gmt_colors.h +include/gmt/gmt_common.h +include/gmt/gmt_contour.h include/gmt/gmt_customio.h -include/gmt/gmt_funcnames.h +include/gmt/gmt_ellipsoids.h +include/gmt/gmt_datums.h include/gmt/gmt_grd.h +include/gmt/gmt_grdformats.h include/gmt/gmt_grdio.h +include/gmt/gmt_init.h include/gmt/gmt_io.h +include/gmt/gmt_keycases.h include/gmt/gmt_keywords.h include/gmt/gmt_map.h include/gmt/gmt_math.h +include/gmt/gmt_mgg_header2.h include/gmt/gmt_nan.h include/gmt/gmt_notposix.h include/gmt/gmt_notunix.h +include/gmt/gmt_plot.h +include/gmt/gmt_proj.h include/gmt/gmt_project.h include/gmt/gmt_shore.h +include/gmt/gmt_symbol.h +include/gmt/gmt_synopsis.h +include/gmt/gmt_stat.h +include/gmt/gmt_support.h +include/gmt/gmt_time_systems.h include/gmt/gmt_unique.h +include/gmt/gmt_vector.h +include/gmt/gmt_version.h +include/gmt/mgd77.h +include/gmt/mgd77_functions.h +include/gmt/mgd77defaults.h include/gmt/pslib.h +include/gmt/pslib_inc.h lib/libgmt.la +lib/libmgd77.la +lib/libgmtps.la lib/libgmt_mgg.la lib/libpsl.la lib/libx2sys.la @@ -128,15 +170,15 @@ man/man1/binlegs.1 man/man1/blockmean.1 man/man1/blockmedian.1 man/man1/blockmode.1 -man/man1/cpsdecode.1 -man/man1/cpsencode.1 man/man1/dat2gmt.1 man/man1/filter1d.1 man/man1/fitcircle.1 man/man1/gmt2bin.1 man/man1/gmt2dat.1 +man/man1/gmt2rgb.1 man/man1/gmtconvert.1 man/man1/gmtdefaults.1 +man/man1/gmtdigitize.1 man/man1/gmtinfo.1 man/man1/gmtlegs.1 man/man1/gmtlist.1 @@ -144,9 +186,11 @@ man/man1/gmtmath.1 man/man1/gmtpath.1 man/man1/gmtselect.1 man/man1/gmtset.1 +man/man1/gmtstitch.1 man/man1/gmttrack.1 man/man1/grd2cpt.1 man/man1/grd2xyz.1 +man/man1/grdblend.1 man/man1/grdclip.1 man/man1/grdcontour.1 man/man1/grdcut.1 @@ -164,6 +208,7 @@ man/man1/grdpaste.1 man/man1/grdproject.1 man/man1/grdraster.1 man/man1/grdreformat.1 +man/man1/grdrotater.1 man/man1/grdsample.1 man/man1/grdtrack.1 man/man1/grdtrend.1 @@ -176,8 +221,16 @@ man/man1/img2mercgrd.1 man/man1/makecpt.1 man/man1/makepattern.1 man/man1/mapproject.1 +man/man1/mgd77convert.1 +man/man1/mgd77info.1 +man/man1/mgd77list.1 +man/man1/mgd77manage.1 +man/man1/mgd77path.1 +man/man1/mgd77sniffer.1 man/man1/mgd77togmt.1 +man/man1/mgd77track.1 man/man1/minmax.1 +man/man1/nc2xy.1 man/man1/nearneighbor.1 man/man1/originator.1 man/man1/project.1 @@ -188,11 +241,13 @@ man/man1/pscontour.1 man/man1/pscoupe.1 man/man1/pshistogram.1 man/man1/psimage.1 +man/man1/pslegend.1 man/man1/pslib.1 man/man1/psmask.1 man/man1/psmeca.1 man/man1/psmegaplot.1 man/man1/pspolar.1 +man/man1/ps2raster.1 man/man1/psrose.1 man/man1/psscale.1 man/man1/pssegy.1 @@ -202,7 +257,9 @@ man/man1/psvelo.1 man/man1/pswiggle.1 man/man1/psxy.1 man/man1/psxyz.1 +man/man1/rotconverter.1 man/man1/sample1d.1 +man/man1/segy2grd.1 man/man1/spectrum1d.1 man/man1/splitxyz.1 man/man1/surface.1 @@ -211,6 +268,10 @@ man/man1/trend2d.1 man/man1/triangulate.1 man/man1/x2sys_cross.1 man/man1/x2sys_datalist.1 +man/man1/x2sys_get.1 +man/man1/x2sys_put.1 +man/man1/x2sys_init.1 +man/man1/x2sys_binlist.1 man/man1/x_edit.1 man/man1/x_init.1 man/man1/x_list.1 @@ -222,219 +283,313 @@ man/man1/x_solve_dc_drift.1 man/man1/x_system.1 man/man1/x_update.1 man/man1/xyz2grd.1 -share/doc/gmt/GMT_Docs.ps -share/doc/gmt/GMT_Tutorial.ps +share/doc/gmt/GMT_Docs.pdf +share/doc/gmt/GMT_Tutorial.pdf +share/doc/html/gmt/doc/html/GMT.html share/doc/html/gmt/doc/html/GMT_Docs/GMT_Docs.css share/doc/html/gmt/doc/html/GMT_Docs/GMT_Docs.html -share/doc/html/gmt/doc/html/GMT_Docs/contents.gif +share/doc/html/gmt/doc/html/GMT_Docs/contents.png share/doc/html/gmt/doc/html/GMT_Docs/footnode.html -share/doc/html/gmt/doc/html/GMT_Docs/img1.gif -share/doc/html/gmt/doc/html/GMT_Docs/img10.gif -share/doc/html/gmt/doc/html/GMT_Docs/img100.gif -share/doc/html/gmt/doc/html/GMT_Docs/img101.gif -share/doc/html/gmt/doc/html/GMT_Docs/img102.gif -share/doc/html/gmt/doc/html/GMT_Docs/img103.gif -share/doc/html/gmt/doc/html/GMT_Docs/img104.gif -share/doc/html/gmt/doc/html/GMT_Docs/img105.gif -share/doc/html/gmt/doc/html/GMT_Docs/img106.gif -share/doc/html/gmt/doc/html/GMT_Docs/img107.gif -share/doc/html/gmt/doc/html/GMT_Docs/img108.gif -share/doc/html/gmt/doc/html/GMT_Docs/img109.gif -share/doc/html/gmt/doc/html/GMT_Docs/img11.gif -share/doc/html/gmt/doc/html/GMT_Docs/img110.gif -share/doc/html/gmt/doc/html/GMT_Docs/img111.gif -share/doc/html/gmt/doc/html/GMT_Docs/img112.gif -share/doc/html/gmt/doc/html/GMT_Docs/img113.gif -share/doc/html/gmt/doc/html/GMT_Docs/img114.gif -share/doc/html/gmt/doc/html/GMT_Docs/img115.gif -share/doc/html/gmt/doc/html/GMT_Docs/img116.gif -share/doc/html/gmt/doc/html/GMT_Docs/img117.gif -share/doc/html/gmt/doc/html/GMT_Docs/img118.gif -share/doc/html/gmt/doc/html/GMT_Docs/img119.gif -share/doc/html/gmt/doc/html/GMT_Docs/img12.gif -share/doc/html/gmt/doc/html/GMT_Docs/img120.gif -share/doc/html/gmt/doc/html/GMT_Docs/img121.gif -share/doc/html/gmt/doc/html/GMT_Docs/img122.gif -share/doc/html/gmt/doc/html/GMT_Docs/img123.gif -share/doc/html/gmt/doc/html/GMT_Docs/img124.gif -share/doc/html/gmt/doc/html/GMT_Docs/img125.gif -share/doc/html/gmt/doc/html/GMT_Docs/img126.gif -share/doc/html/gmt/doc/html/GMT_Docs/img127.gif -share/doc/html/gmt/doc/html/GMT_Docs/img128.gif -share/doc/html/gmt/doc/html/GMT_Docs/img129.gif -share/doc/html/gmt/doc/html/GMT_Docs/img13.gif -share/doc/html/gmt/doc/html/GMT_Docs/img130.gif -share/doc/html/gmt/doc/html/GMT_Docs/img131.gif -share/doc/html/gmt/doc/html/GMT_Docs/img132.gif -share/doc/html/gmt/doc/html/GMT_Docs/img133.gif -share/doc/html/gmt/doc/html/GMT_Docs/img134.gif -share/doc/html/gmt/doc/html/GMT_Docs/img135.gif -share/doc/html/gmt/doc/html/GMT_Docs/img136.gif -share/doc/html/gmt/doc/html/GMT_Docs/img137.gif -share/doc/html/gmt/doc/html/GMT_Docs/img138.gif -share/doc/html/gmt/doc/html/GMT_Docs/img139.gif -share/doc/html/gmt/doc/html/GMT_Docs/img14.gif -share/doc/html/gmt/doc/html/GMT_Docs/img140.gif -share/doc/html/gmt/doc/html/GMT_Docs/img141.gif -share/doc/html/gmt/doc/html/GMT_Docs/img142.gif -share/doc/html/gmt/doc/html/GMT_Docs/img143.gif -share/doc/html/gmt/doc/html/GMT_Docs/img144.gif -share/doc/html/gmt/doc/html/GMT_Docs/img145.gif -share/doc/html/gmt/doc/html/GMT_Docs/img146.gif -share/doc/html/gmt/doc/html/GMT_Docs/img147.gif -share/doc/html/gmt/doc/html/GMT_Docs/img148.gif -share/doc/html/gmt/doc/html/GMT_Docs/img149.gif -share/doc/html/gmt/doc/html/GMT_Docs/img15.gif -share/doc/html/gmt/doc/html/GMT_Docs/img150.gif -share/doc/html/gmt/doc/html/GMT_Docs/img151.gif -share/doc/html/gmt/doc/html/GMT_Docs/img152.gif -share/doc/html/gmt/doc/html/GMT_Docs/img153.gif -share/doc/html/gmt/doc/html/GMT_Docs/img154.gif -share/doc/html/gmt/doc/html/GMT_Docs/img155.gif -share/doc/html/gmt/doc/html/GMT_Docs/img156.gif -share/doc/html/gmt/doc/html/GMT_Docs/img157.gif -share/doc/html/gmt/doc/html/GMT_Docs/img158.gif -share/doc/html/gmt/doc/html/GMT_Docs/img159.gif -share/doc/html/gmt/doc/html/GMT_Docs/img16.gif -share/doc/html/gmt/doc/html/GMT_Docs/img160.gif -share/doc/html/gmt/doc/html/GMT_Docs/img161.gif -share/doc/html/gmt/doc/html/GMT_Docs/img162.gif -share/doc/html/gmt/doc/html/GMT_Docs/img163.gif -share/doc/html/gmt/doc/html/GMT_Docs/img164.gif -share/doc/html/gmt/doc/html/GMT_Docs/img165.gif -share/doc/html/gmt/doc/html/GMT_Docs/img166.gif -share/doc/html/gmt/doc/html/GMT_Docs/img167.gif -share/doc/html/gmt/doc/html/GMT_Docs/img168.gif -share/doc/html/gmt/doc/html/GMT_Docs/img169.gif -share/doc/html/gmt/doc/html/GMT_Docs/img17.gif -share/doc/html/gmt/doc/html/GMT_Docs/img170.gif -share/doc/html/gmt/doc/html/GMT_Docs/img171.gif -share/doc/html/gmt/doc/html/GMT_Docs/img172.gif -share/doc/html/gmt/doc/html/GMT_Docs/img173.gif -share/doc/html/gmt/doc/html/GMT_Docs/img174.gif -share/doc/html/gmt/doc/html/GMT_Docs/img175.gif -share/doc/html/gmt/doc/html/GMT_Docs/img176.gif -share/doc/html/gmt/doc/html/GMT_Docs/img177.gif -share/doc/html/gmt/doc/html/GMT_Docs/img178.gif -share/doc/html/gmt/doc/html/GMT_Docs/img179.gif -share/doc/html/gmt/doc/html/GMT_Docs/img18.gif -share/doc/html/gmt/doc/html/GMT_Docs/img180.gif -share/doc/html/gmt/doc/html/GMT_Docs/img181.gif -share/doc/html/gmt/doc/html/GMT_Docs/img182.gif -share/doc/html/gmt/doc/html/GMT_Docs/img183.gif -share/doc/html/gmt/doc/html/GMT_Docs/img184.gif -share/doc/html/gmt/doc/html/GMT_Docs/img185.gif -share/doc/html/gmt/doc/html/GMT_Docs/img186.gif -share/doc/html/gmt/doc/html/GMT_Docs/img187.gif -share/doc/html/gmt/doc/html/GMT_Docs/img188.gif -share/doc/html/gmt/doc/html/GMT_Docs/img189.gif -share/doc/html/gmt/doc/html/GMT_Docs/img19.gif -share/doc/html/gmt/doc/html/GMT_Docs/img190.gif -share/doc/html/gmt/doc/html/GMT_Docs/img191.gif -share/doc/html/gmt/doc/html/GMT_Docs/img192.gif -share/doc/html/gmt/doc/html/GMT_Docs/img193.gif -share/doc/html/gmt/doc/html/GMT_Docs/img194.gif -share/doc/html/gmt/doc/html/GMT_Docs/img195.gif -share/doc/html/gmt/doc/html/GMT_Docs/img196.gif -share/doc/html/gmt/doc/html/GMT_Docs/img197.gif -share/doc/html/gmt/doc/html/GMT_Docs/img198.gif -share/doc/html/gmt/doc/html/GMT_Docs/img199.gif -share/doc/html/gmt/doc/html/GMT_Docs/img2.gif -share/doc/html/gmt/doc/html/GMT_Docs/img20.gif -share/doc/html/gmt/doc/html/GMT_Docs/img200.gif -share/doc/html/gmt/doc/html/GMT_Docs/img201.gif -share/doc/html/gmt/doc/html/GMT_Docs/img202.gif -share/doc/html/gmt/doc/html/GMT_Docs/img203.gif -share/doc/html/gmt/doc/html/GMT_Docs/img204.gif -share/doc/html/gmt/doc/html/GMT_Docs/img21.gif -share/doc/html/gmt/doc/html/GMT_Docs/img22.gif -share/doc/html/gmt/doc/html/GMT_Docs/img23.gif -share/doc/html/gmt/doc/html/GMT_Docs/img24.gif -share/doc/html/gmt/doc/html/GMT_Docs/img25.gif -share/doc/html/gmt/doc/html/GMT_Docs/img26.gif -share/doc/html/gmt/doc/html/GMT_Docs/img27.gif -share/doc/html/gmt/doc/html/GMT_Docs/img28.gif -share/doc/html/gmt/doc/html/GMT_Docs/img29.gif -share/doc/html/gmt/doc/html/GMT_Docs/img3.gif -share/doc/html/gmt/doc/html/GMT_Docs/img30.gif -share/doc/html/gmt/doc/html/GMT_Docs/img31.gif -share/doc/html/gmt/doc/html/GMT_Docs/img32.gif -share/doc/html/gmt/doc/html/GMT_Docs/img33.gif -share/doc/html/gmt/doc/html/GMT_Docs/img34.gif -share/doc/html/gmt/doc/html/GMT_Docs/img35.gif -share/doc/html/gmt/doc/html/GMT_Docs/img36.gif -share/doc/html/gmt/doc/html/GMT_Docs/img37.gif -share/doc/html/gmt/doc/html/GMT_Docs/img38.gif -share/doc/html/gmt/doc/html/GMT_Docs/img39.gif -share/doc/html/gmt/doc/html/GMT_Docs/img4.gif -share/doc/html/gmt/doc/html/GMT_Docs/img40.gif -share/doc/html/gmt/doc/html/GMT_Docs/img41.gif -share/doc/html/gmt/doc/html/GMT_Docs/img42.gif -share/doc/html/gmt/doc/html/GMT_Docs/img43.gif -share/doc/html/gmt/doc/html/GMT_Docs/img44.gif -share/doc/html/gmt/doc/html/GMT_Docs/img45.gif -share/doc/html/gmt/doc/html/GMT_Docs/img46.gif -share/doc/html/gmt/doc/html/GMT_Docs/img47.gif -share/doc/html/gmt/doc/html/GMT_Docs/img48.gif -share/doc/html/gmt/doc/html/GMT_Docs/img49.gif -share/doc/html/gmt/doc/html/GMT_Docs/img5.gif -share/doc/html/gmt/doc/html/GMT_Docs/img50.gif -share/doc/html/gmt/doc/html/GMT_Docs/img51.gif -share/doc/html/gmt/doc/html/GMT_Docs/img52.gif -share/doc/html/gmt/doc/html/GMT_Docs/img53.gif -share/doc/html/gmt/doc/html/GMT_Docs/img54.gif -share/doc/html/gmt/doc/html/GMT_Docs/img55.gif -share/doc/html/gmt/doc/html/GMT_Docs/img56.gif -share/doc/html/gmt/doc/html/GMT_Docs/img57.gif -share/doc/html/gmt/doc/html/GMT_Docs/img58.gif -share/doc/html/gmt/doc/html/GMT_Docs/img59.gif -share/doc/html/gmt/doc/html/GMT_Docs/img6.gif -share/doc/html/gmt/doc/html/GMT_Docs/img60.gif -share/doc/html/gmt/doc/html/GMT_Docs/img61.gif -share/doc/html/gmt/doc/html/GMT_Docs/img62.gif -share/doc/html/gmt/doc/html/GMT_Docs/img63.gif -share/doc/html/gmt/doc/html/GMT_Docs/img64.gif -share/doc/html/gmt/doc/html/GMT_Docs/img65.gif -share/doc/html/gmt/doc/html/GMT_Docs/img66.gif -share/doc/html/gmt/doc/html/GMT_Docs/img67.gif -share/doc/html/gmt/doc/html/GMT_Docs/img68.gif -share/doc/html/gmt/doc/html/GMT_Docs/img69.gif -share/doc/html/gmt/doc/html/GMT_Docs/img7.gif -share/doc/html/gmt/doc/html/GMT_Docs/img70.gif -share/doc/html/gmt/doc/html/GMT_Docs/img71.gif -share/doc/html/gmt/doc/html/GMT_Docs/img72.gif -share/doc/html/gmt/doc/html/GMT_Docs/img73.gif -share/doc/html/gmt/doc/html/GMT_Docs/img74.gif -share/doc/html/gmt/doc/html/GMT_Docs/img75.gif -share/doc/html/gmt/doc/html/GMT_Docs/img76.gif -share/doc/html/gmt/doc/html/GMT_Docs/img77.gif -share/doc/html/gmt/doc/html/GMT_Docs/img78.gif -share/doc/html/gmt/doc/html/GMT_Docs/img79.gif -share/doc/html/gmt/doc/html/GMT_Docs/img8.gif -share/doc/html/gmt/doc/html/GMT_Docs/img80.gif -share/doc/html/gmt/doc/html/GMT_Docs/img81.gif -share/doc/html/gmt/doc/html/GMT_Docs/img82.gif -share/doc/html/gmt/doc/html/GMT_Docs/img83.gif -share/doc/html/gmt/doc/html/GMT_Docs/img84.gif -share/doc/html/gmt/doc/html/GMT_Docs/img85.gif -share/doc/html/gmt/doc/html/GMT_Docs/img86.gif -share/doc/html/gmt/doc/html/GMT_Docs/img87.gif -share/doc/html/gmt/doc/html/GMT_Docs/img88.gif -share/doc/html/gmt/doc/html/GMT_Docs/img89.gif -share/doc/html/gmt/doc/html/GMT_Docs/img9.gif -share/doc/html/gmt/doc/html/GMT_Docs/img90.gif -share/doc/html/gmt/doc/html/GMT_Docs/img91.gif -share/doc/html/gmt/doc/html/GMT_Docs/img92.gif -share/doc/html/gmt/doc/html/GMT_Docs/img93.gif -share/doc/html/gmt/doc/html/GMT_Docs/img94.gif -share/doc/html/gmt/doc/html/GMT_Docs/img95.gif -share/doc/html/gmt/doc/html/GMT_Docs/img96.gif -share/doc/html/gmt/doc/html/GMT_Docs/img97.gif -share/doc/html/gmt/doc/html/GMT_Docs/img98.gif -share/doc/html/gmt/doc/html/GMT_Docs/img99.gif -share/doc/html/gmt/doc/html/GMT_Docs/index.gif -share/doc/html/gmt/doc/html/GMT_Docs/next.gif -share/doc/html/gmt/doc/html/GMT_Docs/next_g.gif +share/doc/html/gmt/doc/html/GMT_Docs/img1.png +share/doc/html/gmt/doc/html/GMT_Docs/img10.png +share/doc/html/gmt/doc/html/GMT_Docs/img100.png +share/doc/html/gmt/doc/html/GMT_Docs/img101.png +share/doc/html/gmt/doc/html/GMT_Docs/img102.png +share/doc/html/gmt/doc/html/GMT_Docs/img103.png +share/doc/html/gmt/doc/html/GMT_Docs/img104.png +share/doc/html/gmt/doc/html/GMT_Docs/img105.png +share/doc/html/gmt/doc/html/GMT_Docs/img106.png +share/doc/html/gmt/doc/html/GMT_Docs/img107.png +share/doc/html/gmt/doc/html/GMT_Docs/img108.png +share/doc/html/gmt/doc/html/GMT_Docs/img109.png +share/doc/html/gmt/doc/html/GMT_Docs/img11.png +share/doc/html/gmt/doc/html/GMT_Docs/img110.png +share/doc/html/gmt/doc/html/GMT_Docs/img111.png +share/doc/html/gmt/doc/html/GMT_Docs/img112.png +share/doc/html/gmt/doc/html/GMT_Docs/img113.png +share/doc/html/gmt/doc/html/GMT_Docs/img114.png +share/doc/html/gmt/doc/html/GMT_Docs/img115.png +share/doc/html/gmt/doc/html/GMT_Docs/img116.png +share/doc/html/gmt/doc/html/GMT_Docs/img117.png +share/doc/html/gmt/doc/html/GMT_Docs/img118.png +share/doc/html/gmt/doc/html/GMT_Docs/img119.png +share/doc/html/gmt/doc/html/GMT_Docs/img12.png +share/doc/html/gmt/doc/html/GMT_Docs/img120.png +share/doc/html/gmt/doc/html/GMT_Docs/img121.png +share/doc/html/gmt/doc/html/GMT_Docs/img122.png +share/doc/html/gmt/doc/html/GMT_Docs/img123.png +share/doc/html/gmt/doc/html/GMT_Docs/img124.png +share/doc/html/gmt/doc/html/GMT_Docs/img125.png +share/doc/html/gmt/doc/html/GMT_Docs/img126.png +share/doc/html/gmt/doc/html/GMT_Docs/img127.png +share/doc/html/gmt/doc/html/GMT_Docs/img128.png +share/doc/html/gmt/doc/html/GMT_Docs/img129.png +share/doc/html/gmt/doc/html/GMT_Docs/img13.png +share/doc/html/gmt/doc/html/GMT_Docs/img130.png +share/doc/html/gmt/doc/html/GMT_Docs/img131.png +share/doc/html/gmt/doc/html/GMT_Docs/img132.png +share/doc/html/gmt/doc/html/GMT_Docs/img133.png +share/doc/html/gmt/doc/html/GMT_Docs/img134.png +share/doc/html/gmt/doc/html/GMT_Docs/img135.png +share/doc/html/gmt/doc/html/GMT_Docs/img136.png +share/doc/html/gmt/doc/html/GMT_Docs/img137.png +share/doc/html/gmt/doc/html/GMT_Docs/img138.png +share/doc/html/gmt/doc/html/GMT_Docs/img139.png +share/doc/html/gmt/doc/html/GMT_Docs/img14.png +share/doc/html/gmt/doc/html/GMT_Docs/img140.png +share/doc/html/gmt/doc/html/GMT_Docs/img141.png +share/doc/html/gmt/doc/html/GMT_Docs/img142.png +share/doc/html/gmt/doc/html/GMT_Docs/img143.png +share/doc/html/gmt/doc/html/GMT_Docs/img144.png +share/doc/html/gmt/doc/html/GMT_Docs/img145.png +share/doc/html/gmt/doc/html/GMT_Docs/img146.png +share/doc/html/gmt/doc/html/GMT_Docs/img147.png +share/doc/html/gmt/doc/html/GMT_Docs/img148.png +share/doc/html/gmt/doc/html/GMT_Docs/img149.png +share/doc/html/gmt/doc/html/GMT_Docs/img15.png +share/doc/html/gmt/doc/html/GMT_Docs/img150.png +share/doc/html/gmt/doc/html/GMT_Docs/img151.png +share/doc/html/gmt/doc/html/GMT_Docs/img152.png +share/doc/html/gmt/doc/html/GMT_Docs/img153.png +share/doc/html/gmt/doc/html/GMT_Docs/img154.png +share/doc/html/gmt/doc/html/GMT_Docs/img155.png +share/doc/html/gmt/doc/html/GMT_Docs/img156.png +share/doc/html/gmt/doc/html/GMT_Docs/img157.png +share/doc/html/gmt/doc/html/GMT_Docs/img158.png +share/doc/html/gmt/doc/html/GMT_Docs/img159.png +share/doc/html/gmt/doc/html/GMT_Docs/img16.png +share/doc/html/gmt/doc/html/GMT_Docs/img160.png +share/doc/html/gmt/doc/html/GMT_Docs/img161.png +share/doc/html/gmt/doc/html/GMT_Docs/img162.png +share/doc/html/gmt/doc/html/GMT_Docs/img163.png +share/doc/html/gmt/doc/html/GMT_Docs/img164.png +share/doc/html/gmt/doc/html/GMT_Docs/img165.png +share/doc/html/gmt/doc/html/GMT_Docs/img166.png +share/doc/html/gmt/doc/html/GMT_Docs/img167.png +share/doc/html/gmt/doc/html/GMT_Docs/img168.png +share/doc/html/gmt/doc/html/GMT_Docs/img169.png +share/doc/html/gmt/doc/html/GMT_Docs/img17.png +share/doc/html/gmt/doc/html/GMT_Docs/img170.png +share/doc/html/gmt/doc/html/GMT_Docs/img171.png +share/doc/html/gmt/doc/html/GMT_Docs/img172.png +share/doc/html/gmt/doc/html/GMT_Docs/img173.png +share/doc/html/gmt/doc/html/GMT_Docs/img174.png +share/doc/html/gmt/doc/html/GMT_Docs/img175.png +share/doc/html/gmt/doc/html/GMT_Docs/img176.png +share/doc/html/gmt/doc/html/GMT_Docs/img177.png +share/doc/html/gmt/doc/html/GMT_Docs/img178.png +share/doc/html/gmt/doc/html/GMT_Docs/img179.png +share/doc/html/gmt/doc/html/GMT_Docs/img18.png +share/doc/html/gmt/doc/html/GMT_Docs/img180.png +share/doc/html/gmt/doc/html/GMT_Docs/img181.png +share/doc/html/gmt/doc/html/GMT_Docs/img182.png +share/doc/html/gmt/doc/html/GMT_Docs/img183.png +share/doc/html/gmt/doc/html/GMT_Docs/img184.png +share/doc/html/gmt/doc/html/GMT_Docs/img185.png +share/doc/html/gmt/doc/html/GMT_Docs/img186.png +share/doc/html/gmt/doc/html/GMT_Docs/img187.png +share/doc/html/gmt/doc/html/GMT_Docs/img188.png +share/doc/html/gmt/doc/html/GMT_Docs/img189.png +share/doc/html/gmt/doc/html/GMT_Docs/img19.png +share/doc/html/gmt/doc/html/GMT_Docs/img190.png +share/doc/html/gmt/doc/html/GMT_Docs/img191.png +share/doc/html/gmt/doc/html/GMT_Docs/img192.png +share/doc/html/gmt/doc/html/GMT_Docs/img193.png +share/doc/html/gmt/doc/html/GMT_Docs/img194.png +share/doc/html/gmt/doc/html/GMT_Docs/img195.png +share/doc/html/gmt/doc/html/GMT_Docs/img196.png +share/doc/html/gmt/doc/html/GMT_Docs/img197.png +share/doc/html/gmt/doc/html/GMT_Docs/img198.png +share/doc/html/gmt/doc/html/GMT_Docs/img199.png +share/doc/html/gmt/doc/html/GMT_Docs/img2.png +share/doc/html/gmt/doc/html/GMT_Docs/img20.png +share/doc/html/gmt/doc/html/GMT_Docs/img200.png +share/doc/html/gmt/doc/html/GMT_Docs/img201.png +share/doc/html/gmt/doc/html/GMT_Docs/img202.png +share/doc/html/gmt/doc/html/GMT_Docs/img203.png +share/doc/html/gmt/doc/html/GMT_Docs/img204.png +share/doc/html/gmt/doc/html/GMT_Docs/img205.png +share/doc/html/gmt/doc/html/GMT_Docs/img206.png +share/doc/html/gmt/doc/html/GMT_Docs/img207.png +share/doc/html/gmt/doc/html/GMT_Docs/img208.png +share/doc/html/gmt/doc/html/GMT_Docs/img209.png +share/doc/html/gmt/doc/html/GMT_Docs/img21.png +share/doc/html/gmt/doc/html/GMT_Docs/img210.png +share/doc/html/gmt/doc/html/GMT_Docs/img211.png +share/doc/html/gmt/doc/html/GMT_Docs/img212.png +share/doc/html/gmt/doc/html/GMT_Docs/img213.png +share/doc/html/gmt/doc/html/GMT_Docs/img214.png +share/doc/html/gmt/doc/html/GMT_Docs/img215.png +share/doc/html/gmt/doc/html/GMT_Docs/img216.png +share/doc/html/gmt/doc/html/GMT_Docs/img217.png +share/doc/html/gmt/doc/html/GMT_Docs/img218.png +share/doc/html/gmt/doc/html/GMT_Docs/img219.png +share/doc/html/gmt/doc/html/GMT_Docs/img22.png +share/doc/html/gmt/doc/html/GMT_Docs/img220.png +share/doc/html/gmt/doc/html/GMT_Docs/img221.png +share/doc/html/gmt/doc/html/GMT_Docs/img222.png +share/doc/html/gmt/doc/html/GMT_Docs/img223.png +share/doc/html/gmt/doc/html/GMT_Docs/img224.png +share/doc/html/gmt/doc/html/GMT_Docs/img225.png +share/doc/html/gmt/doc/html/GMT_Docs/img226.png +share/doc/html/gmt/doc/html/GMT_Docs/img227.png +share/doc/html/gmt/doc/html/GMT_Docs/img228.png +share/doc/html/gmt/doc/html/GMT_Docs/img229.png +share/doc/html/gmt/doc/html/GMT_Docs/img23.png +share/doc/html/gmt/doc/html/GMT_Docs/img230.png +share/doc/html/gmt/doc/html/GMT_Docs/img231.png +share/doc/html/gmt/doc/html/GMT_Docs/img232.png +share/doc/html/gmt/doc/html/GMT_Docs/img233.png +share/doc/html/gmt/doc/html/GMT_Docs/img234.png +share/doc/html/gmt/doc/html/GMT_Docs/img235.png +share/doc/html/gmt/doc/html/GMT_Docs/img236.png +share/doc/html/gmt/doc/html/GMT_Docs/img237.png +share/doc/html/gmt/doc/html/GMT_Docs/img238.png +share/doc/html/gmt/doc/html/GMT_Docs/img239.png +share/doc/html/gmt/doc/html/GMT_Docs/img24.png +share/doc/html/gmt/doc/html/GMT_Docs/img240.png +share/doc/html/gmt/doc/html/GMT_Docs/img241.png +share/doc/html/gmt/doc/html/GMT_Docs/img242.png +share/doc/html/gmt/doc/html/GMT_Docs/img243.png +share/doc/html/gmt/doc/html/GMT_Docs/img244.png +share/doc/html/gmt/doc/html/GMT_Docs/img245.png +share/doc/html/gmt/doc/html/GMT_Docs/img246.png +share/doc/html/gmt/doc/html/GMT_Docs/img247.png +share/doc/html/gmt/doc/html/GMT_Docs/img248.png +share/doc/html/gmt/doc/html/GMT_Docs/img249.png +share/doc/html/gmt/doc/html/GMT_Docs/img25.png +share/doc/html/gmt/doc/html/GMT_Docs/img250.png +share/doc/html/gmt/doc/html/GMT_Docs/img251.png +share/doc/html/gmt/doc/html/GMT_Docs/img252.png +share/doc/html/gmt/doc/html/GMT_Docs/img253.png +share/doc/html/gmt/doc/html/GMT_Docs/img254.png +share/doc/html/gmt/doc/html/GMT_Docs/img255.png +share/doc/html/gmt/doc/html/GMT_Docs/img256.png +share/doc/html/gmt/doc/html/GMT_Docs/img257.png +share/doc/html/gmt/doc/html/GMT_Docs/img258.png +share/doc/html/gmt/doc/html/GMT_Docs/img259.png +share/doc/html/gmt/doc/html/GMT_Docs/img26.png +share/doc/html/gmt/doc/html/GMT_Docs/img260.png +share/doc/html/gmt/doc/html/GMT_Docs/img261.png +share/doc/html/gmt/doc/html/GMT_Docs/img262.png +share/doc/html/gmt/doc/html/GMT_Docs/img263.png +share/doc/html/gmt/doc/html/GMT_Docs/img264.png +share/doc/html/gmt/doc/html/GMT_Docs/img265.png +share/doc/html/gmt/doc/html/GMT_Docs/img266.png +share/doc/html/gmt/doc/html/GMT_Docs/img267.png +share/doc/html/gmt/doc/html/GMT_Docs/img268.png +share/doc/html/gmt/doc/html/GMT_Docs/img269.png +share/doc/html/gmt/doc/html/GMT_Docs/img27.png +share/doc/html/gmt/doc/html/GMT_Docs/img270.png +share/doc/html/gmt/doc/html/GMT_Docs/img271.png +share/doc/html/gmt/doc/html/GMT_Docs/img272.png +share/doc/html/gmt/doc/html/GMT_Docs/img273.png +share/doc/html/gmt/doc/html/GMT_Docs/img274.png +share/doc/html/gmt/doc/html/GMT_Docs/img275.png +share/doc/html/gmt/doc/html/GMT_Docs/img276.png +share/doc/html/gmt/doc/html/GMT_Docs/img277.png +share/doc/html/gmt/doc/html/GMT_Docs/img278.png +share/doc/html/gmt/doc/html/GMT_Docs/img279.png +share/doc/html/gmt/doc/html/GMT_Docs/img28.png +share/doc/html/gmt/doc/html/GMT_Docs/img280.png +share/doc/html/gmt/doc/html/GMT_Docs/img281.png +share/doc/html/gmt/doc/html/GMT_Docs/img282.png +share/doc/html/gmt/doc/html/GMT_Docs/img283.png +share/doc/html/gmt/doc/html/GMT_Docs/img284.png +share/doc/html/gmt/doc/html/GMT_Docs/img285.png +share/doc/html/gmt/doc/html/GMT_Docs/img286.png +share/doc/html/gmt/doc/html/GMT_Docs/img287.png +share/doc/html/gmt/doc/html/GMT_Docs/img288.png +share/doc/html/gmt/doc/html/GMT_Docs/img289.png +share/doc/html/gmt/doc/html/GMT_Docs/img29.png +share/doc/html/gmt/doc/html/GMT_Docs/img290.png +share/doc/html/gmt/doc/html/GMT_Docs/img291.png +share/doc/html/gmt/doc/html/GMT_Docs/img292.png +share/doc/html/gmt/doc/html/GMT_Docs/img293.png +share/doc/html/gmt/doc/html/GMT_Docs/img294.png +share/doc/html/gmt/doc/html/GMT_Docs/img295.png +share/doc/html/gmt/doc/html/GMT_Docs/img296.png +share/doc/html/gmt/doc/html/GMT_Docs/img297.png +share/doc/html/gmt/doc/html/GMT_Docs/img3.png +share/doc/html/gmt/doc/html/GMT_Docs/img30.png +share/doc/html/gmt/doc/html/GMT_Docs/img31.png +share/doc/html/gmt/doc/html/GMT_Docs/img32.png +share/doc/html/gmt/doc/html/GMT_Docs/img33.png +share/doc/html/gmt/doc/html/GMT_Docs/img34.png +share/doc/html/gmt/doc/html/GMT_Docs/img35.png +share/doc/html/gmt/doc/html/GMT_Docs/img36.png +share/doc/html/gmt/doc/html/GMT_Docs/img37.png +share/doc/html/gmt/doc/html/GMT_Docs/img38.png +share/doc/html/gmt/doc/html/GMT_Docs/img39.png +share/doc/html/gmt/doc/html/GMT_Docs/img4.png +share/doc/html/gmt/doc/html/GMT_Docs/img40.png +share/doc/html/gmt/doc/html/GMT_Docs/img41.png +share/doc/html/gmt/doc/html/GMT_Docs/img42.png +share/doc/html/gmt/doc/html/GMT_Docs/img43.png +share/doc/html/gmt/doc/html/GMT_Docs/img44.png +share/doc/html/gmt/doc/html/GMT_Docs/img45.png +share/doc/html/gmt/doc/html/GMT_Docs/img46.png +share/doc/html/gmt/doc/html/GMT_Docs/img47.png +share/doc/html/gmt/doc/html/GMT_Docs/img48.png +share/doc/html/gmt/doc/html/GMT_Docs/img49.png +share/doc/html/gmt/doc/html/GMT_Docs/img5.png +share/doc/html/gmt/doc/html/GMT_Docs/img50.png +share/doc/html/gmt/doc/html/GMT_Docs/img51.png +share/doc/html/gmt/doc/html/GMT_Docs/img52.png +share/doc/html/gmt/doc/html/GMT_Docs/img53.png +share/doc/html/gmt/doc/html/GMT_Docs/img54.png +share/doc/html/gmt/doc/html/GMT_Docs/img55.png +share/doc/html/gmt/doc/html/GMT_Docs/img56.png +share/doc/html/gmt/doc/html/GMT_Docs/img57.png +share/doc/html/gmt/doc/html/GMT_Docs/img58.png +share/doc/html/gmt/doc/html/GMT_Docs/img59.png +share/doc/html/gmt/doc/html/GMT_Docs/img6.png +share/doc/html/gmt/doc/html/GMT_Docs/img60.png +share/doc/html/gmt/doc/html/GMT_Docs/img61.png +share/doc/html/gmt/doc/html/GMT_Docs/img62.png +share/doc/html/gmt/doc/html/GMT_Docs/img63.png +share/doc/html/gmt/doc/html/GMT_Docs/img64.png +share/doc/html/gmt/doc/html/GMT_Docs/img65.png +share/doc/html/gmt/doc/html/GMT_Docs/img66.png +share/doc/html/gmt/doc/html/GMT_Docs/img67.png +share/doc/html/gmt/doc/html/GMT_Docs/img68.png +share/doc/html/gmt/doc/html/GMT_Docs/img69.png +share/doc/html/gmt/doc/html/GMT_Docs/img7.png +share/doc/html/gmt/doc/html/GMT_Docs/img70.png +share/doc/html/gmt/doc/html/GMT_Docs/img71.png +share/doc/html/gmt/doc/html/GMT_Docs/img72.png +share/doc/html/gmt/doc/html/GMT_Docs/img73.png +share/doc/html/gmt/doc/html/GMT_Docs/img74.png +share/doc/html/gmt/doc/html/GMT_Docs/img75.png +share/doc/html/gmt/doc/html/GMT_Docs/img76.png +share/doc/html/gmt/doc/html/GMT_Docs/img77.png +share/doc/html/gmt/doc/html/GMT_Docs/img78.png +share/doc/html/gmt/doc/html/GMT_Docs/img79.png +share/doc/html/gmt/doc/html/GMT_Docs/img8.png +share/doc/html/gmt/doc/html/GMT_Docs/img80.png +share/doc/html/gmt/doc/html/GMT_Docs/img81.png +share/doc/html/gmt/doc/html/GMT_Docs/img82.png +share/doc/html/gmt/doc/html/GMT_Docs/img83.png +share/doc/html/gmt/doc/html/GMT_Docs/img84.png +share/doc/html/gmt/doc/html/GMT_Docs/img85.png +share/doc/html/gmt/doc/html/GMT_Docs/img86.png +share/doc/html/gmt/doc/html/GMT_Docs/img87.png +share/doc/html/gmt/doc/html/GMT_Docs/img88.png +share/doc/html/gmt/doc/html/GMT_Docs/img89.png +share/doc/html/gmt/doc/html/GMT_Docs/img9.png +share/doc/html/gmt/doc/html/GMT_Docs/img90.png +share/doc/html/gmt/doc/html/GMT_Docs/img91.png +share/doc/html/gmt/doc/html/GMT_Docs/img92.png +share/doc/html/gmt/doc/html/GMT_Docs/img93.png +share/doc/html/gmt/doc/html/GMT_Docs/img94.png +share/doc/html/gmt/doc/html/GMT_Docs/img95.png +share/doc/html/gmt/doc/html/GMT_Docs/img96.png +share/doc/html/gmt/doc/html/GMT_Docs/img97.png +share/doc/html/gmt/doc/html/GMT_Docs/img98.png +share/doc/html/gmt/doc/html/GMT_Docs/img99.png +share/doc/html/gmt/doc/html/GMT_Docs/index.png +share/doc/html/gmt/doc/html/GMT_Docs/next.png +share/doc/html/gmt/doc/html/GMT_Docs/next_g.png share/doc/html/gmt/doc/html/GMT_Docs/node1.html share/doc/html/gmt/doc/html/GMT_Docs/node10.html share/doc/html/gmt/doc/html/GMT_Docs/node100.html @@ -493,10 +648,59 @@ share/doc/html/gmt/doc/html/GMT_Docs/node148.html share/doc/html/gmt/doc/html/GMT_Docs/node149.html share/doc/html/gmt/doc/html/GMT_Docs/node15.html share/doc/html/gmt/doc/html/GMT_Docs/node150.html +share/doc/html/gmt/doc/html/GMT_Docs/node151.html +share/doc/html/gmt/doc/html/GMT_Docs/node152.html +share/doc/html/gmt/doc/html/GMT_Docs/node153.html +share/doc/html/gmt/doc/html/GMT_Docs/node154.html +share/doc/html/gmt/doc/html/GMT_Docs/node155.html +share/doc/html/gmt/doc/html/GMT_Docs/node156.html +share/doc/html/gmt/doc/html/GMT_Docs/node157.html +share/doc/html/gmt/doc/html/GMT_Docs/node158.html +share/doc/html/gmt/doc/html/GMT_Docs/node159.html share/doc/html/gmt/doc/html/GMT_Docs/node16.html +share/doc/html/gmt/doc/html/GMT_Docs/node160.html +share/doc/html/gmt/doc/html/GMT_Docs/node161.html +share/doc/html/gmt/doc/html/GMT_Docs/node162.html +share/doc/html/gmt/doc/html/GMT_Docs/node163.html +share/doc/html/gmt/doc/html/GMT_Docs/node164.html +share/doc/html/gmt/doc/html/GMT_Docs/node165.html +share/doc/html/gmt/doc/html/GMT_Docs/node166.html +share/doc/html/gmt/doc/html/GMT_Docs/node167.html +share/doc/html/gmt/doc/html/GMT_Docs/node168.html +share/doc/html/gmt/doc/html/GMT_Docs/node169.html share/doc/html/gmt/doc/html/GMT_Docs/node17.html +share/doc/html/gmt/doc/html/GMT_Docs/node170.html +share/doc/html/gmt/doc/html/GMT_Docs/node171.html +share/doc/html/gmt/doc/html/GMT_Docs/node172.html +share/doc/html/gmt/doc/html/GMT_Docs/node173.html +share/doc/html/gmt/doc/html/GMT_Docs/node174.html +share/doc/html/gmt/doc/html/GMT_Docs/node175.html +share/doc/html/gmt/doc/html/GMT_Docs/node176.html +share/doc/html/gmt/doc/html/GMT_Docs/node177.html +share/doc/html/gmt/doc/html/GMT_Docs/node178.html +share/doc/html/gmt/doc/html/GMT_Docs/node179.html share/doc/html/gmt/doc/html/GMT_Docs/node18.html +share/doc/html/gmt/doc/html/GMT_Docs/node180.html +share/doc/html/gmt/doc/html/GMT_Docs/node181.html +share/doc/html/gmt/doc/html/GMT_Docs/node182.html +share/doc/html/gmt/doc/html/GMT_Docs/node183.html +share/doc/html/gmt/doc/html/GMT_Docs/node184.html +share/doc/html/gmt/doc/html/GMT_Docs/node185.html +share/doc/html/gmt/doc/html/GMT_Docs/node186.html +share/doc/html/gmt/doc/html/GMT_Docs/node187.html +share/doc/html/gmt/doc/html/GMT_Docs/node188.html +share/doc/html/gmt/doc/html/GMT_Docs/node189.html share/doc/html/gmt/doc/html/GMT_Docs/node19.html +share/doc/html/gmt/doc/html/GMT_Docs/node190.html +share/doc/html/gmt/doc/html/GMT_Docs/node191.html +share/doc/html/gmt/doc/html/GMT_Docs/node192.html +share/doc/html/gmt/doc/html/GMT_Docs/node193.html +share/doc/html/gmt/doc/html/GMT_Docs/node194.html +share/doc/html/gmt/doc/html/GMT_Docs/node195.html +share/doc/html/gmt/doc/html/GMT_Docs/node196.html +share/doc/html/gmt/doc/html/GMT_Docs/node197.html +share/doc/html/gmt/doc/html/GMT_Docs/node198.html +share/doc/html/gmt/doc/html/GMT_Docs/node199.html share/doc/html/gmt/doc/html/GMT_Docs/node2.html share/doc/html/gmt/doc/html/GMT_Docs/node20.html share/doc/html/gmt/doc/html/GMT_Docs/node21.html @@ -508,6 +712,13 @@ share/doc/html/gmt/doc/html/GMT_Docs/node26.html share/doc/html/gmt/doc/html/GMT_Docs/node27.html share/doc/html/gmt/doc/html/GMT_Docs/node28.html share/doc/html/gmt/doc/html/GMT_Docs/node29.html +share/doc/html/gmt/doc/html/GMT_Docs/node200.html +share/doc/html/gmt/doc/html/GMT_Docs/node201.html +share/doc/html/gmt/doc/html/GMT_Docs/node202.html +share/doc/html/gmt/doc/html/GMT_Docs/node203.html +share/doc/html/gmt/doc/html/GMT_Docs/node204.html +share/doc/html/gmt/doc/html/GMT_Docs/node205.html +share/doc/html/gmt/doc/html/GMT_Docs/node206.html share/doc/html/gmt/doc/html/GMT_Docs/node3.html share/doc/html/gmt/doc/html/GMT_Docs/node30.html share/doc/html/gmt/doc/html/GMT_Docs/node31.html @@ -585,25 +796,142 @@ share/doc/html/gmt/doc/html/GMT_Docs/node96.html share/doc/html/gmt/doc/html/GMT_Docs/node97.html share/doc/html/gmt/doc/html/GMT_Docs/node98.html share/doc/html/gmt/doc/html/GMT_Docs/node99.html -share/doc/html/gmt/doc/html/GMT_Docs/prev.gif -share/doc/html/gmt/doc/html/GMT_Docs/prev_g.gif -share/doc/html/gmt/doc/html/GMT_Docs/up.gif -share/doc/html/gmt/doc/html/GMT_Docs/up_g.gif +share/doc/html/gmt/doc/html/GMT_Docs/prev.png +share/doc/html/gmt/doc/html/GMT_Docs/prev_g.png +share/doc/html/gmt/doc/html/GMT_Docs/up.png +share/doc/html/gmt/doc/html/GMT_Docs/up_g.png +share/doc/html/gmt/doc/html/GMT_Tutorial/contents.png +share/doc/html/gmt/doc/html/GMT_Tutorial/footnode.html +share/doc/html/gmt/doc/html/GMT_Tutorial/img1.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img10.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img11.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img12.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img13.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img14.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img15.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img16.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img17.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img18.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img19.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img2.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img20.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img21.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img22.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img23.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img24.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img25.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img26.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img27.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img28.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img29.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img3.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img30.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img31.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img32.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img33.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img34.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img35.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img36.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img37.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img38.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img39.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img4.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img40.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img41.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img42.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img43.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img5.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img6.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img7.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img8.png +share/doc/html/gmt/doc/html/GMT_Tutorial/img9.png +share/doc/html/gmt/doc/html/GMT_Tutorial/index.png +share/doc/html/gmt/doc/html/GMT_Tutorial/next.png +share/doc/html/gmt/doc/html/GMT_Tutorial/next_g.png +share/doc/html/gmt/doc/html/GMT_Tutorial/node1.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node10.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node11.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node12.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node13.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node14.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node15.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node16.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node17.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node18.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node19.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node2.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node20.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node21.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node22.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node23.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node24.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node25.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node26.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node27.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node28.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node29.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node3.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node30.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node31.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node32.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node33.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node34.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node35.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node36.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node37.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node38.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node39.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node4.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node40.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node41.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node42.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node43.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node44.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node45.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node46.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node47.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node48.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node49.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node5.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node50.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node51.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node52.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node53.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node54.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node55.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node56.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node57.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node58.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node59.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node6.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node60.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node61.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node62.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node63.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node64.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node7.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node8.html +share/doc/html/gmt/doc/html/GMT_Tutorial/node9.html +share/doc/html/gmt/doc/html/GMT_Tutorial/prev.png +share/doc/html/gmt/doc/html/GMT_Tutorial/prev_g.png +share/doc/html/gmt/doc/html/GMT_Tutorial/GMT_Tutorial.css +share/doc/html/gmt/doc/html/GMT_Tutorial/GMT_Tutorial.html +share/doc/html/gmt/doc/html/GMT_Tutorial/up.png +share/doc/html/gmt/doc/html/GMT_Tutorial/up_g.png share/doc/html/gmt/doc/html/backtracker.html share/doc/html/gmt/doc/html/binlegs.html share/doc/html/gmt/doc/html/blockmean.html share/doc/html/gmt/doc/html/blockmedian.html share/doc/html/gmt/doc/html/blockmode.html -share/doc/html/gmt/doc/html/cpsdecode.html -share/doc/html/gmt/doc/html/cpsencode.html share/doc/html/gmt/doc/html/dat2gmt.html share/doc/html/gmt/doc/html/filter1d.html share/doc/html/gmt/doc/html/fitcircle.html -share/doc/html/gmt/doc/html/gmt.html share/doc/html/gmt/doc/html/gmt2bin.html share/doc/html/gmt/doc/html/gmt2dat.html +share/doc/html/gmt/doc/html/gmt2rgb.html share/doc/html/gmt/doc/html/gmtconvert.html share/doc/html/gmt/doc/html/gmtdefaults.html +share/doc/html/gmt/doc/html/gmtdigitize.html share/doc/html/gmt/doc/html/gmtinfo.html share/doc/html/gmt/doc/html/gmtlegs.html share/doc/html/gmt/doc/html/gmtlist.html @@ -611,9 +939,11 @@ share/doc/html/gmt/doc/html/gmtmath.html share/doc/html/gmt/doc/html/gmtpath.html share/doc/html/gmt/doc/html/gmtselect.html share/doc/html/gmt/doc/html/gmtset.html +share/doc/html/gmt/doc/html/gmtstitch.html share/doc/html/gmt/doc/html/gmttrack.html share/doc/html/gmt/doc/html/grd2cpt.html share/doc/html/gmt/doc/html/grd2xyz.html +share/doc/html/gmt/doc/html/grdblend.html share/doc/html/gmt/doc/html/grdclip.html share/doc/html/gmt/doc/html/grdcontour.html share/doc/html/gmt/doc/html/grdcut.html @@ -631,6 +961,7 @@ share/doc/html/gmt/doc/html/grdpaste.html share/doc/html/gmt/doc/html/grdproject.html share/doc/html/gmt/doc/html/grdraster.html share/doc/html/gmt/doc/html/grdreformat.html +share/doc/html/gmt/doc/html/grdrotater.html share/doc/html/gmt/doc/html/grdsample.html share/doc/html/gmt/doc/html/grdtrack.html share/doc/html/gmt/doc/html/grdtrend.html @@ -643,11 +974,20 @@ share/doc/html/gmt/doc/html/img2mercgrd.html share/doc/html/gmt/doc/html/makecpt.html share/doc/html/gmt/doc/html/makepattern.html share/doc/html/gmt/doc/html/mapproject.html +share/doc/html/gmt/doc/html/mgd77convert.html +share/doc/html/gmt/doc/html/mgd77info.html +share/doc/html/gmt/doc/html/mgd77list.html +share/doc/html/gmt/doc/html/mgd77manage.html +share/doc/html/gmt/doc/html/mgd77path.html +share/doc/html/gmt/doc/html/mgd77sniffer.html share/doc/html/gmt/doc/html/mgd77togmt.html +share/doc/html/gmt/doc/html/mgd77track.html share/doc/html/gmt/doc/html/minmax.html share/doc/html/gmt/doc/html/nearneighbor.html +share/doc/html/gmt/doc/html/nc2xy.html share/doc/html/gmt/doc/html/originator.html share/doc/html/gmt/doc/html/project.html +share/doc/html/gmt/doc/html/ps2raster.html share/doc/html/gmt/doc/html/psbasemap.html share/doc/html/gmt/doc/html/psclip.html share/doc/html/gmt/doc/html/pscoast.html @@ -655,6 +995,7 @@ share/doc/html/gmt/doc/html/pscontour.html share/doc/html/gmt/doc/html/pscoupe.html share/doc/html/gmt/doc/html/pshistogram.html share/doc/html/gmt/doc/html/psimage.html +share/doc/html/gmt/doc/html/pslegend.html share/doc/html/gmt/doc/html/pslib.html share/doc/html/gmt/doc/html/psmask.html share/doc/html/gmt/doc/html/psmeca.html @@ -669,176 +1010,21 @@ share/doc/html/gmt/doc/html/psvelo.html share/doc/html/gmt/doc/html/pswiggle.html share/doc/html/gmt/doc/html/psxy.html share/doc/html/gmt/doc/html/psxyz.html +share/doc/html/gmt/doc/html/rotconverter.html share/doc/html/gmt/doc/html/sample1d.html +share/doc/html/gmt/doc/html/segy2grd.html share/doc/html/gmt/doc/html/spectrum1d.html share/doc/html/gmt/doc/html/splitxyz.html share/doc/html/gmt/doc/html/surface.html share/doc/html/gmt/doc/html/trend1d.html share/doc/html/gmt/doc/html/trend2d.html share/doc/html/gmt/doc/html/triangulate.html -share/doc/html/gmt/doc/html/tutorial/contents.gif -share/doc/html/gmt/doc/html/tutorial/footnode.html -share/doc/html/gmt/doc/html/tutorial/img1.gif -share/doc/html/gmt/doc/html/tutorial/img10.gif -share/doc/html/gmt/doc/html/tutorial/img11.gif -share/doc/html/gmt/doc/html/tutorial/img12.gif -share/doc/html/gmt/doc/html/tutorial/img13.gif -share/doc/html/gmt/doc/html/tutorial/img14.gif -share/doc/html/gmt/doc/html/tutorial/img15.gif -share/doc/html/gmt/doc/html/tutorial/img16.gif -share/doc/html/gmt/doc/html/tutorial/img17.gif -share/doc/html/gmt/doc/html/tutorial/img18.gif -share/doc/html/gmt/doc/html/tutorial/img19.gif -share/doc/html/gmt/doc/html/tutorial/img2.gif -share/doc/html/gmt/doc/html/tutorial/img20.gif -share/doc/html/gmt/doc/html/tutorial/img21.gif -share/doc/html/gmt/doc/html/tutorial/img22.gif -share/doc/html/gmt/doc/html/tutorial/img23.gif -share/doc/html/gmt/doc/html/tutorial/img24.gif -share/doc/html/gmt/doc/html/tutorial/img25.gif -share/doc/html/gmt/doc/html/tutorial/img26.gif -share/doc/html/gmt/doc/html/tutorial/img27.gif -share/doc/html/gmt/doc/html/tutorial/img28.gif -share/doc/html/gmt/doc/html/tutorial/img29.gif -share/doc/html/gmt/doc/html/tutorial/img3.gif -share/doc/html/gmt/doc/html/tutorial/img30.gif -share/doc/html/gmt/doc/html/tutorial/img31.gif -share/doc/html/gmt/doc/html/tutorial/img32.gif -share/doc/html/gmt/doc/html/tutorial/img33.gif -share/doc/html/gmt/doc/html/tutorial/img34.gif -share/doc/html/gmt/doc/html/tutorial/img35.gif -share/doc/html/gmt/doc/html/tutorial/img36.gif -share/doc/html/gmt/doc/html/tutorial/img37.gif -share/doc/html/gmt/doc/html/tutorial/img38.gif -share/doc/html/gmt/doc/html/tutorial/img39.gif -share/doc/html/gmt/doc/html/tutorial/img4.gif -share/doc/html/gmt/doc/html/tutorial/img40.gif -share/doc/html/gmt/doc/html/tutorial/img41.gif -share/doc/html/gmt/doc/html/tutorial/img42.gif -share/doc/html/gmt/doc/html/tutorial/img43.gif -share/doc/html/gmt/doc/html/tutorial/img44.gif -share/doc/html/gmt/doc/html/tutorial/img45.gif -share/doc/html/gmt/doc/html/tutorial/img46.gif -share/doc/html/gmt/doc/html/tutorial/img47.gif -share/doc/html/gmt/doc/html/tutorial/img48.gif -share/doc/html/gmt/doc/html/tutorial/img49.gif -share/doc/html/gmt/doc/html/tutorial/img5.gif -share/doc/html/gmt/doc/html/tutorial/img50.gif -share/doc/html/gmt/doc/html/tutorial/img51.gif -share/doc/html/gmt/doc/html/tutorial/img52.gif -share/doc/html/gmt/doc/html/tutorial/img53.gif -share/doc/html/gmt/doc/html/tutorial/img54.gif -share/doc/html/gmt/doc/html/tutorial/img55.gif -share/doc/html/gmt/doc/html/tutorial/img56.gif -share/doc/html/gmt/doc/html/tutorial/img57.gif -share/doc/html/gmt/doc/html/tutorial/img58.gif -share/doc/html/gmt/doc/html/tutorial/img59.gif -share/doc/html/gmt/doc/html/tutorial/img6.gif -share/doc/html/gmt/doc/html/tutorial/img60.gif -share/doc/html/gmt/doc/html/tutorial/img61.gif -share/doc/html/gmt/doc/html/tutorial/img62.gif -share/doc/html/gmt/doc/html/tutorial/img63.gif -share/doc/html/gmt/doc/html/tutorial/img64.gif -share/doc/html/gmt/doc/html/tutorial/img65.gif -share/doc/html/gmt/doc/html/tutorial/img66.gif -share/doc/html/gmt/doc/html/tutorial/img67.gif -share/doc/html/gmt/doc/html/tutorial/img68.gif -share/doc/html/gmt/doc/html/tutorial/img69.gif -share/doc/html/gmt/doc/html/tutorial/img7.gif -share/doc/html/gmt/doc/html/tutorial/img70.gif -share/doc/html/gmt/doc/html/tutorial/img8.gif -share/doc/html/gmt/doc/html/tutorial/img9.gif -share/doc/html/gmt/doc/html/tutorial/index.gif -share/doc/html/gmt/doc/html/tutorial/next.gif -share/doc/html/gmt/doc/html/tutorial/next_g.gif -share/doc/html/gmt/doc/html/tutorial/node1.html -share/doc/html/gmt/doc/html/tutorial/node10.html -share/doc/html/gmt/doc/html/tutorial/node11.html -share/doc/html/gmt/doc/html/tutorial/node12.html -share/doc/html/gmt/doc/html/tutorial/node13.html -share/doc/html/gmt/doc/html/tutorial/node14.html -share/doc/html/gmt/doc/html/tutorial/node15.html -share/doc/html/gmt/doc/html/tutorial/node16.html -share/doc/html/gmt/doc/html/tutorial/node17.html -share/doc/html/gmt/doc/html/tutorial/node18.html -share/doc/html/gmt/doc/html/tutorial/node19.html -share/doc/html/gmt/doc/html/tutorial/node2.html -share/doc/html/gmt/doc/html/tutorial/node20.html -share/doc/html/gmt/doc/html/tutorial/node21.html -share/doc/html/gmt/doc/html/tutorial/node22.html -share/doc/html/gmt/doc/html/tutorial/node23.html -share/doc/html/gmt/doc/html/tutorial/node24.html -share/doc/html/gmt/doc/html/tutorial/node25.html -share/doc/html/gmt/doc/html/tutorial/node26.html -share/doc/html/gmt/doc/html/tutorial/node27.html -share/doc/html/gmt/doc/html/tutorial/node28.html -share/doc/html/gmt/doc/html/tutorial/node29.html -share/doc/html/gmt/doc/html/tutorial/node3.html -share/doc/html/gmt/doc/html/tutorial/node30.html -share/doc/html/gmt/doc/html/tutorial/node31.html -share/doc/html/gmt/doc/html/tutorial/node32.html -share/doc/html/gmt/doc/html/tutorial/node33.html -share/doc/html/gmt/doc/html/tutorial/node34.html -share/doc/html/gmt/doc/html/tutorial/node35.html -share/doc/html/gmt/doc/html/tutorial/node36.html -share/doc/html/gmt/doc/html/tutorial/node37.html -share/doc/html/gmt/doc/html/tutorial/node38.html -share/doc/html/gmt/doc/html/tutorial/node39.html -share/doc/html/gmt/doc/html/tutorial/node4.html -share/doc/html/gmt/doc/html/tutorial/node40.html -share/doc/html/gmt/doc/html/tutorial/node41.html -share/doc/html/gmt/doc/html/tutorial/node42.html -share/doc/html/gmt/doc/html/tutorial/node43.html -share/doc/html/gmt/doc/html/tutorial/node44.html -share/doc/html/gmt/doc/html/tutorial/node45.html -share/doc/html/gmt/doc/html/tutorial/node46.html -share/doc/html/gmt/doc/html/tutorial/node47.html -share/doc/html/gmt/doc/html/tutorial/node48.html -share/doc/html/gmt/doc/html/tutorial/node49.html -share/doc/html/gmt/doc/html/tutorial/node5.html -share/doc/html/gmt/doc/html/tutorial/node50.html -share/doc/html/gmt/doc/html/tutorial/node51.html -share/doc/html/gmt/doc/html/tutorial/node52.html -share/doc/html/gmt/doc/html/tutorial/node53.html -share/doc/html/gmt/doc/html/tutorial/node54.html -share/doc/html/gmt/doc/html/tutorial/node55.html -share/doc/html/gmt/doc/html/tutorial/node56.html -share/doc/html/gmt/doc/html/tutorial/node57.html -share/doc/html/gmt/doc/html/tutorial/node58.html -share/doc/html/gmt/doc/html/tutorial/node59.html -share/doc/html/gmt/doc/html/tutorial/node6.html -share/doc/html/gmt/doc/html/tutorial/node60.html -share/doc/html/gmt/doc/html/tutorial/node61.html -share/doc/html/gmt/doc/html/tutorial/node62.html -share/doc/html/gmt/doc/html/tutorial/node63.html -share/doc/html/gmt/doc/html/tutorial/node64.html -share/doc/html/gmt/doc/html/tutorial/node65.html -share/doc/html/gmt/doc/html/tutorial/node66.html -share/doc/html/gmt/doc/html/tutorial/node67.html -share/doc/html/gmt/doc/html/tutorial/node68.html -share/doc/html/gmt/doc/html/tutorial/node69.html -share/doc/html/gmt/doc/html/tutorial/node7.html -share/doc/html/gmt/doc/html/tutorial/node70.html -share/doc/html/gmt/doc/html/tutorial/node71.html -share/doc/html/gmt/doc/html/tutorial/node72.html -share/doc/html/gmt/doc/html/tutorial/node73.html -share/doc/html/gmt/doc/html/tutorial/node74.html -share/doc/html/gmt/doc/html/tutorial/node75.html -share/doc/html/gmt/doc/html/tutorial/node76.html -share/doc/html/gmt/doc/html/tutorial/node77.html -share/doc/html/gmt/doc/html/tutorial/node78.html -share/doc/html/gmt/doc/html/tutorial/node79.html -share/doc/html/gmt/doc/html/tutorial/node8.html -share/doc/html/gmt/doc/html/tutorial/node80.html -share/doc/html/gmt/doc/html/tutorial/node9.html -share/doc/html/gmt/doc/html/tutorial/prev.gif -share/doc/html/gmt/doc/html/tutorial/prev_g.gif -share/doc/html/gmt/doc/html/tutorial/tutorial.css -share/doc/html/gmt/doc/html/tutorial/tutorial.html -share/doc/html/gmt/doc/html/tutorial/up.gif -share/doc/html/gmt/doc/html/tutorial/up_g.gif +share/doc/html/gmt/doc/html/x2sys_binlist.html share/doc/html/gmt/doc/html/x2sys_cross.html share/doc/html/gmt/doc/html/x2sys_datalist.html +share/doc/html/gmt/doc/html/x2sys_get.html +share/doc/html/gmt/doc/html/x2sys_init.html +share/doc/html/gmt/doc/html/x2sys_put.html share/doc/html/gmt/doc/html/x_edit.html share/doc/html/gmt/doc/html/x_init.html share/doc/html/gmt/doc/html/x_list.html @@ -850,57 +1036,56 @@ share/doc/html/gmt/doc/html/x_solve_dc_drift.html share/doc/html/gmt/doc/html/x_system.html share/doc/html/gmt/doc/html/x_update.html share/doc/html/gmt/doc/html/xyz2grd.html -share/doc/html/gmt/doc/ps +share/doc/html/gmt/doc/pdf +share/doc/html/gmt/gmt_back.gif share/doc/html/gmt/gmt_man.html share/doc/html/gmt/gmt_services.html share/doc/html/gmt/gmt_suppl.html -share/doc/html/gmt/images/gmt_back.gif -share/doc/html/gmt/images/gmt_bar.gif -share/doc/html/gmt/images/gmt_small_logo.gif +share/examples/gmt/.gmtdefaults4.doc share/examples/gmt/README.SCRIPTS -share/examples/gmt/do_examples.bash share/examples/gmt/do_examples.csh -share/examples/gmt/do_view.bash +share/examples/gmt/do_examples.sh share/examples/gmt/do_view.csh -share/examples/gmt/ex01/job01.bash +share/examples/gmt/do_view.sh share/examples/gmt/ex01/job01.csh -share/examples/gmt/ex01/osu91a1f_16.grd -share/examples/gmt/ex02/HI_geoid2.grd -share/examples/gmt/ex02/HI_topo2.grd -share/examples/gmt/ex02/job02.bash +share/examples/gmt/ex01/job01.sh +share/examples/gmt/ex01/osu91a1f_16.nc +share/examples/gmt/ex02/HI_geoid2.nc +share/examples/gmt/ex02/HI_topo2.nc share/examples/gmt/ex02/job02.csh -share/examples/gmt/ex03/job03.bash +share/examples/gmt/ex02/job02.sh share/examples/gmt/ex03/job03.csh +share/examples/gmt/ex03/job03.sh share/examples/gmt/ex03/sat.xyg share/examples/gmt/ex03/ship.xyg share/examples/gmt/ex03/shipsat.dos -share/examples/gmt/ex04/HI_geoid4.grd -share/examples/gmt/ex04/HI_topo4.grd +share/examples/gmt/ex04/HI_geoid4.nc +share/examples/gmt/ex04/HI_topo4.nc share/examples/gmt/ex04/geoid.cpt -share/examples/gmt/ex04/job04.bash share/examples/gmt/ex04/job04.csh -share/examples/gmt/ex04/job4c.bash +share/examples/gmt/ex04/job04.sh share/examples/gmt/ex04/job4c.csh +share/examples/gmt/ex04/job4c.sh share/examples/gmt/ex04/topo.cpt -share/examples/gmt/ex05/job05.bash share/examples/gmt/ex05/job05.csh +share/examples/gmt/ex05/job05.sh share/examples/gmt/ex06/fractures.d -share/examples/gmt/ex06/job06.bash share/examples/gmt/ex06/job06.csh +share/examples/gmt/ex06/job06.sh share/examples/gmt/ex06/v3206.t share/examples/gmt/ex07/fz.xy share/examples/gmt/ex07/isochron.xy -share/examples/gmt/ex07/job07.bash share/examples/gmt/ex07/job07.csh +share/examples/gmt/ex07/job07.sh share/examples/gmt/ex07/quakes.xym share/examples/gmt/ex07/ridge.xy -share/examples/gmt/ex08/guinea_bay.grd -share/examples/gmt/ex08/job08.bash +share/examples/gmt/ex08/guinea_bay.nc share/examples/gmt/ex08/job08.csh +share/examples/gmt/ex08/job08.sh share/examples/gmt/ex09/all.xys share/examples/gmt/ex09/fz.xy -share/examples/gmt/ex09/job09.bash share/examples/gmt/ex09/job09.csh +share/examples/gmt/ex09/job09.sh share/examples/gmt/ex09/ridge.xy share/examples/gmt/ex09/track_d.107.xys share/examples/gmt/ex09/track_d.109.xys @@ -945,180 +1130,296 @@ share/examples/gmt/ex09/track_d.53.xys share/examples/gmt/ex09/track_d.79.xys share/examples/gmt/ex09/track_d.81.xys share/examples/gmt/ex10/agu.d -share/examples/gmt/ex10/job10.bash share/examples/gmt/ex10/job10.csh +share/examples/gmt/ex10/job10.sh share/examples/gmt/ex11/contoured_cube.ps.bz2 -share/examples/gmt/ex11/job11.bash share/examples/gmt/ex11/job11.csh +share/examples/gmt/ex11/job11.sh share/examples/gmt/ex11/rgb_cube.awk -share/examples/gmt/ex12/job12.bash share/examples/gmt/ex12/job12.csh +share/examples/gmt/ex12/job12.sh share/examples/gmt/ex12/table_5.11 -share/examples/gmt/ex13/job13.bash share/examples/gmt/ex13/job13.csh -share/examples/gmt/ex14/job14.bash +share/examples/gmt/ex13/job13.sh share/examples/gmt/ex14/job14.csh +share/examples/gmt/ex14/job14.sh share/examples/gmt/ex14/table_5.11 -share/examples/gmt/ex15/job15.bash share/examples/gmt/ex15/job15.csh +share/examples/gmt/ex15/job15.sh share/examples/gmt/ex15/ship.xyz share/examples/gmt/ex16/ex16.cpt -share/examples/gmt/ex16/job16.bash share/examples/gmt/ex16/job16.csh +share/examples/gmt/ex16/job16.sh share/examples/gmt/ex16/table_5.11 -share/examples/gmt/ex17/india_geoid.grd -share/examples/gmt/ex17/india_topo.grd -share/examples/gmt/ex17/job17.bash +share/examples/gmt/ex17/india_geoid.nc +share/examples/gmt/ex17/india_topo.nc share/examples/gmt/ex17/job17.csh -share/examples/gmt/ex18/AK_gulf_grav.grd -share/examples/gmt/ex18/job18.bash +share/examples/gmt/ex17/job17.sh +share/examples/gmt/ex18/AK_gulf_grav.nc share/examples/gmt/ex18/job18.csh -share/examples/gmt/ex19/job19.bash +share/examples/gmt/ex18/job18.sh share/examples/gmt/ex19/job19.csh +share/examples/gmt/ex19/job19.sh share/examples/gmt/ex20/bullseye.def -share/examples/gmt/ex20/job20.bash share/examples/gmt/ex20/job20.csh -share/examples/gmt/ex20/make_symbol -share/examples/gmt/ex20/volcano.def -share/examples/gmt/tutorial/bermuda.grd +share/examples/gmt/ex20/job20.sh +share/examples/gmt/ex21/RHAT_price.csv +share/examples/gmt/ex21/job21.csh +share/examples/gmt/ex21/job21.sh +share/examples/gmt/ex22/USGS.ras +share/examples/gmt/ex22/job22.csh +share/examples/gmt/ex22/job22.sh +share/examples/gmt/ex22/neic_quakes.d +share/examples/gmt/ex23/job23.csh +share/examples/gmt/ex23/job23.sh +share/examples/gmt/ex24/job24.csh +share/examples/gmt/ex24/job24.sh +share/examples/gmt/ex24/oz_quakes.d +share/examples/gmt/ex25/job25.csh +share/examples/gmt/ex25/job25.sh +share/examples/gmt/tutorial/bermuda.nc share/examples/gmt/tutorial/data share/examples/gmt/tutorial/quakes.cpt share/examples/gmt/tutorial/quakes.ngdc share/examples/gmt/tutorial/ship.xyz -share/examples/gmt/tutorial/us.grd +share/examples/gmt/tutorial/topo.cpt +share/examples/gmt/tutorial/us.nc share/gmt/.gmtdefaults_SI -share/gmt/.gmtdefaults_SI.orig share/gmt/.gmtdefaults_US -share/gmt/.gmtdefaults_US.orig share/gmt/GMT_CPT.lis -share/gmt/GMT_cool.cpt -share/gmt/GMT_copper.cpt -share/gmt/GMT_gebco.cpt -share/gmt/GMT_globe.cpt -share/gmt/GMT_gray.cpt -share/gmt/GMT_haxby.cpt -share/gmt/GMT_hot.cpt -share/gmt/GMT_jet.cpt -share/gmt/GMT_no_green.cpt -share/gmt/GMT_ocean.cpt -share/gmt/GMT_polar.cpt -share/gmt/GMT_rainbow.cpt -share/gmt/GMT_red2green.cpt -share/gmt/GMT_relief.cpt -share/gmt/GMT_sealand.cpt -share/gmt/GMT_seis.cpt -share/gmt/GMT_split.cpt -share/gmt/GMT_topo.cpt -share/gmt/GMT_wysiwyg.cpt -share/gmt/PSL_text.ps -share/gmt/binned_GSHHS_c.cdf -share/gmt/binned_GSHHS_i.cdf -share/gmt/binned_GSHHS_l.cdf -share/gmt/binned_border_c.cdf -share/gmt/binned_border_i.cdf -share/gmt/binned_border_l.cdf -share/gmt/binned_river_c.cdf -share/gmt/binned_river_i.cdf -share/gmt/binned_river_l.cdf +share/gmt/GMT_CustomSymbols.lis +share/gmt/coast/binned_GSHHS_c.cdf +share/gmt/coast/binned_GSHHS_i.cdf +share/gmt/coast/binned_GSHHS_l.cdf +share/gmt/coast/binned_border_c.cdf +share/gmt/coast/binned_border_i.cdf +share/gmt/coast/binned_border_l.cdf +share/gmt/coast/binned_river_c.cdf +share/gmt/coast/binned_river_i.cdf +share/gmt/coast/binned_river_l.cdf +share/gmt/coast/binned_GSHHS_h.cdf +share/gmt/coast/binned_border_h.cdf +share/gmt/coast/binned_river_h.cdf +share/gmt/coast/binned_GSHHS_f.cdf +share/gmt/coast/binned_border_f.cdf +share/gmt/coast/binned_river_f.cdf +share/gmt/cpt/GMT_cool.cpt +share/gmt/cpt/GMT_copper.cpt +share/gmt/cpt/GMT_drywet.cpt +share/gmt/cpt/GMT_gebco.cpt +share/gmt/cpt/GMT_globe.cpt +share/gmt/cpt/GMT_gray.cpt +share/gmt/cpt/GMT_haxby.cpt +share/gmt/cpt/GMT_hot.cpt +share/gmt/cpt/GMT_jet.cpt +share/gmt/cpt/GMT_no_green.cpt +share/gmt/cpt/GMT_ocean.cpt +share/gmt/cpt/GMT_polar.cpt +share/gmt/cpt/GMT_rainbow.cpt +share/gmt/cpt/GMT_red2green.cpt +share/gmt/cpt/GMT_relief.cpt +share/gmt/cpt/GMT_sealand.cpt +share/gmt/cpt/GMT_seis.cpt +share/gmt/cpt/GMT_split.cpt +share/gmt/cpt/GMT_topo.cpt +share/gmt/cpt/GMT_wysiwyg.cpt +share/gmt/custom/astroid.def +share/gmt/custom/circle.def +share/gmt/custom/cross.def +share/gmt/custom/crosshair.def +share/gmt/custom/deltoid.def +share/gmt/custom/diamond.def +share/gmt/custom/flash.def +share/gmt/custom/hexagon.def +share/gmt/custom/hlens.def +share/gmt/custom/hlozenge.def +share/gmt/custom/hneedle.def +share/gmt/custom/invtriangle.def +share/gmt/custom/lcrescent.def +share/gmt/custom/lflag.def +share/gmt/custom/ltriangle.def +share/gmt/custom/meca.def +share/gmt/custom/octagon.def +share/gmt/custom/pacman.def +share/gmt/custom/pentagon.def +share/gmt/custom/rcrescent.def +share/gmt/custom/rflag.def +share/gmt/custom/rtriangle.def +share/gmt/custom/sectoid.def +share/gmt/custom/square.def +share/gmt/custom/squaroid.def +share/gmt/custom/star.def +share/gmt/custom/star3.def +share/gmt/custom/star4.def +share/gmt/custom/starp.def +share/gmt/custom/sun.def +share/gmt/custom/triangle.def +share/gmt/custom/vlens.def +share/gmt/custom/vlozenge.def +share/gmt/custom/vneedle.def +share/gmt/custom/volcano.def share/gmt/dbase/grdraster.info share/gmt/gmt.conf -share/gmt/gmt.conf.orig share/gmt/gmtformats.d share/gmt/gmtmedia.d +share/gmt/mgd77/mgd77_paths.txt share/gmt/mgg/carter.d share/gmt/mgg/gmtfile_paths -share/gmt/ps_pattern_01.ras -share/gmt/ps_pattern_02.ras -share/gmt/ps_pattern_03.ras -share/gmt/ps_pattern_04.ras -share/gmt/ps_pattern_05.ras -share/gmt/ps_pattern_06.ras -share/gmt/ps_pattern_07.ras -share/gmt/ps_pattern_08.ras -share/gmt/ps_pattern_09.ras -share/gmt/ps_pattern_10.ras -share/gmt/ps_pattern_11.ras -share/gmt/ps_pattern_12.ras -share/gmt/ps_pattern_13.ras -share/gmt/ps_pattern_14.ras -share/gmt/ps_pattern_15.ras -share/gmt/ps_pattern_16.ras -share/gmt/ps_pattern_17.ras -share/gmt/ps_pattern_18.ras -share/gmt/ps_pattern_19.ras -share/gmt/ps_pattern_20.ras -share/gmt/ps_pattern_21.ras -share/gmt/ps_pattern_22.ras -share/gmt/ps_pattern_23.ras -share/gmt/ps_pattern_24.ras -share/gmt/ps_pattern_25.ras -share/gmt/ps_pattern_26.ras -share/gmt/ps_pattern_27.ras -share/gmt/ps_pattern_28.ras -share/gmt/ps_pattern_29.ras -share/gmt/ps_pattern_30.ras -share/gmt/ps_pattern_31.ras -share/gmt/ps_pattern_32.ras -share/gmt/ps_pattern_33.ras -share/gmt/ps_pattern_34.ras -share/gmt/ps_pattern_35.ras -share/gmt/ps_pattern_36.ras -share/gmt/ps_pattern_37.ras -share/gmt/ps_pattern_38.ras -share/gmt/ps_pattern_39.ras -share/gmt/ps_pattern_40.ras -share/gmt/ps_pattern_41.ras -share/gmt/ps_pattern_42.ras -share/gmt/ps_pattern_43.ras -share/gmt/ps_pattern_44.ras -share/gmt/ps_pattern_45.ras -share/gmt/ps_pattern_46.ras -share/gmt/ps_pattern_47.ras -share/gmt/ps_pattern_48.ras -share/gmt/ps_pattern_49.ras -share/gmt/ps_pattern_50.ras -share/gmt/ps_pattern_51.ras -share/gmt/ps_pattern_52.ras -share/gmt/ps_pattern_53.ras -share/gmt/ps_pattern_54.ras -share/gmt/ps_pattern_55.ras -share/gmt/ps_pattern_56.ras -share/gmt/ps_pattern_57.ras -share/gmt/ps_pattern_58.ras -share/gmt/ps_pattern_59.ras -share/gmt/ps_pattern_60.ras -share/gmt/ps_pattern_61.ras -share/gmt/ps_pattern_62.ras -share/gmt/ps_pattern_63.ras -share/gmt/ps_pattern_64.ras -share/gmt/ps_pattern_65.ras -share/gmt/ps_pattern_66.ras -share/gmt/ps_pattern_67.ras -share/gmt/ps_pattern_68.ras -share/gmt/ps_pattern_69.ras -share/gmt/ps_pattern_70.ras -share/gmt/ps_pattern_71.ras -share/gmt/ps_pattern_72.ras -share/gmt/ps_pattern_73.ras -share/gmt/ps_pattern_74.ras -share/gmt/ps_pattern_75.ras -share/gmt/ps_pattern_76.ras -share/gmt/ps_pattern_77.ras -share/gmt/ps_pattern_78.ras -share/gmt/ps_pattern_79.ras -share/gmt/ps_pattern_80.ras -share/gmt/ps_pattern_81.ras -share/gmt/ps_pattern_82.ras -share/gmt/ps_pattern_83.ras -share/gmt/ps_pattern_84.ras -share/gmt/ps_pattern_85.ras -share/gmt/ps_pattern_86.ras -share/gmt/ps_pattern_87.ras -share/gmt/ps_pattern_88.ras -share/gmt/ps_pattern_89.ras -share/gmt/ps_pattern_90.ras -@dirrm share/gmt/mgg +share/gmt/pattern/ps_pattern_01.ras +share/gmt/pattern/ps_pattern_02.ras +share/gmt/pattern/ps_pattern_03.ras +share/gmt/pattern/ps_pattern_04.ras +share/gmt/pattern/ps_pattern_05.ras +share/gmt/pattern/ps_pattern_06.ras +share/gmt/pattern/ps_pattern_07.ras +share/gmt/pattern/ps_pattern_08.ras +share/gmt/pattern/ps_pattern_09.ras +share/gmt/pattern/ps_pattern_10.ras +share/gmt/pattern/ps_pattern_11.ras +share/gmt/pattern/ps_pattern_12.ras +share/gmt/pattern/ps_pattern_13.ras +share/gmt/pattern/ps_pattern_14.ras +share/gmt/pattern/ps_pattern_15.ras +share/gmt/pattern/ps_pattern_16.ras +share/gmt/pattern/ps_pattern_17.ras +share/gmt/pattern/ps_pattern_18.ras +share/gmt/pattern/ps_pattern_19.ras +share/gmt/pattern/ps_pattern_20.ras +share/gmt/pattern/ps_pattern_21.ras +share/gmt/pattern/ps_pattern_22.ras +share/gmt/pattern/ps_pattern_23.ras +share/gmt/pattern/ps_pattern_24.ras +share/gmt/pattern/ps_pattern_25.ras +share/gmt/pattern/ps_pattern_26.ras +share/gmt/pattern/ps_pattern_27.ras +share/gmt/pattern/ps_pattern_28.ras +share/gmt/pattern/ps_pattern_29.ras +share/gmt/pattern/ps_pattern_30.ras +share/gmt/pattern/ps_pattern_31.ras +share/gmt/pattern/ps_pattern_32.ras +share/gmt/pattern/ps_pattern_33.ras +share/gmt/pattern/ps_pattern_34.ras +share/gmt/pattern/ps_pattern_35.ras +share/gmt/pattern/ps_pattern_36.ras +share/gmt/pattern/ps_pattern_37.ras +share/gmt/pattern/ps_pattern_38.ras +share/gmt/pattern/ps_pattern_39.ras +share/gmt/pattern/ps_pattern_40.ras +share/gmt/pattern/ps_pattern_41.ras +share/gmt/pattern/ps_pattern_42.ras +share/gmt/pattern/ps_pattern_43.ras +share/gmt/pattern/ps_pattern_44.ras +share/gmt/pattern/ps_pattern_45.ras +share/gmt/pattern/ps_pattern_46.ras +share/gmt/pattern/ps_pattern_47.ras +share/gmt/pattern/ps_pattern_48.ras +share/gmt/pattern/ps_pattern_49.ras +share/gmt/pattern/ps_pattern_50.ras +share/gmt/pattern/ps_pattern_51.ras +share/gmt/pattern/ps_pattern_52.ras +share/gmt/pattern/ps_pattern_53.ras +share/gmt/pattern/ps_pattern_54.ras +share/gmt/pattern/ps_pattern_55.ras +share/gmt/pattern/ps_pattern_56.ras +share/gmt/pattern/ps_pattern_57.ras +share/gmt/pattern/ps_pattern_58.ras +share/gmt/pattern/ps_pattern_59.ras +share/gmt/pattern/ps_pattern_60.ras +share/gmt/pattern/ps_pattern_61.ras +share/gmt/pattern/ps_pattern_62.ras +share/gmt/pattern/ps_pattern_63.ras +share/gmt/pattern/ps_pattern_64.ras +share/gmt/pattern/ps_pattern_65.ras +share/gmt/pattern/ps_pattern_66.ras +share/gmt/pattern/ps_pattern_67.ras +share/gmt/pattern/ps_pattern_68.ras +share/gmt/pattern/ps_pattern_69.ras +share/gmt/pattern/ps_pattern_70.ras +share/gmt/pattern/ps_pattern_71.ras +share/gmt/pattern/ps_pattern_72.ras +share/gmt/pattern/ps_pattern_73.ras +share/gmt/pattern/ps_pattern_74.ras +share/gmt/pattern/ps_pattern_75.ras +share/gmt/pattern/ps_pattern_76.ras +share/gmt/pattern/ps_pattern_77.ras +share/gmt/pattern/ps_pattern_78.ras +share/gmt/pattern/ps_pattern_79.ras +share/gmt/pattern/ps_pattern_80.ras +share/gmt/pattern/ps_pattern_81.ras +share/gmt/pattern/ps_pattern_82.ras +share/gmt/pattern/ps_pattern_83.ras +share/gmt/pattern/ps_pattern_84.ras +share/gmt/pattern/ps_pattern_85.ras +share/gmt/pattern/ps_pattern_86.ras +share/gmt/pattern/ps_pattern_87.ras +share/gmt/pattern/ps_pattern_88.ras +share/gmt/pattern/ps_pattern_89.ras +share/gmt/pattern/ps_pattern_90.ras +share/gmt/pslib/ISO-8859-1.ps +share/gmt/pslib/ISO-8859-10.ps +share/gmt/pslib/ISO-8859-13.ps +share/gmt/pslib/ISO-8859-14.ps +share/gmt/pslib/ISO-8859-15.ps +share/gmt/pslib/ISO-8859-2.ps +share/gmt/pslib/ISO-8859-3.ps +share/gmt/pslib/ISO-8859-4.ps +share/gmt/pslib/ISO-8859-5.ps +share/gmt/pslib/ISO-8859-6.ps +share/gmt/pslib/ISO-8859-7.ps +share/gmt/pslib/ISO-8859-8.ps +share/gmt/pslib/ISO-8859-9.ps +share/gmt/pslib/ISOLatin1+.ps +share/gmt/pslib/ISOLatin1.ps +share/gmt/pslib/PSL_label.ps +share/gmt/pslib/PSL_prologue.ps +share/gmt/pslib/PSL_text.ps +share/gmt/pslib/PS_font_info.d +share/gmt/pslib/Standard+.ps +share/gmt/pslib/Standard.ps +share/gmt/time/br.d +share/gmt/time/cn1.d +share/gmt/time/cn2.d +share/gmt/time/de.d +share/gmt/time/dk.d +share/gmt/time/eh.d +share/gmt/time/es.d +share/gmt/time/fi.d +share/gmt/time/fr.d +share/gmt/time/gr.d +share/gmt/time/hu.d +share/gmt/time/ie.d +share/gmt/time/il.d +share/gmt/time/is.d +share/gmt/time/it.d +share/gmt/time/jp.d +share/gmt/time/nl.d +share/gmt/time/no.d +share/gmt/time/pl.d +share/gmt/time/pt.d +share/gmt/time/ru.d +share/gmt/time/se.d +share/gmt/time/sg.d +share/gmt/time/to.d +share/gmt/time/tr.d +share/gmt/time/uk.d +share/gmt/time/us.d +share/gmt/x2sys/geo.def +share/gmt/x2sys/geoz.def +share/gmt/x2sys/gmt.def +share/gmt/x2sys/mgd77+.def +share/gmt/x2sys/mgd77.def +share/gmt/x2sys/xy.def +share/gmt/x2sys/xyz.def +@dirrm share/gmt/coast +@dirrm share/gmt/cpt +@dirrm share/gmt/custom @dirrm share/gmt/dbase +@dirrm share/gmt/mgd77 +@dirrm share/gmt/mgg +@dirrm share/gmt/pattern +@dirrm share/gmt/pslib +@dirrm share/gmt/time +@dirrm share/gmt/x2sys @dirrm share/gmt @dirrm share/examples/gmt/ex01 @dirrm share/examples/gmt/ex02 @@ -1140,11 +1441,15 @@ share/gmt/ps_pattern_90.ras @dirrm share/examples/gmt/ex18 @dirrm share/examples/gmt/ex19 @dirrm share/examples/gmt/ex20 +@dirrm share/examples/gmt/ex21 +@dirrm share/examples/gmt/ex22 +@dirrm share/examples/gmt/ex23 +@dirrm share/examples/gmt/ex24 +@dirrm share/examples/gmt/ex25 @dirrm share/examples/gmt/tutorial @dirrm share/examples/gmt -@dirrm share/doc/html/gmt/images -@dirrm share/doc/html/gmt/doc/html/tutorial @dirrm share/doc/html/gmt/doc/html/GMT_Docs +@dirrm share/doc/html/gmt/doc/html/GMT_Tutorial @dirrm share/doc/html/gmt/doc/html @dirrm share/doc/html/gmt/doc @dirrm share/doc/html/gmt diff --git a/graphics/GMT/distinfo b/graphics/GMT/distinfo index a968412bbd5..f55598b5fe8 100644 --- a/graphics/GMT/distinfo +++ b/graphics/GMT/distinfo @@ -1,52 +1,59 @@ -$NetBSD: distinfo,v 1.11 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: distinfo,v 1.12 2006/11/14 13:16:00 wennmach Exp $ -SHA1 (GMT3.4/GMT3.4_progs.tar.bz2) = b9fa8f60fe20ff9509ef3ebdf15fcc74e01d3f95 -RMD160 (GMT3.4/GMT3.4_progs.tar.bz2) = efa76d4066070af694ec106c3d85d374af085e78 -Size (GMT3.4/GMT3.4_progs.tar.bz2) = 551406 bytes -SHA1 (GMT3.4/GMT3.4_suppl.tar.bz2) = 9e961d24d804e71c9b4f32bce729899c56dde360 -RMD160 (GMT3.4/GMT3.4_suppl.tar.bz2) = 4e41ebb883627c127339eafc90b5ff1b5e6ef3df -Size (GMT3.4/GMT3.4_suppl.tar.bz2) = 534636 bytes -SHA1 (GMT3.4/GMT_share.tar.bz2) = 3d3d5cfd75ad3499454dcc902f63099ff1b2cc2c -RMD160 (GMT3.4/GMT_share.tar.bz2) = 85d424770771c58a4a997b662e857f188b0da0e8 -Size (GMT3.4/GMT_share.tar.bz2) = 3662062 bytes -SHA1 (GMT3.4/GMT3.4_ps.tar.bz2) = 5490ad074e8801c1b1dc85108d3ebf3c0d2b1746 -RMD160 (GMT3.4/GMT3.4_ps.tar.bz2) = 25b3fa9d3c5699d70a83af4726af7c5758a26f5a -Size (GMT3.4/GMT3.4_ps.tar.bz2) = 3140145 bytes -SHA1 (GMT3.4/GMT3.4_man.tar.bz2) = 3f33b1eee6c47faf3f8d2d6c7efb27b57b88c303 -RMD160 (GMT3.4/GMT3.4_man.tar.bz2) = 57d646a44730f49aac28c46dcdd59116232c85a7 -Size (GMT3.4/GMT3.4_man.tar.bz2) = 86015 bytes -SHA1 (GMT3.4/GMT3.4_tut.tar.bz2) = 64476de1f504a3561574705a52cd87fee82dae67 -RMD160 (GMT3.4/GMT3.4_tut.tar.bz2) = b0b637fe182f94d3d0c5011f7536c49153896076 -Size (GMT3.4/GMT3.4_tut.tar.bz2) = 986173 bytes -SHA1 (GMT3.4/GMT3.4_scripts.tar.bz2) = a0013ce9141cb668df1af5025ac54cb09fab6b7c -RMD160 (GMT3.4/GMT3.4_scripts.tar.bz2) = 018366561664a9acaec3e9e0fb1fb14aa138684a -Size (GMT3.4/GMT3.4_scripts.tar.bz2) = 3050798 bytes -SHA1 (GMT3.4/GMT3.4_web.tar.bz2) = efbde777b67d45cf706b680f23c0171bc983c4e3 -RMD160 (GMT3.4/GMT3.4_web.tar.bz2) = a428c198fcc7de3a6f380717634b14c1952d4218 -Size (GMT3.4/GMT3.4_web.tar.bz2) = 1644571 bytes -SHA1 (patch-aa) = dadac1e16003da4902147dceacb8370d9861a03e -SHA1 (patch-ab) = d53e80a2bdf4386f24f78c9509ab2df9de9a37b6 -SHA1 (patch-ac) = 1ea2263200b94baace742a97ab331ad471e1be81 -SHA1 (patch-ad) = e59e871e51e9a46909de5ec389cad5744de62016 -SHA1 (patch-ae) = e543e7593b949e1476d9f8b8f85b65a892967fb1 -SHA1 (patch-af) = eac4b86614b6ffe88a3790b37b3f0b17f999947d -SHA1 (patch-ag) = d78cf5b95dd18e4aa5aca68fd62a5793ec7d966f -SHA1 (patch-ah) = 80fe4869af2c3c2eacf4f24dd9e6585153479f41 -SHA1 (patch-ai) = e95feed7fde9fb7a5a98cd3c73d0d9d7c057af43 -SHA1 (patch-aj) = 1b4994e217756f1a6978e6b4bbc3e7e7b2a26351 -SHA1 (patch-ak) = 124368204367c86ae6272e20bbe7930267e764ad -SHA1 (patch-al) = 429325839b9872858ce549b4a126fdc7b27ae0aa -SHA1 (patch-am) = 994c931fe2af0af2d2cc2431ff5a10ce4f116c76 -SHA1 (patch-an) = c9762b3bd06a7af30b6661e1074cee50a68e6ce6 -SHA1 (patch-ao) = 2abd32103f35e3f945eb6cc92b33ac0f471be59b -SHA1 (patch-ap) = c6a58f60f9cad393d092ab77086c150fe9f66de5 -SHA1 (patch-aq) = 5113f8020440c3506ac7162ffb9dfb32ed67e67a -SHA1 (patch-ar) = 4117f47e6b710d161a1162541c9a103673be1e74 -SHA1 (patch-as) = 7c33dad7423ff19876e71061b41ce62b8cbf6517 -SHA1 (patch-at) = 9994714addb475dfcfba8314113bbb18c909f33f -SHA1 (patch-au) = 3fc505b42192c9046293b83947bda59a2e233118 -SHA1 (patch-av) = fcc8aafb4a8163c0eb38744b9c7a05162d57db08 -SHA1 (patch-aw) = c9f81b674e8f0428d0bba521e3e58a6baf925ec8 -SHA1 (patch-ax) = 2475174e67f445a0f025cf409832676dfda96db9 -SHA1 (patch-ay) = b88f4585958d22aff356094dd9050fad06c67c5b -SHA1 (patch-az) = 4db3d50e182e2efb7d60ae7746c062dfffed5f2f +SHA1 (GMT4.1.4/GMT4.1.4_man.tar.bz2) = bd07c5675a2dfbba9f8d05864a1bf563c042e5dc +RMD160 (GMT4.1.4/GMT4.1.4_man.tar.bz2) = 42927181461b35294a8702499d2a66501555dc8b +Size (GMT4.1.4/GMT4.1.4_man.tar.bz2) = 115754 bytes +SHA1 (GMT4.1.4/GMT4.1.4_pdf.tar.bz2) = cd39c869b9c2604f2ad62c25e9222f255364d554 +RMD160 (GMT4.1.4/GMT4.1.4_pdf.tar.bz2) = ee3ab2a1497168787bd56df452583d69d596c805 +Size (GMT4.1.4/GMT4.1.4_pdf.tar.bz2) = 10181078 bytes +SHA1 (GMT4.1.4/GMT4.1.4_scripts.tar.bz2) = 7d01f1e6a822a0e9cbc6df0eb1a77d33704eaaa9 +RMD160 (GMT4.1.4/GMT4.1.4_scripts.tar.bz2) = bd0328ddfa5c098b56444d2ae9f27a41c8ecb7b5 +Size (GMT4.1.4/GMT4.1.4_scripts.tar.bz2) = 3107343 bytes +SHA1 (GMT4.1.4/GMT4.1.4_share.tar.bz2) = ed6fc5216ef50c246c659dac341ffdb2c8f0e219 +RMD160 (GMT4.1.4/GMT4.1.4_share.tar.bz2) = ecc145e5325b54eddb03662046a3d561d12ec638 +Size (GMT4.1.4/GMT4.1.4_share.tar.bz2) = 45468 bytes +SHA1 (GMT4.1.4/GMT4.1.4_src.tar.bz2) = b5fad9144bd1b39c1c1f345187069628defa0154 +RMD160 (GMT4.1.4/GMT4.1.4_src.tar.bz2) = e50254c4a376b337ab74ca2caa85c82f6dc9638d +Size (GMT4.1.4/GMT4.1.4_src.tar.bz2) = 908308 bytes +SHA1 (GMT4.1.4/GMT4.1.4_suppl.tar.bz2) = 4a9b9f8309f37ed909d31ee876df195e5261f992 +RMD160 (GMT4.1.4/GMT4.1.4_suppl.tar.bz2) = 5fd621c29deee55f5490f616fdbb11a80b22cbfe +Size (GMT4.1.4/GMT4.1.4_suppl.tar.bz2) = 762281 bytes +SHA1 (GMT4.1.4/GMT4.1.4_tut.tar.bz2) = 91343a04ac6b0c3193b39f6b9b988db3ea859f90 +RMD160 (GMT4.1.4/GMT4.1.4_tut.tar.bz2) = 381d56369b0f6e38b7cb06e8f543808ad483821c +Size (GMT4.1.4/GMT4.1.4_tut.tar.bz2) = 988854 bytes +SHA1 (GMT4.1.4/GMT4.1.4_web.tar.bz2) = d0d179905ce82494c2eb5a3556de4ce95d58bcf3 +RMD160 (GMT4.1.4/GMT4.1.4_web.tar.bz2) = 067a25e0999039d51f0084e21c2f8c0970f37cea +Size (GMT4.1.4/GMT4.1.4_web.tar.bz2) = 1644571 bytes +SHA1 (GMT4.1.4/GMT4.1_coast.tar.bz2) = 685c6e260dbfb85a803675b42cc33c895a58ce3c +RMD160 (GMT4.1.4/GMT4.1_coast.tar.bz2) = e78d2a2add8761d567e14e087488bb33756a02ed +Size (GMT4.1.4/GMT4.1_coast.tar.bz2) = 3660521 bytes +SHA1 (GMT4.1.4/GMT4.1_full.tar.bz2) = dc8472476027a4f3ce53320cd27a2ee892c4725b +RMD160 (GMT4.1.4/GMT4.1_full.tar.bz2) = 78ba63e8832308527b1c3d62168382ed8f1b2851 +Size (GMT4.1.4/GMT4.1_full.tar.bz2) = 28805855 bytes +SHA1 (GMT4.1.4/GMT4.1_high.tar.bz2) = 38f221c050be8a5c21fa54dd1c8da2b0ca230910 +RMD160 (GMT4.1.4/GMT4.1_high.tar.bz2) = 82bb0417a9f5c92c2d5f96a173478a0c67c02b2b +Size (GMT4.1.4/GMT4.1_high.tar.bz2) = 8644144 bytes +SHA1 (patch-aa) = b548d839e719ea92d8cfa11f72069216ee2ef43d +SHA1 (patch-ab) = a1d95e5654f0b202d6a1f8d7bd7c146d317191d1 +SHA1 (patch-ad) = fab72f2d1942f548f87154da39f5344fe2693a8a +SHA1 (patch-ae) = 7f74635ab750a6c03cb8cae1cf8b99a00a5b63da +SHA1 (patch-af) = e86c0097e703cdbd471f6e9a4873b9bfce3e3cef +SHA1 (patch-ag) = 93cea6588dba67624a54251faf9b47fd3eeb6c2b +SHA1 (patch-ah) = 7925e788bb0bb753ab65d7379e90bedb2a47cece +SHA1 (patch-ai) = 6bead94706dedbadfa87fd3ac4668783ae6869ab +SHA1 (patch-aj) = 735d9a56f796ae905e52f45dcf2079b2a19b0c77 +SHA1 (patch-ak) = 5e9a6f7e287ef0cc7b757029e66c406ac9649eac +SHA1 (patch-al) = b438da24161e7c6031e6337d9ff7ca22294fd4d9 +SHA1 (patch-an) = f33a3740751055dc6edaf4c0ac505c5c6f9dd367 +SHA1 (patch-ao) = 4797ec16091c417a64844b89bdfc805b57f35231 +SHA1 (patch-ap) = 664959cb0f76a1c8e9ed6b9579e1f2211e26e1f0 +SHA1 (patch-aq) = 214d39933e5577334dfef41538933e960ef72115 +SHA1 (patch-ar) = 7c693fee525963190cd709bc03a0e596540f0e48 +SHA1 (patch-as) = 07862720d30d35a3e219da8a73bf21f89fad6c07 +SHA1 (patch-at) = 731039e254c4bf0a8f1346b07fcb211a8bc0661f +SHA1 (patch-au) = af7b30735382479dc4c4ac813244feb3f116bb6e +SHA1 (patch-ay) = eccd5c6dee172793d3e2499447386cb262897a32 +SHA1 (patch-az) = 20a0266f828e5c0c2dd437e279374593b349a1cf +SHA1 (patch-ba) = e1b331a4946472582f1c948c416b9cd108316fbd +SHA1 (patch-bb) = 65a651d2075d6457e7725bbe8196c7a514fb3414 +SHA1 (patch-bc) = 706878d5067eb22b579b110929a1069d67aece64 diff --git a/graphics/GMT/patches/patch-aa b/graphics/GMT/patches/patch-aa index 7cbbd52da4f..8fbbf54de1e 100644 --- a/graphics/GMT/patches/patch-aa +++ b/graphics/GMT/patches/patch-aa @@ -1,7 +1,9 @@ -$NetBSD: patch-aa,v 1.7 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2006/11/14 13:16:00 wennmach Exp $ ---- src/Makefile.orig Fri Mar 9 19:20:44 2001 -+++ src/Makefile +Libtoolize. + +--- src/Makefile.orig 2006-11-08 15:19:48.000000000 +0100 ++++ src/Makefile 2006-11-08 16:04:24.000000000 +0100 @@ -43,7 +43,7 @@ NETCDFLIB = $(NETCDF)/lib NETCDFINC = $(NETCDF)/include @@ -11,33 +13,14 @@ $NetBSD: patch-aa,v 1.7 2005/06/22 08:34:54 jlam Exp $ PS = -lpsl GMT = -lgmt -@@ -136,15 +136,15 @@ - - #------------------------------------------------------------------------------- - --SHARED_LIB = libpsl.a libgmt.a libpsl.$(SL) libgmt.$(SL) --STATIC_LIB = libpsl.a libgmt.a -+SHARED_LIB = libpsl.la libgmt.la -+STATIC_LIB = - - #------------------------------------------------------------------------------- - - all: init libs $(PROGS) - - init: gmtmacros gmt_notposix.h gmt_nan.h -- -+ - gmtmacros: - if [ `cat makegmt.macros | wc -c` = 0 ]; then \ - echo "src/makegmt.macros is empty - you must rerun configure in the main GMT directory"; \ -@@ -162,32 +162,28 @@ +@@ -151,38 +151,34 @@ ./configure install: all - if [ ! -d $(bindir) ]; then \ - mkdir -p $(bindir); \ - fi -- for i in $(PROGS); do \ +- for i in $(ALLPROGS); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ - done - $(INSTALL) GMT $(bindir) @@ -45,14 +28,18 @@ $NetBSD: patch-aa,v 1.7 2005/06/22 08:34:54 jlam Exp $ mkdir -p $(libdir); \ fi if [ ! $(libdir) = $(srcdir) ]; then \ + rm -f $(libdir)/libpsl.* $(libdir)/libgmt.* $(libdir)/libgmtps.*; \ - $(INSTALL) -m 444 libpsl.a $(libdir); \ - $(INSTALL) -m 444 libgmt.a $(libdir); \ +- $(INSTALL) -m 444 libgmtps.a $(libdir); \ - if [ -f libpsl.$(SL) ]; then \ - $(INSTALL) -m 444 libpsl.$(SL) $(libdir); \ - $(INSTALL) -m 444 libgmt.$(SL) $(libdir); \ +- $(INSTALL) -m 444 libgmtps.$(SL) $(libdir); \ - fi; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) libpsl.la $(libdir); \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt.la $(libdir); \ ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmtps.la $(libdir); \ fi if [ ! -d $(includedir) ]; then \ mkdir -p $(includedir); \ @@ -62,70 +49,90 @@ $NetBSD: patch-aa,v 1.7 2005/06/22 08:34:54 jlam Exp $ - $(INSTALL) -m 444 $$i $(includedir); \ + $(INSTALL_DATA) $$i $(includedir); \ done; \ + for i in $(PS_H) $(PS_I); do \ +- $(INSTALL) -m 444 $$i $(includedir); \ ++ $(INSTALL_DATA) $$i $(includedir); \ + done; \ fi + if [ ! -d $(bindir) ]; then \ + mkdir -p $(bindir); \ + fi -+ for i in $(PROGS); do \ ++ for i in $(ALLPROGS); do \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ + done + $(INSTALL) GMT $(bindir) ++ uninstall: - for i in $(PROGS); do \ -@@ -208,13 +204,13 @@ + for i in $(ALLPROGS); do \ +@@ -207,13 +203,13 @@ fi clean: -- rm -f *.o gmt_nan_init$(EXE) -+ rm -f *.o *.lo gmt_nan_init$(EXE) - for i in $(PROGS); do \ +- rm -f *.o *.a *.$(SL) ++ rm -f *.o *.a *.lo *.$(SL) + for i in $(ALLPROGS); do \ rm -f $$i$(EXE); \ done spotless: clean -- rm -f $(GMTLIB) gmt_nan.h gmt_notposix.h makegmt.macros -+ rm -fr .libs $(GMTLIB) gmt_nan.h gmt_notposix.h makegmt.macros +- rm -f $(GMTLIB) gmt_notposix.h makegmt.macros *.man ++ rm -fr .libs $(GMTLIB) gmt_notposix.h makegmt.macros *.man touch makegmt.macros distclean: spotless -@@ -225,29 +221,24 @@ - +@@ -225,40 +221,32 @@ libs: $(GMTLIB) --libpsl.a: pslib.o + pslib.o: pslib.c $(PS_H) $(PS_I) gmt_notunix.h gmt_notposix.h gmt_math.h +- $(CC) $(CFLAGS) -c pslib.c +- +-./libpsl.a: pslib.o - $(AR) cvur libpsl.a $? - $(RANLIB) libpsl.a -+libpsl.la: pslib.o -+ @$(LIBTOOL) --mode=link $(CC) -o $@ pslib.lo $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir) - - pslib.o: pslib.c $(PS_H) -- $(CC) $(CFLAGS) -c pslib.c - --libgmt.a: $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) +-./libgmt.a: $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) - $(AR) cvur $@ $? - $(RANLIB) $@ - --libpsl.$(SL): pslib.o -- $(LD) $(LD_OPT) $? -o $@ +-./libgmtps.a: $(LIBPS_O) +- $(AR) cvur $@ $? +- $(RANLIB) $@ + @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c pslib.c --libgmt.$(SL): $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) +-./libpsl.$(SL): pslib.o +- $(LD) $(LD_OPT) $? -o $@ ++libpsl.la: pslib.o ++ @$(LIBTOOL) --mode=link $(CC) -o $@ pslib.lo $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir) + +-./libgmt.$(SL): $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) - $(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) -o $@ +libgmt.la: $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) -+ @$(LIBTOOL) --mode=link $(CC) -o $@ $(LIB_O:.o=.lo) $(TRIANGLE_O:.o=.lo) \ -+ $(ALPHA_SINCOS_O:.o=.lo) $(LDFLAGS) $(CDF) $(LIBS) \ -+ --version-info 0:0 -rpath $(libdir) ++ @$(LIBTOOL) --mode=link $(CC) -o $@ $(LIB_O:.o=.lo) \ ++ $(TRIANGLE_O:.o=.lo) $(ALPHA_SINCOS_O:.o=.lo) $(LDFLAGS) \ ++ $(CDF) $(LIBS) --version-info 0:0 -rpath $(libdir) + +-./libgmtps.$(SL): $(LIBPS_O) +- $(LD) $(LD_OPT) $(LIBPS_O) -o $@ ++libgmtps.la: $(LIBPS_O) ++ @$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBPS_O:.o=.lo) $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir) #------------------------------------------------------------------------------- # program dependencies #------------------------------------------------------------------------------- $(PROGS): $(GMTLIB) $(PROGS_O) -- $(CC) $(CFLAGS) $@.o -L. -lgmt -lpsl $(CDF) $(LIBS) $(LDFLAGS) -o $@ -+ @$(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $@.o libgmt.la \ -+ libpsl.la $(CDF) $(LIBS) $(LDFLAGS) -o $@ +- $(CC) $(CFLAGS) $@.o -L. $(GMT) $(CDF) $(LIBS) $(LDFLAGS) -o $@ ++ @$(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $@.o \ ++ libgmt.la libpsl.la $(CDF) $(LIBS) $(LDFLAGS) -o $@ $(COMPRESS) $@$(EXE) + + $(PROGSPS): $(GMTLIB) $(PROGSPS_O) +- $(CC) $(CFLAGS) $@.o -L. $(GMT) $(GMTPS) $(PS) $(CDF) $(LIBS) $(LDFLAGS) -o $@ ++ @$(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $@.o \ ++ libgmt.la libgmtps.la libpsl.la $(CDF) $(LIBS) $(LDFLAGS) -o $@ + $(COMPRESS) $@$(EXE) + .c.o: - $(CC) -c $(CFLAGS) $< + @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-ab b/graphics/GMT/patches/patch-ab index dc43ee1354f..718d2e0dd62 100644 --- a/graphics/GMT/patches/patch-ab +++ b/graphics/GMT/patches/patch-ab @@ -1,20 +1,20 @@ -$NetBSD: patch-ab,v 1.5 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2006/11/14 13:16:00 wennmach Exp $ ---- src/makegmt.macros.in.orig 2001-03-02 00:40:57.000000000 -0500 -+++ src/makegmt.macros.in -@@ -48,6 +48,9 @@ LIBS = @LIBS@ +--- src/makegmt.macros.in.orig 2006-11-08 16:19:32.000000000 +0100 ++++ src/makegmt.macros.in 2006-11-08 16:20:29.000000000 +0100 +@@ -49,6 +49,9 @@ # Misc. Standard Utilities: #--------------------------------------------------------------- INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_DATA = @INSTALL_DATA@ AWK = @AWK@ AS = @AS@ AR = @AR@ -@@ -139,4 +142,4 @@ ALPHA_SINCOS_O = @ALPHA_SINCOS_O@ +@@ -146,4 +149,4 @@ # Select STATIC (Default) or SHARED libraries #------------------------------------------------------------------------------- # -GMTLIB = @GMTLIB@ -+GMTLIB = libpsl.la libgmt.la ++GMTLIB = libpsl.la libgmt.la libgmtps.la diff --git a/graphics/GMT/patches/patch-ac b/graphics/GMT/patches/patch-ac deleted file mode 100644 index 38e33bb4b5a..00000000000 --- a/graphics/GMT/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2005/06/22 08:34:54 jlam Exp $ - ---- configure.orig 2001-04-18 05:28:26.000000000 -0400 -+++ configure -@@ -2904,9 +2904,7 @@ EOF - - fi - --subdirs="src/mex" -- --subdirs="src/mex src/xgrid" -+subdirs="src/xgrid" - - trap '' 1 2 15 - cat > confcache <<\EOF -@@ -3328,7 +3326,7 @@ if test "$no_recursion" != yes; then - esac - done - -- for ac_config_dir in src/mex src/xgrid; do -+ for ac_config_dir in src/xgrid; do - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. diff --git a/graphics/GMT/patches/patch-ad b/graphics/GMT/patches/patch-ad index b57938c1db6..1cec9d5287b 100644 --- a/graphics/GMT/patches/patch-ad +++ b/graphics/GMT/patches/patch-ad @@ -1,40 +1,82 @@ -$NetBSD: patch-ad,v 1.2 2001/04/19 20:51:31 jtb Exp $ +$NetBSD: patch-ad,v 1.3 2006/11/14 13:16:00 wennmach Exp $ ---- src/gmt_init.c.orig Thu Apr 19 18:02:09 2001 -+++ src/gmt_init.c -@@ -1488,7 +1488,7 @@ +Adapt to pkgsrc directory infrastructure. + +--- src/gmt_init.c.orig 2006-11-10 11:06:58.000000000 +0100 ++++ src/gmt_init.c 2006-11-10 11:08:27.000000000 +0100 +@@ -2509,7 +2509,7 @@ if (get == 0) { /* Must use GMT system defaults via gmt.conf */ - -- sprintf (line, "%s%cshare%cgmt.conf\0", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (line, "%s%cshare%cgmt%cgmt.conf\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); + +- GMT_getsharepath (CNULL, "gmt", ".conf", line); ++ GMT_getsharepath ("gmt", "gmt", ".conf", line); if ((fp = fopen (line, "r")) == NULL) { fprintf (stderr, "GMT Fatal Error: Cannot open/find GMT configuration file %s\n", line); exit (EXIT_FAILURE); -@@ -1501,7 +1501,7 @@ - else if (!strncmp (line, "SI", 2)) - id = 1; - else { -- fprintf (stderr, "GMT Fatal Error: No SI/US keyword in GMT configuration file ($GMTHOME/share/gmt.conf)\n"); -+ fprintf (stderr, "GMT Fatal Error: No SI/US keyword in GMT configuration file ($GMTHOME/share/gmt/gmt.conf)\n"); - exit (EXIT_FAILURE); - } - } -@@ -1509,7 +1509,7 @@ +@@ -2530,7 +2530,7 @@ id = get; - + id--; /* Get 0 or 1 */ -- sprintf (line, "%s%cshare%c.gmtdefaults_%s\0", GMTHOME, DIR_DELIM, DIR_DELIM, suffix[id]); -+ sprintf (line, "%s%cshare%cgmt%c.gmtdefaults_%s\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, suffix[id]); +- GMT_getsharepath (CNULL, ".gmtdefaults_", suffix[id], line); ++ GMT_getsharepath ("gmt", ".gmtdefaults_", suffix[id], line); path = (char *) GMT_memory (VNULL, (size_t)(strlen (line) + 1), (size_t)1, GMT_program); - -@@ -1643,7 +1643,7 @@ - GMT_set_home (); +@@ -2640,7 +2640,7 @@ + char line[BUFSIZ], path[BUFSIZ]; + double slop; -- sprintf (line, "%s%cshare%cgmtmedia.d\0", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (line, "%s%cshare%cgmt%cgmtmedia.d\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); +- GMT_getsharepath (CNULL, name, CNULL, path); ++ GMT_getsharepath ("gmt", name, CNULL, path); + + if (!strcmp ("Sphere", name)) { + /* Special case where previous setting in .gmtdefaults4 is a custom ellipse which +@@ -2717,7 +2717,7 @@ + char line[BUFSIZ], media[80]; + FILE *fp; + +- GMT_getsharepath (CNULL, "gmtmedia", ".d", line); ++ GMT_getsharepath ("gmt", "gmtmedia", ".d", line); if ((fp = fopen (line, "r")) == NULL) return (0); n_alloc = GMT_TINY_CHUNK; +@@ -2775,10 +2775,10 @@ + char file[BUFSIZ], line[BUFSIZ], full[16], abbrev[16], c[16], dwu; + int i, nm = 0, nw = 0, nu = 0; + +- GMT_getsharepath ("time", name, ".d", file); ++ GMT_getsharepath ("gmt/time", name, ".d", file); + if ((fp = fopen (file, "r")) == NULL) { + fprintf (stderr, "GMT Warning: Could not load time language %s - revert to us (English)!\n", name); +- GMT_getsharepath ("time", "us", ".d", file); ++ GMT_getsharepath ("gmt/time", "us", ".d", file); + if ((fp = fopen (file, "r")) == NULL) { + fprintf (stderr, "GMT Error: Could not find %s!\n", file); + exit (EXIT_FAILURE); +@@ -5482,7 +5482,7 @@ + int code = 0, pos; + FILE *in; + +- GMT_getsharepath ("pslib", enc->name, ".ps", line); ++ GMT_getsharepath ("gmt/pslib", enc->name, ".ps", line); + if ((in = fopen (line, "r")) == NULL) { + perror (line); + exit (EXIT_FAILURE); +@@ -5556,7 +5556,7 @@ + + /* First the standard 35 PostScript fonts from Adobe */ + +- GMT_getsharepath ("pslib", "PS_font_info", ".d", fullname); ++ GMT_getsharepath ("gmt/pslib", "PS_font_info", ".d", fullname); + if ((in = fopen (fullname, "r")) == NULL) { + fprintf (stderr, "GMT Fatal Error: "); + perror (fullname); +@@ -5584,7 +5584,7 @@ + + /* Then any custom fonts */ + +- if (GMT_getsharepath ("pslib", "CUSTOM_font_info", ".d", fullname)) { /* Decode Custom font file */ ++ if (GMT_getsharepath ("gmt/pslib", "CUSTOM_font_info", ".d", fullname)) { /* Decode Custom font file */ + if ((in = fopen (fullname, "r")) == NULL) { + fprintf (stderr, "GMT Fatal Error: "); + perror (fullname); diff --git a/graphics/GMT/patches/patch-ae b/graphics/GMT/patches/patch-ae index 7ae38b8e903..299a6960b21 100644 --- a/graphics/GMT/patches/patch-ae +++ b/graphics/GMT/patches/patch-ae @@ -1,25 +1,24 @@ -$NetBSD: patch-ae,v 1.2 2001/04/19 20:51:31 jtb Exp $ +$NetBSD: patch-ae,v 1.3 2006/11/14 13:16:00 wennmach Exp $ ---- src/gmt_support.c.orig Thu Apr 19 18:02:09 2001 -+++ src/gmt_support.c -@@ -3483,9 +3483,9 @@ - char dir[BUFSIZ]; - FILE *fp; +Adapt to pkgsrc directory infrastrucure. + +--- src/gmt_support.c.orig 2006-11-10 11:19:57.000000000 +0100 ++++ src/gmt_support.c 2006-11-10 11:20:29.000000000 +0100 +@@ -6017,7 +6017,7 @@ + + /* Open the list in $GMTHOME/share */ + +- GMT_getsharepath (CNULL, "GMT_CustomSymbols", ".lis", list); ++ GMT_getsharepath ("gmt", "GMT_CustomSymbols", ".lis", list); + if ((fp = fopen (list, "r")) == NULL) { + fprintf (stderr, "%s: ERROR: Cannot open file %s\n", GMT_program, list); + exit (EXIT_FAILURE); +@@ -7861,7 +7861,7 @@ + struct GMT_CUSTOM_SYMBOL *head; + struct GMT_CUSTOM_SYMBOL_ITEM *s = NULL, *previous = NULL; -- /* First check the $GMTHOME/share directory */ -+ /* First check the $GMTHOME/gmt/share directory */ - -- sprintf (path, "%s%cshare%c%s\0", GMTHOME, DIR_DELIM, DIR_DELIM, name); -+ sprintf (path, "%s%cshare%cgmt%c%s\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); - if (!access (path, R_OK)) return (TRUE); /* File exists and is readable, return with name */ - - /* File was not readable. Now check if it exists */ -@@ -3499,7 +3499,7 @@ - * It is not an error if we cannot find the named file, only if it is found - * but cannot be read due to permission problems */ - -- sprintf (dir, "%s%cshare%ccoastline.conf\0", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (dir, "%s%cshare%cgmt%ccoastline.conf\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); - if (!access (dir, F_OK)) { /* File exists... */ - if (access (dir, R_OK)) { /* ...but cannot be read */ - fprintf (stderr, "%s: Error: GMT does not have permission to open %s!\n", GMT_program, dir); +- GMT_getsharepath ("custom", name, ".def", file); ++ GMT_getsharepath ("gmt/custom", name, ".def", file); + if ((fp = fopen (file, "r")) == NULL) { + fprintf (stderr, "GMT ERROR: %s : Could not find custom symbol %s\n", GMT_program, name); + exit (EXIT_FAILURE); diff --git a/graphics/GMT/patches/patch-af b/graphics/GMT/patches/patch-af index 4494b3fd0cb..b9968216777 100644 --- a/graphics/GMT/patches/patch-af +++ b/graphics/GMT/patches/patch-af @@ -1,25 +1,15 @@ -$NetBSD: patch-af,v 1.2 2001/04/19 20:51:31 jtb Exp $ +$NetBSD: patch-af,v 1.3 2006/11/14 13:16:00 wennmach Exp $ ---- src/grd2cpt.c.orig Thu Apr 19 18:02:09 2001 -+++ src/grd2cpt.c -@@ -64,7 +64,7 @@ - - /* Get list of available color tables in GMT /share */ +Adapt to pkgsrc directory infrastructure. + +--- src/grd2cpt.c.orig 2006-11-10 11:23:01.000000000 +0100 ++++ src/grd2cpt.c 2006-11-10 11:23:32.000000000 +0100 +@@ -115,7 +115,7 @@ -- sprintf (CPT_lis, "%s%cshare%cGMT_CPT.lis\0", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (CPT_lis, "%s%cshare%cgmt%cGMT_CPT.lis\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); + /* Get list of available color tables in $GMTHOME/share */ +- GMT_getsharepath (CNULL, "GMT_CPT", ".lis", CPT_lis); ++ GMT_getsharepath ("gmt", "GMT_CPT", ".lis", CPT_lis); if ((fpc = fopen (CPT_lis, "r")) == NULL) { fprintf (stderr, "%s: ERROR: Cannot open file %s\n", GMT_program, CPT_lis); -@@ -180,9 +180,9 @@ - - if (!ok) { /* No table in current dir, try /share */ - if (table) -- sprintf (CPT_file, "%s%cshare%cGMT_%s.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, table); -+ sprintf (CPT_file, "%s%cshare%cgmt%cGMT_%s.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, table); - else /* Default to rainbow colors */ -- sprintf (CPT_file, "%s%cshare%cGMT_rainbow.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (CPT_file, "%s%cshare%cgmt%cGMT_rainbow.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); - - if (access (CPT_file, R_OK)) { - fprintf (stderr, "%s: ERROR: Cannot find colortable %s\n", GMT_program, CPT_file); + exit (EXIT_FAILURE); diff --git a/graphics/GMT/patches/patch-ag b/graphics/GMT/patches/patch-ag index aad87120919..b34136f4bfd 100644 --- a/graphics/GMT/patches/patch-ag +++ b/graphics/GMT/patches/patch-ag @@ -1,25 +1,15 @@ -$NetBSD: patch-ag,v 1.2 2001/04/19 20:51:31 jtb Exp $ +$NetBSD: patch-ag,v 1.3 2006/11/14 13:16:00 wennmach Exp $ ---- src/makecpt.c.orig Thu Apr 19 18:02:08 2001 -+++ src/makecpt.c -@@ -48,7 +48,7 @@ - - /* Get list of available color tables in GMT /share */ - -- sprintf (CPT_lis, "%s%cshare%cGMT_CPT.lis\0", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (CPT_lis, "%s%cshare%cgmt%cGMT_CPT.lis\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); - +Adapt to pkgsrc directory infrastructure. + +--- src/makecpt.c.orig 2006-11-10 12:10:37.000000000 +0100 ++++ src/makecpt.c 2006-11-10 12:11:11.000000000 +0100 +@@ -83,7 +83,7 @@ + + /* Get list of available color tables in $GMTHOME/share */ + +- GMT_getsharepath (CNULL, "GMT_CPT", ".lis", CPT_lis); ++ GMT_getsharepath ("gmt", "GMT_CPT", ".lis", CPT_lis); if ((fpc = fopen (CPT_lis, "r")) == NULL) { fprintf (stderr, "%s: ERROR: Cannot open file %s\n", GMT_program, CPT_lis); -@@ -132,9 +132,9 @@ - - if (!ok) { /* No table in current dir, try /share */ - if (table) -- sprintf (CPT_file, "%s%cshare%cGMT_%s.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, table); -+ sprintf (CPT_file, "%s%cshare%cgmt%cGMT_%s.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, table); - else /* Default to rainbow colors */ -- sprintf (CPT_file, "%s%cshare%cGMT_rainbow.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (CPT_file, "%s%cshare%cgmt%cGMT_rainbow.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); - - ok = !access (CPT_file, R_OK); - if (!ok) { + exit (EXIT_FAILURE); diff --git a/graphics/GMT/patches/patch-ah b/graphics/GMT/patches/patch-ah index 93958f0737b..fadc4dd20f7 100644 --- a/graphics/GMT/patches/patch-ah +++ b/graphics/GMT/patches/patch-ah @@ -1,13 +1,15 @@ -$NetBSD: patch-ah,v 1.2 2001/04/19 20:51:32 jtb Exp $ +$NetBSD: patch-ah,v 1.3 2006/11/14 13:16:00 wennmach Exp $ ---- src/grdreformat.c.orig Thu Apr 19 18:02:08 2001 -+++ src/grdreformat.c -@@ -86,7 +86,7 @@ +Adapt to pkgsrc directory infrastructure. + +--- src/grdreformat.c.orig 2006-11-10 11:25:05.000000000 +0100 ++++ src/grdreformat.c 2006-11-10 11:25:33.000000000 +0100 +@@ -105,7 +105,7 @@ GMT_explain_option ('V'); - - fprintf (stderr, " The following formats are supported\n\n"); -- sprintf (line, "%s%cshare%cgmtformats.d\0", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (line, "%s%cshare%cgmt%cgmtformats.d\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); + + fprintf (stderr, "\n The following grdfile formats are supported:\n\n"); +- GMT_getsharepath (CNULL, "gmtformats", ".d", line); ++ GMT_getsharepath ("gmt", "gmtformats", ".d", line); if ((fp = fopen (line, "r")) == NULL) { fprintf (stderr, "%s: GMT ERROR: Cannot read file %s\n", GMT_program, line); exit (EXIT_FAILURE); diff --git a/graphics/GMT/patches/patch-ai b/graphics/GMT/patches/patch-ai index e08af6cabce..d9e8729ad67 100644 --- a/graphics/GMT/patches/patch-ai +++ b/graphics/GMT/patches/patch-ai @@ -1,31 +1,51 @@ -$NetBSD: patch-ai,v 1.3 2001/05/19 23:46:38 jtb Exp $ +$NetBSD: patch-ai,v 1.4 2006/11/14 13:16:00 wennmach Exp $ ---- src/pslib.c.orig Thu Apr 19 18:02:08 2001 -+++ src/pslib.c -@@ -786,7 +786,7 @@ - if ((image_no >= 0 && image_no < N_PATTERNS) && ps_pattern_status[image_no][invert]) return (image_no); /* Already done this */ - - if ((image_no >= 0 && image_no < N_PATTERNS)) { /* Premade pattern yet not used */ -- sprintf (file, "%s%cshare%cps_pattern_%2.2d.ras\0", PSHOME, DIR_DELIM, DIR_DELIM, image_no); -+ sprintf (file, "%s%cshare%cgmt%cps_pattern_%2.2d.ras\0", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, image_no); - ps_pattern_status[image_no][invert] = 1; +Adapt to pkgsrc directory structure. + +--- src/pslib.c.orig 2006-11-13 15:46:37.000000000 +0100 ++++ src/pslib.c 2006-11-13 15:47:20.000000000 +0100 +@@ -909,7 +909,7 @@ + + if ((image_no >= 0 && image_no < PSL_N_PATTERNS)) { /* Premade pattern yet not used */ + sprintf (name, "ps_pattern_%2.2d", image_no); +- ps_getsharepath ("pattern", name, ".ras", file); ++ ps_getsharepath ("gmt/pattern", name, ".ras", file); } else { /* User image, check to see if already used */ -@@ -804,7 +804,7 @@ + +@@ -926,7 +926,7 @@ if (!access (imagefile, R_OK)) strcpy (file, imagefile); else -- sprintf (file, "%s%cshare%c%s\0", PSHOME, DIR_DELIM, DIR_DELIM, imagefile); -+ sprintf (file, "%s%cshare%cgmt%c%s\0", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, imagefile); +- ps_getsharepath (CNULL, imagefile, CNULL, file); ++ ps_getsharepath ("gmt", imagefile, CNULL, file); } - ps_user_image[ps_n_userimages].name = (char *) ps_memory (VNULL, (size_t)(strlen (imagefile)+1), sizeof (char)); - strcpy (ps_user_image[ps_n_userimages].name, imagefile); -@@ -3189,7 +3189,7 @@ - /* Load PSL_text procedures from file for now */ + psl_user_image[psl_n_userimages] = (char *) ps_memory (VNULL, (size_t)(strlen (imagefile)+1), sizeof (char)); + strcpy (psl_user_image[psl_n_userimages], imagefile); +@@ -4261,7 +4261,7 @@ + char fullname[BUFSIZ]; + int i, j; + +- ps_getsharepath ("pslib", fname, ".ps", fullname); ++ ps_getsharepath ("gmt/pslib", fname, ".ps", fullname); + if ((in = fopen (fullname, "r")) == NULL) { + fprintf (stderr, "PSL Fatal Error: "); + perror (fullname); +@@ -4301,7 +4301,7 @@ + + /* First the standard 35 PostScript fonts from Adobe */ + +- ps_getsharepath ("pslib", "PS_font_info", ".d", fullname); ++ ps_getsharepath ("gmt/pslib", "PS_font_info", ".d", fullname); + if ((in = fopen (fullname, "r")) == NULL) { + fprintf (stderr, "PSL Fatal Error: "); + perror (fullname); +@@ -4329,7 +4329,7 @@ + + /* Then any custom fonts */ - if (PSL_first) { -- sprintf (line, "%s%cshare%cPSL_text.ps\0", PSHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (line, "%s%cshare%cgmt%cPSL_text.ps\0", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); +- ps_getsharepath ("pslib", "CUSTOM_font_info", ".d", fullname); ++ ps_getsharepath ("gmt/pslib", "CUSTOM_font_info", ".d", fullname); + if (!access (fullname, R_OK)) { /* Decode Custom font file */ - if ((fp = fopen (line, "r")) == NULL) { - fprintf (stderr, "pslib: ERROR: Cannot open file %s\n", line); + if ((in = fopen (fullname, "r")) == NULL) diff --git a/graphics/GMT/patches/patch-aj b/graphics/GMT/patches/patch-aj index 6b2d68e3c72..83ddbc6a16f 100644 --- a/graphics/GMT/patches/patch-aj +++ b/graphics/GMT/patches/patch-aj @@ -1,8 +1,10 @@ -$NetBSD: patch-aj,v 1.4 2001/04/20 17:16:19 jtb Exp $ +$NetBSD: patch-aj,v 1.5 2006/11/14 13:16:00 wennmach Exp $ ---- src/GMT.in.orig -+++ src/GMT.in -@@ -123,7 +123,7 @@ +Adapt to pkgsrc directory structure. + +--- src/GMT.in.orig 2006-11-13 15:50:26.000000000 +0100 ++++ src/GMT.in 2006-11-13 15:51:25.000000000 +0100 +@@ -126,7 +126,7 @@ By default, those man pages are in @prefix@/man/man@mansection@. Information is also available on the GMT World Wide Web home page (http://gmt.soest.hawaii.edu) and, if installed, locally from diff --git a/graphics/GMT/patches/patch-ak b/graphics/GMT/patches/patch-ak index 5471137d98c..0832b87e6d9 100644 --- a/graphics/GMT/patches/patch-ak +++ b/graphics/GMT/patches/patch-ak @@ -1,8 +1,17 @@ -$NetBSD: patch-ak,v 1.3 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-ak,v 1.4 2006/11/14 13:16:00 wennmach Exp $ ---- ./src/dbase/makefile.orig Wed Apr 11 19:58:09 2001 -+++ ./src/dbase/makefile -@@ -14,13 +14,13 @@ +Libtoolize. + +--- src/dbase/makefile.orig 2006-11-08 17:00:45.000000000 +0100 ++++ src/dbase/makefile 2006-11-08 17:03:35.000000000 +0100 +@@ -10,19 +10,19 @@ + GMTSRCDIR = .. + include ../gmtalldeps.macros + +-CDF = -L$(NETCDF)/lib -lnetcdf ++CDF = -Wl,-R$(NETCDFLIB) -L$(NETCDF)/lib -lnetcdf + CFLAGS = $(CC_OPT) $(WIN32) $(SWAP) -I$(srcdir) -I$(NETCDF)/include + all: grdraster install: all @@ -12,15 +21,16 @@ $NetBSD: patch-ak,v 1.3 2005/06/22 08:34:54 jlam Exp $ uninstall: \rm -f $(bindir)/grdraster$(EXE) - grdraster: grdraster.o -- $(CC) $(CFLAGS) $(LDFLAGS) grdraster.o -L.. -L$(libdir) -lgmt -lpsl $(CDF) $(LIBS) -o grdraster +-grdraster: grdraster.o $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) grdraster.o -L.. -L$(libdir) -lgmt $(CDF) $(LIBS) -o grdraster ++grdraster: grdraster.o + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) grdraster.lo -L$(libdir) ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster spotless: clean -@@ -28,4 +28,4 @@ +@@ -30,4 +30,4 @@ rm -f *.o grdraster$(EXE) - .c.o: + .c.o: $(GMT_H) - $(CC) -c $(CFLAGS) $< + @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-al b/graphics/GMT/patches/patch-al index 927b349680b..faf57fb7712 100644 --- a/graphics/GMT/patches/patch-al +++ b/graphics/GMT/patches/patch-al @@ -1,9 +1,11 @@ -$NetBSD: patch-al,v 1.4 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-al,v 1.5 2006/11/14 13:16:00 wennmach Exp $ + +Libtoolize. --- src/mgg/makefile.orig Wed Apr 11 19:58:09 2001 +++ src/mgg/makefile -@@ -22,7 +22,7 @@ - include ../makegmt.macros +@@ -24,7 +24,7 @@ + include ../gmtalldeps.macros CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include -CDF = -L$(NETCDF)/lib -lnetcdf @@ -11,30 +13,32 @@ $NetBSD: patch-al,v 1.4 2005/06/22 08:34:54 jlam Exp $ MGG_H = gmt_mgg.h -@@ -44,18 +44,15 @@ +@@ -54,19 +54,17 @@ #------------------------------------------------------------------------------- install: all -- for i in $(MGG); do \ +- for i in $(MGG) $(MGGPS); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ - done if [ ! -d $(libdir) ]; then \ mkdir -p $(libdir); \ fi if [ ! $(libdir) = $(srcdir) ]; then \ + rm -f $(libdir)/libgmt_mgg.*; \ - $(INSTALL) -m 444 libgmt_mgg.a $(libdir); \ - if [ -f libgmt_mgg.$(SL) ]; then \ - $(INSTALL) -m 444 libgmt_mgg.$(SL) $(libdir); \ - fi; \ -+ $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt_mgg.la $(libdir); \ ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt_mgg.la $(libdir); \ fi -+ for i in $(MGG); do \ ++ for i in $(MGG) $(MGGPS); do \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ + done ++ uninstall: - for i in $(MGG); do \ -@@ -82,8 +79,7 @@ + for i in $(MGG) $(MGGPS); do \ +@@ -93,8 +91,7 @@ #------------------------------------------------------------------------------- libgmt_mgg.a: gmt_mgg.o @@ -44,12 +48,20 @@ $NetBSD: patch-al,v 1.4 2005/06/22 08:34:54 jlam Exp $ gmt_mgg.o: $(MGG_H) -@@ -92,7 +88,7 @@ +@@ -102,11 +99,12 @@ + # program dependencies #------------------------------------------------------------------------------- - $(MGG): libgmt_mgg.a $(MGG_O) -- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@ +-$(MGG): libgmt_mgg.a $(MGG_O) $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -L$(libdir) -lgmt $(CDF) $(LIBS) -o $@ ++$(MGG): libgmt_mgg.a $(MGG_O) + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ ++ + +-$(MGGPS): libgmt_mgg.a $(MGGPS_O) $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -L$(libdir) -lgmt -lgmtps -lpsl $(CDF) $(LIBS) -o $@ ++$(MGGPS): libgmt_mgg.a $(MGGPS_O) ++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libgmt.la ../libgmtps.la ../libpsl.la $(CDF) $(LIBS) -o $@ .c.o: - $(CC) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-am b/graphics/GMT/patches/patch-am deleted file mode 100644 index bdc8889e3d9..00000000000 --- a/graphics/GMT/patches/patch-am +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-am,v 1.3 2005/06/22 08:34:54 jlam Exp $ - ---- src/cps/makefile.orig Wed Oct 18 03:01:09 2000 -+++ src/cps/makefile -@@ -12,35 +12,34 @@ - all: cpsencode cpsdecode - - install: all -- $(INSTALL) cpsencode$(EXE) $(bindir) -- $(INSTALL) cpsdecode$(EXE) $(bindir) -+ @$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cpsencode$(EXE) $(bindir) -+ @$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cpsdecode$(EXE) $(bindir) - - uninstall: - \rm -f $(bindir)/cpsencode$(EXE) - \rm -f $(bindir)/cpsdecode$(EXE) - - spotless: clean -- \rm -f *.a -+ \rm -fr .libs *.la - - clean: -- rm -f *.o cpsencode$(EXE) cpsdecode$(EXE) -+ rm -f *.o *.lo cpsencode$(EXE) cpsdecode$(EXE) - - #------------------------------------------------------------------------------- - # library - #------------------------------------------------------------------------------- - - libuu.a: libuu.o -- $(AR) cvr libuu.a $? -- $(RANLIB) libuu.a -+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ libuu.lo - - cpsencode: cpsencode.o libuu.a -- $(CC) $(CFLAGS) $(LDFLAGS) cpsencode.o -L. -luu -o cpsencode -+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $? -o $@ - - cpsdecode: cpsdecode.o libuu.a -- $(CC) $(CFLAGS) $(LDFLAGS) cpsdecode.o -L. -luu -o cpsdecode -+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $? -o $@ - - .c.o: -- $(CC) -c $(CFLAGS) $< -+ @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< - - cpsencode.c: cps.h uu.h - diff --git a/graphics/GMT/patches/patch-an b/graphics/GMT/patches/patch-an index 0e4126cc6f3..850f17e1774 100644 --- a/graphics/GMT/patches/patch-an +++ b/graphics/GMT/patches/patch-an @@ -1,8 +1,10 @@ -$NetBSD: patch-an,v 1.3 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-an,v 1.4 2006/11/14 13:16:00 wennmach Exp $ + +Libtoolize. --- src/gshhs/makefile.orig Sat Jan 27 03:10:36 2001 +++ src/gshhs/makefile -@@ -12,19 +12,19 @@ +@@ -13,19 +13,19 @@ all: gshhs gshhs_dp install: all @@ -13,7 +15,7 @@ $NetBSD: patch-an,v 1.3 2005/06/22 08:34:54 jlam Exp $ clean: - \rm -f *.o *% gshhs$(EXE) gshhs_dp$(EXE) -+ \rm -f *.o *.lo .libs *% gshhs$(EXE) gshhs_dp$(EXE) ++ \rm -f *.o *.lo *% gshhs$(EXE) gshhs_dp$(EXE) spotless: clean diff --git a/graphics/GMT/patches/patch-ao b/graphics/GMT/patches/patch-ao index 13d953aa4cf..2e05b1ef732 100644 --- a/graphics/GMT/patches/patch-ao +++ b/graphics/GMT/patches/patch-ao @@ -1,13 +1,15 @@ -$NetBSD: patch-ao,v 1.3 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-ao,v 1.4 2006/11/14 13:16:00 wennmach Exp $ ---- ./src/imgsrc/makefile.orig Wed Apr 11 19:58:09 2001 -+++ ./src/imgsrc/makefile -@@ -6,25 +6,25 @@ - - include ../makegmt.macros +Libtoolize. + +--- src/imgsrc/makefile.orig Wed Apr 11 19:58:09 2001 ++++ src/imgsrc/makefile +@@ -8,21 +8,21 @@ + GMTSRCDIR = .. + include ../gmtalldeps.macros -CDF = -L$(NETCDF)/lib -lnetcdf --GMT = -L.. -L$(libdir) -lgmt -lpsl +-GMT = -L.. -L$(libdir) -lgmt +CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf +GMT = ../libgmt.la ../libpsl.la CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include @@ -23,14 +25,16 @@ $NetBSD: patch-ao,v 1.3 2005/06/22 08:34:54 jlam Exp $ uninstall: \rm -f $(bindir)/img2mercgrd$(EXE) $(bindir)/img2grd - img2mercgrd: img2mercgrd.o gmt_imgsubs.o +-img2mercgrd: img2mercgrd.o gmt_imgsubs.o $(GMTLIB) - $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.o gmt_imgsubs.o $(GMT) $(CDF) $(LIBS) -o img2mercgrd ++img2mercgrd: img2mercgrd.o gmt_imgsubs.o + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.lo gmt_imgsubs.lo $(GMT) $(CDF) $(LIBS) -o img2mercgrd spotless: clean - clean: +@@ -30,4 +30,4 @@ rm -f *.o img2mercgrd$(EXE) - .c.o: + + .c.o: gmt_imgsubs.h $(GMT_H) - $(CC) -c $(CFLAGS) $< + @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-ap b/graphics/GMT/patches/patch-ap index 5e448ef71b6..30231d4d931 100644 --- a/graphics/GMT/patches/patch-ap +++ b/graphics/GMT/patches/patch-ap @@ -1,20 +1,22 @@ -$NetBSD: patch-ap,v 1.3 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-ap,v 1.4 2006/11/14 13:16:00 wennmach Exp $ ---- ./src/meca/makefile.orig Wed Apr 11 19:58:09 2001 -+++ ./src/meca/makefile -@@ -9,9 +9,9 @@ +Libtoolize. + +--- src/meca/makefile.orig Wed Apr 11 19:58:09 2001 ++++ src/meca/makefile +@@ -11,9 +11,9 @@ NETCDFLIB = $(NETCDF)/lib NETCDFINC = $(NETCDF)/include -CDF = -L$(NETCDFLIB) -lnetcdf +CDF = -Wl,-R$(NETCDFLIB) -L$(NETCDFLIB) -lnetcdf CFLAGS = $(CC_OPT) -I$(srcdir) -I$(NETCDFINC) --ALLLIB = -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) $(LDFLAGS) -+ALLLIB = ../libpsl.la ../libgmt.la $(CDF) $(LIBS) $(LDFLAGS) +-ALLLIB = -L.. -L$(libdir) -lgmt -lgmtps -lpsl $(CDF) $(LIBS) $(LDFLAGS) ++ALLLIB = ../libgmt.la ../libgmtps.la ../libpsl.la $(CDF) $(LIBS) $(LDFLAGS) # # -@@ -23,7 +23,7 @@ +@@ -25,7 +25,7 @@ install: all for i in $(MECA); do \ @@ -23,26 +25,31 @@ $NetBSD: patch-ap,v 1.3 2005/06/22 08:34:54 jlam Exp $ done uninstall: -@@ -34,19 +34,19 @@ +@@ -35,20 +35,20 @@ + spotless: clean - psmeca: psmeca.o utilmeca.o nrutil.o +-psmeca: psmeca.o utilmeca.o nrutil.o $(GMTLIB) - $(CC) $(CFLAGS) psmeca.o utilmeca.o nrutil.o $(ALLLIB) -o ./$@ ++psmeca: psmeca.o utilmeca.o nrutil.o + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) psmeca.lo utilmeca.lo nrutil.lo $(ALLLIB) -o ./$@ - pscoupe: pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o +-pscoupe: pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o $(GMTLIB) - $(CC) $(CFLAGS) pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o $(ALLLIB) -o ./$@ ++pscoupe: pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) pscoupe.lo utilmeca.lo submeca.lo distaz.lo nrutil.lo $(ALLLIB) -o ./$@ - pspolar: pspolar.o +-pspolar: pspolar.o $(GMTLIB) - $(CC) $(CFLAGS) pspolar.o $(ALLLIB) -o ./$@ ++pspolar: pspolar.o + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) pspolar.lo $(ALLLIB) -o ./$@ - psvelo: psvelo.o utilvelo.o utilstrain.o +-psvelo: psvelo.o utilvelo.o utilstrain.o $(GMTLIB) - $(CC) $(CFLAGS) psvelo.o utilvelo.o utilstrain.o $(ALLLIB) -o ./$@ ++psvelo: psvelo.o utilvelo.o utilstrain.o + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) psvelo.lo utilvelo.lo utilstrain.lo $(ALLLIB) -o ./$@ - .c.o: + .c.o: $(GMT_H) $(PS_H) meca.h nrutil.h submeca.h utilmeca.h utilstrain.h utilvelo.h - $(CC) -c $(CFLAGS) $< + @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-aq b/graphics/GMT/patches/patch-aq index 4e1df83f05c..204ecc178a5 100644 --- a/graphics/GMT/patches/patch-aq +++ b/graphics/GMT/patches/patch-aq @@ -1,17 +1,19 @@ -$NetBSD: patch-aq,v 1.4 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-aq,v 1.5 2006/11/14 13:16:00 wennmach Exp $ + +Libtoolize. --- src/misc/makefile.orig Wed Apr 11 19:58:09 2001 +++ src/misc/makefile -@@ -6,7 +6,7 @@ - - include ../makegmt.macros +@@ -8,7 +8,7 @@ + GMTSRCDIR = .. + include ../gmtalldeps.macros -CDF = -L$(NETCDF)/lib -lnetcdf +CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include -@@ -30,7 +30,7 @@ +@@ -39,7 +39,7 @@ install: all for i in $(MISC); do \ @@ -20,12 +22,19 @@ $NetBSD: patch-aq,v 1.4 2005/06/22 08:34:54 jlam Exp $ done uninstall: -@@ -51,7 +51,7 @@ +@@ -59,11 +59,11 @@ + # program dependencies #------------------------------------------------------------------------------- - $(MISC): $(MISC_O) -- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@ -+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ +-$(MISC): $(MISC_O) $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L.. -L$(libdir) -lgmt $(CDF) $(LIBS) -o $@ ++$(MISC): $(MISC_O) ++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o $@ + +-$(MISCPS): $(MISCPS_O) $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L.. -L$(libdir) -lgmt -lgmtps -lpsl $(CDF) $(LIBS) -o $@ ++$(MISCPS): $(MISCPS_O) ++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libgmt.la ../libgmtps.la ../libpsl.la $(CDF) $(LIBS) -o $@ .c.o: - $(CC) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-ar b/graphics/GMT/patches/patch-ar index f03787db3ff..452871b337a 100644 --- a/graphics/GMT/patches/patch-ar +++ b/graphics/GMT/patches/patch-ar @@ -1,17 +1,19 @@ -$NetBSD: patch-ar,v 1.3 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-ar,v 1.4 2006/11/14 13:16:00 wennmach Exp $ ---- ./src/segyprogs/makefile.orig Wed Apr 11 19:58:09 2001 -+++ ./src/segyprogs/makefile -@@ -8,7 +8,7 @@ +Libtoolize. + +--- src/segyprogs/makefile.orig Wed Apr 11 19:58:09 2001 ++++ src/segyprogs/makefile +@@ -10,7 +10,7 @@ #------------------------- stop here -------------------------- CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include -I$(GMT_DEFAULT_PATH)/src --ALLLIB = -L.. -L$(libdir) -lgmt -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) -+ALLLIB = ../libgmt.la ../libpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) +-ALLLIB = -L.. -L$(libdir) -lgmt -lgmtps -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) ++ALLLIB = ../libgmt.la ../libgmtps.la ../libpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) SEGYPLOT_H = segy_io.h segy.h segyreel.h - SEGYPLOT_C = pssegyz.c pssegy.c -@@ -23,7 +23,7 @@ + SEGYPLOT_C = pssegyz.c pssegy.c segy2grd.c +@@ -25,7 +25,7 @@ install: all for i in $(SEGYPLOT); do \ @@ -20,17 +22,21 @@ $NetBSD: patch-ar,v 1.3 2005/06/22 08:34:54 jlam Exp $ done uninstall: -@@ -41,10 +41,10 @@ +@@ -43,12 +43,13 @@ \rm -f *.a segy_io.o: $(SEGYPLOT_H) segy_io.c - $(CC) -c $(CFLAGS) segy_io.c + @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) segy_io.c - $(SEGYPLOT): $(SEGYPLOT_O) segy_io.o +-$(SEGYPLOT): $(SEGYPLOT_O) segy_io.o $(GMTLIB) - $(CC) $(CFLAGS) segy_io.o $@.o -o $@ $(ALLLIB) $(LDFLAGS) ++$(SEGYPLOT): $(SEGYPLOT_O) segy_io.o + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) segy_io.lo $@.lo -o $@ $(ALLLIB) $(LDFLAGS) + $(SEGYPLOT_O): $(GMT_H) $(PS_H) + .c.o: - $(CC) -c $(CFLAGS) $< + @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< ++ diff --git a/graphics/GMT/patches/patch-as b/graphics/GMT/patches/patch-as index f746d915493..844a01eb6f0 100644 --- a/graphics/GMT/patches/patch-as +++ b/graphics/GMT/patches/patch-as @@ -1,9 +1,11 @@ -$NetBSD: patch-as,v 1.3 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-as,v 1.4 2006/11/14 13:16:00 wennmach Exp $ ---- ./src/spotter/makefile.orig Wed Apr 11 19:58:09 2001 -+++ ./src/spotter/makefile -@@ -19,7 +19,7 @@ - include ../makegmt.macros +Libtoolize. + +--- src/spotter/makefile.orig Wed Apr 11 19:58:09 2001 ++++ src/spotter/makefile +@@ -21,7 +21,7 @@ + include ../gmtalldeps.macros CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include -CDF = -L$(NETCDF)/lib -lnetcdf @@ -11,7 +13,7 @@ $NetBSD: patch-as,v 1.3 2005/06/22 08:34:54 jlam Exp $ SPOT_H = spotter.h -@@ -41,7 +41,7 @@ +@@ -43,7 +43,7 @@ install: all for i in $(SPOT); do \ @@ -20,11 +22,13 @@ $NetBSD: patch-as,v 1.3 2005/06/22 08:34:54 jlam Exp $ done uninstall: -@@ -73,7 +73,7 @@ +@@ -74,8 +74,8 @@ + # program dependencies #------------------------------------------------------------------------------- - $(SPOT): libspotter.a $(SPOT_O) -- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lspotter -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@ +-$(SPOT): libspotter.a $(SPOT_O) $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lspotter -L.. -L$(libdir) -lgmt $(CDF) $(LIBS) -o $@ ++$(SPOT): libspotter.a $(SPOT_O) + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo -L. -lspotter -L.. ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ .c.o: diff --git a/graphics/GMT/patches/patch-at b/graphics/GMT/patches/patch-at index 771bdd15c2c..f4bc26dfb1a 100644 --- a/graphics/GMT/patches/patch-at +++ b/graphics/GMT/patches/patch-at @@ -1,29 +1,31 @@ -$NetBSD: patch-at,v 1.6 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-at,v 1.7 2006/11/14 13:16:00 wennmach Exp $ + +Libtoolize. --- src/x2sys/makefile.orig 2003-05-01 14:08:38.000000000 +0300 +++ src/x2sys/makefile 2003-05-01 14:09:44.000000000 +0300 -@@ -7,7 +7,7 @@ +@@ -9,7 +9,7 @@ #------------------------- stop here -------------------------- - CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I../mgg -I$(NETCDF)/include --ALLLIB = -L.. -L$(libdir) -lgmt -L../mgg -lgmt_mgg -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) -+ALLLIB = ../libgmt.la ../mgg/libgmt_mgg.la ../libpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) + CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I../mgg -I../mgd77 -I$(NETCDF)/include +-ALLLIB = -L../mgd77 -lmgd77 -L../mgg -lgmt_mgg -L.. -L$(libdir) -lgmt -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) ++ALLLIB = ../mgd77/libmgd77.la ../mgg/libgmt_mgg.la ../libgmt.la ../libpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) XSYSTEM_H = x2sys.h - XSYSTEM_C = x2sys_datalist.c x2sys_cross.c -@@ -18,25 +18,21 @@ + XSYSTEM_C = x2sys_init.c x2sys_put.c x2sys_get.c x2sys_binlist.c x2sys_datalist.c x2sys_cross.c +@@ -20,26 +20,23 @@ #--------------------------------------------------------------- +-all: $(XSYSTEM) libx2sys.a ++all: $(XSYSTEM) libx2sys.la + -libx2sys.a: x2sys.o - $(AR) cvr libx2sys.a $? - $(RANLIB) libx2sys.a +libx2sys.la: x2sys.o + $(LIBTOOL) --mode=link $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(libdir) --all: $(XSYSTEM) libx2sys.a -+all: libx2sys.la $(XSYSTEM) - install: all - for i in $(XSYSTEM); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ @@ -32,6 +34,7 @@ $NetBSD: patch-at,v 1.6 2005/06/22 08:34:54 jlam Exp $ mkdir -p $(libdir); \ fi if [ ! $(libdir) = $(srcdir) ]; then \ + rm -f $(libdir)/libx2sys.*; \ - $(INSTALL) -m 444 libx2sys.a $(libdir); \ - if [ -f libx2sys.$(SL) ]; then \ - $(INSTALL) -m 444 libx2sys.$(SL) $(libdir); \ @@ -41,18 +44,19 @@ $NetBSD: patch-at,v 1.6 2005/06/22 08:34:54 jlam Exp $ + for i in $(XSYSTEM); do \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ + done - - uninstall: - for i in $(XSYSTEM); do \ -@@ -58,8 +54,8 @@ ++ + if [ ! -d $(datadir)/x2sys ]; then \ + mkdir -p $(datadir)/x2sys; \ + fi +@@ -68,8 +65,8 @@ spotless: clean \rm -f *.a --$(XSYSTEM): $(XSYSTEM_O) libx2sys.a +-$(XSYSTEM): $(XSYSTEM_O) libx2sys.a $(GMTLIB) - $(CC) $(CFLAGS) $@.o -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS) +$(XSYSTEM): $(XSYSTEM_O) libx2sys.la + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $@.lo -o $@ libx2sys.la $(ALLLIB) $(LDFLAGS) - .c.o: + .c.o: $(XSYSTEM_H) $(GMT_H) - $(CC) -c $(CFLAGS) $< + @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-au b/graphics/GMT/patches/patch-au index 3a6c7ce73a2..f3d1ebd750d 100644 --- a/graphics/GMT/patches/patch-au +++ b/graphics/GMT/patches/patch-au @@ -1,19 +1,19 @@ -$NetBSD: patch-au,v 1.3 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-au,v 1.4 2006/11/14 13:16:00 wennmach Exp $ + +Libtoolize. --- src/x_system/makefile.orig Wed Apr 11 19:58:09 2001 +++ src/x_system/makefile -@@ -20,8 +20,8 @@ - include ../makegmt.macros +@@ -23,7 +23,7 @@ # --CFLAGS = $(CC_OPT) $(WIN32) -I$(includedir) -I../mgg -I$(NETCDF)/include --ALLLIB = -L$(libdir) -lgmt -L../mgg -lgmt_mgg -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) -+CFLAGS = $(CC_OPT) $(WIN32) -I$(includedir) -I.. -I../mgg -I$(NETCDF)/include -+ALLLIB = ../libgmt.la ../mgg/libgmt_mgg.la ../libpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) + CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I../mgg -I$(NETCDF)/include +-ALLLIB = -L../mgg -lgmt_mgg -L.. -L$(libdir) -lgmt -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) ++ALLLIB = ../mgg/libgmt_mgg.la ../libgmt.la ../libpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) ALL_C = x_edit.c x_init.c x_list.c x_over.c x_report.c x_remove.c x_setup.c x_solve_dc_drift.c x_update.c -@@ -35,7 +35,7 @@ +@@ -37,7 +37,7 @@ install: all for i in $(ALL); do \ @@ -22,16 +22,17 @@ $NetBSD: patch-au,v 1.3 2005/06/22 08:34:54 jlam Exp $ done uninstall: -@@ -56,9 +56,10 @@ +@@ -57,10 +57,10 @@ + # program dependencies #------------------------------------------------------------------------------- - $(ALL): $(ALL_O) +-$(ALL): $(ALL_O) $(GMTLIB) - $(CC) $(CFLAGS) $(LDFLAGS) $@.o $(ALLLIB) -o $@ ++$(ALL): $(ALL_O) + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo $(ALLLIB) -o $@ .c.o: - $(CC) -c $(CFLAGS) $< + @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< - $(ALL_O): x_system.h -+ + $(ALL_O): x_system.h $(GMT_H) diff --git a/graphics/GMT/patches/patch-av b/graphics/GMT/patches/patch-av deleted file mode 100644 index bb09c47d280..00000000000 --- a/graphics/GMT/patches/patch-av +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-av,v 1.1 2001/01/27 08:16:02 jtb Exp $ - ---- src/x_system/x_solve_dc_drift.c.orig Sun Dec 10 14:02:39 2000 -+++ src/x_system/x_solve_dc_drift.c -@@ -354,7 +354,7 @@ - - if (n_iterations == 0) { - printf ("One more iteration?: "); -- gets(string); -+ fgets(string, sizeof(string), stdin); - if (string[0] == 'N' || string[0] == 'n') ok = FALSE; - } - else if (iteration >= n_iterations) diff --git a/graphics/GMT/patches/patch-aw b/graphics/GMT/patches/patch-aw deleted file mode 100644 index 3964228f735..00000000000 --- a/graphics/GMT/patches/patch-aw +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-aw,v 1.2 2001/04/20 17:16:19 jtb Exp $ - ---- src/meca/meca.h.orig Fri Dec 29 22:10:37 2000 -+++ src/meca/meca.h -@@ -2,4 +2,5 @@ - #include <stdio.h> - #include <math.h> -+#include <sys/types.h> - - #define EPSIL 0.0001 diff --git a/graphics/GMT/patches/patch-ax b/graphics/GMT/patches/patch-ax deleted file mode 100644 index ec00ed2e53c..00000000000 --- a/graphics/GMT/patches/patch-ax +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ax,v 1.2 2001/04/19 20:51:33 jtb Exp $ - ---- Makefile.orig Wed Apr 18 09:22:35 2001 -+++ Makefile -@@ -62,7 +62,7 @@ - # !! STOP EDITING HERE, THE REST IS FIXED !! - #------------------------------------------------------------------------------- - --SUPPL = cps dbase gshhs imgsrc meca mex mgg misc segyprogs spotter x2sys x_system xgrid -+SUPPL = cps dbase gshhs imgsrc meca mgg misc segyprogs spotter x2sys x_system xgrid - SUPPL_M = cps dbase imgsrc meca mgg misc segyprogs spotter x2sys x_system - - all: gmt suppl -@@ -85,7 +85,7 @@ - $(MAKE) uninstall; \ - cd .. - --suppl: gmtmacros mex_config xgrid_config -+suppl: gmtmacros xgrid_config - for d in $(SUPPL); do \ - if [ -d src/$$d ] && [ ! -f src/$$d/.skip ]; then \ - cd src/$$d; \ -@@ -109,7 +109,7 @@ - \rm -f config.{cache,log,status}; \ - ./configure; \ - fi -- -+ - xgrid_config: - if [ ! -f src/xgrid/makefile ]; then \ - cd src/xgrid; \ -@@ -227,7 +227,7 @@ - else \ - echo "Install wrapper man directory the same as distribution man directory - nothing installed"; \ - fi -- -+ - run-examples: - if [ -d examples ]; then \ - cd examples; \ diff --git a/graphics/GMT/patches/patch-ay b/graphics/GMT/patches/patch-ay index 7425e241d08..8f10ff3f093 100644 --- a/graphics/GMT/patches/patch-ay +++ b/graphics/GMT/patches/patch-ay @@ -1,22 +1,24 @@ -$NetBSD: patch-ay,v 1.5 2001/04/20 17:16:19 jtb Exp $ +$NetBSD: patch-ay,v 1.6 2006/11/14 13:16:00 wennmach Exp $ ---- src/dbase/grdraster.c.orig Wed Apr 11 23:07:29 2001 -+++ src/dbase/grdraster.c -@@ -41,7 +41,7 @@ - BOOLEAN swap_me; /* TRUE if data set need to be swapped */ - }; +Change method to determine endianness and adapt to pkgsrc directory structure. + +--- src/dbase/grdraster.c.orig 2006-11-13 15:56:13.000000000 +0100 ++++ src/dbase/grdraster.c 2006-11-13 15:59:44.000000000 +0100 +@@ -50,7 +50,7 @@ + { + BOOLEAN xyz_out = FALSE; -#if WORDS_BIGENDIAN == 0 +#if BYTE_ORDER == LITTLE_ENDIAN char my_endian = 'L'; /* This machine is Little endian */ #else char my_endian = 'B'; /* This machine is Big endian */ -@@ -601,7 +601,7 @@ - struct RASTER_INFO *rasinfo; +@@ -646,7 +646,7 @@ - if ((d = getenv ("GMT_GRIDDIR")) == CNULL) /* Look in default location */ -- sprintf (dir, "%s%cshare%cdbase\0", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (dir, "%s%cshare%cgmt%cdbase\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); - else - strcpy (dir, d); + /* Find and open the file grdraster.info */ +- if (!(GMT_getdatapath("grdraster.info", dir) || GMT_getsharepath("dbase", "grdraster", ".info", dir))) { ++ if (!(GMT_getdatapath("grdraster.info", dir) || GMT_getsharepath("gmt/dbase", "grdraster", ".info", dir))) { + fprintf(stderr, "%s: ERROR cannot find file grdraster.info", GMT_program); + return (0); + } diff --git a/graphics/GMT/patches/patch-az b/graphics/GMT/patches/patch-az index bc75ab3b1ce..90e48b6149f 100644 --- a/graphics/GMT/patches/patch-az +++ b/graphics/GMT/patches/patch-az @@ -1,13 +1,15 @@ -$NetBSD: patch-az,v 1.2 2001/04/19 20:51:33 jtb Exp $ +$NetBSD: patch-az,v 1.3 2006/11/14 13:16:00 wennmach Exp $ ---- src/dbase/grdraster.man.orig Thu Apr 12 00:08:51 2001 -+++ src/dbase/grdraster.man +Adapt to pkgsrc directory structure. + +--- src/dbase/grdraster.man.orig 2006-11-13 16:02:21.000000000 +0100 ++++ src/dbase/grdraster.man 2006-11-13 16:03:13.000000000 +0100 @@ -8,7 +8,7 @@ .SH DESCRIPTION - \fBgrdraster\fP reads a file called \fIgrdraster.info\fP from the directory - pointed to by the environment parameter $GMT_GRIDDIR (if this parameter is --not set it defaults to $GMTHOME/share/dbase). The info file defines binary -+not set it defaults to $GMTHOME/share/gmt/dbase). The info file defines binary - arrays of data stored in scan-line format in data files. Each file is given - a \fIfilenumber\fP in the info file. \fBgrdraster\fP figures out how to - load the raster data into a grd file spanning a region defined by \fB\-R\fP. + \fBgrdraster\fP reads a file called \fIgrdraster.info\fP from the current + working directory, the directories pointed to by the environment variables +-\fB$GMT_USERDIR\fP and \fB$GMT_GRIDDIR\fP, or in \fB$GMTHOME\fP/share/dbase ++\fB$GMT_USERDIR\fP and \fB$GMT_GRIDDIR\fP, or in \fB$GMTHOME\fP/share/gmt/dbase + (in that order). The file \fIgrdraster.info\fP defines binary + arrays of data stored in scan-line format in data files. Each file is given + a \fIfilenumber\fP in the info file. \fBgrdraster\fP figures out how to diff --git a/graphics/GMT/patches/patch-ba b/graphics/GMT/patches/patch-ba new file mode 100644 index 00000000000..e07b805d750 --- /dev/null +++ b/graphics/GMT/patches/patch-ba @@ -0,0 +1,98 @@ +$NetBSD: patch-ba,v 1.1 2006/11/14 13:16:00 wennmach Exp $ + +Libtoolize. + +--- src/mgd77/makefile.orig 2006-11-08 21:19:37.000000000 +0100 ++++ src/mgd77/makefile 2006-11-08 21:28:05.000000000 +0100 +@@ -21,7 +21,7 @@ + include ../gmtalldeps.macros + + CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include +-CDF = -L$(NETCDF)/lib -lnetcdf ++CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf + + MGD77_H = mgd77.h mgd77defaults.h mgd77_IGF_coeffs.h mgd77sniffer.h mgd77snifferdefaults.h mgd77magref.h mgd77_codes.h + +@@ -45,7 +45,7 @@ + + MGD77PS = $(MGD77PS_C:.c=) + +-all: libmgd77.a $(MGD77) $(MGD77PS) ++all: libmgd77.la $(MGD77) $(MGD77PS) + $(MGD77_O): $(MGD77_H) $(GMT_H) + $(MGD77PS_O): $(MGD77_H) $(GMT_H) $(PS_H) + $(LIB_O): $(LIB_H) +@@ -53,26 +53,23 @@ + #------------------------------------------------------------------------------- + + install: all ++ if [ ! -d $(libdir) ]; then \ ++ mkdir -p $(libdir); \ ++ fi ++ if [ ! $(libdir) = $(srcdir) ]; then \ ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) libmgd77.la $(libdir); \ ++ fi + for i in $(MGD77) $(MGD77PS); do \ +- $(INSTALL) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ + done + if [ ! -d $(includedir) ]; then \ + mkdir -p $(includedir); \ + fi + if [ ! $(includedir) = $(srcdir) ]; then \ + for i in $(LIB_H); do \ +- $(INSTALL) -m 444 $$i $(includedir); \ ++ $(INSTALL_DATA) $$i $(includedir); \ + done; \ + fi +- if [ ! -d $(libdir) ]; then \ +- mkdir -p $(libdir); \ +- fi +- if [ ! $(libdir) = $(srcdir) ]; then \ +- $(INSTALL) -m 444 libmgd77.a $(libdir); \ +- if [ -f libmgd77.$(SL) ]; then \ +- $(INSTALL) -m 444 libmgd77.$(SL) $(libdir); \ +- fi; \ +- fi + + uninstall: + for i in $(MGD77) $(MGD77PS); do \ +@@ -91,7 +88,7 @@ + fi + + clean: +- rm -f *.o ++ rm -f *.o *.lo + for i in $(MGD77) $(MGD77PS); do \ + rm -f $$i$(EXE); \ + done +@@ -103,21 +100,20 @@ + # library + #------------------------------------------------------------------------------- + +-libs: libmgd77.a ++libs: libmgd77.la + +-libmgd77.a: $(LIB_O) +- $(AR) cvur $@ $? +- $(RANLIB) $@ ++libmgd77.la: $(LIB_O) ++ @$(LIBTOOL) --mode=link $(CC) -o libmgd77.la $(LIB_O:.o=.lo) --version-info 0:0 -rpath $(libdir) + + #------------------------------------------------------------------------------- + # program dependencies + #------------------------------------------------------------------------------- + +-$(MGD77): $(MGD77_O) libmgd77.a $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lmgd77 -L.. -L$(libdir) -lgmt $(CDF) $(LIBS) -o $@ ++$(MGD77): $(MGD77_O) libmgd77.la ++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libmgd77.la ../libgmt.la $(CDF) $(LIBS) -o $@ + +-$(MGD77PS): $(MGD77PS_O) libmgd77.a $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lmgd77 -L.. -L$(libdir) -lgmt -lgmtps -lpsl $(CDF) $(LIBS) -o $@ ++$(MGD77PS): $(MGD77PS_O) libmgd77.la ++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libmgd77.la ../libgmt.la ../libgmtps.la ../libpsl.la $(CDF) $(LIBS) -o $@ + + .c.o: +- $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-bb b/graphics/GMT/patches/patch-bb new file mode 100644 index 00000000000..9f1a522ac13 --- /dev/null +++ b/graphics/GMT/patches/patch-bb @@ -0,0 +1,60 @@ +$NetBSD: patch-bb,v 1.1 2006/11/14 13:16:00 wennmach Exp $ + +Libtoolize. + +--- src/xgrid/makefile.in.orig 2006-11-08 22:19:31.000000000 +0100 ++++ src/xgrid/makefile.in 2006-11-08 22:28:27.000000000 +0100 +@@ -10,7 +10,7 @@ + GMTSRCDIR = .. + include ../gmtalldeps.macros + +-CDF = -L$(NETCDF)/lib -lnetcdf ++CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf + + OBJS= xgrid_utility.o xgrid_Xutility.o xgrid_Canvas.o \ + xgrid_Panner.o xgrid_GMTgrid.o xgrid_controls.o \ +@@ -21,14 +21,14 @@ + # Location of GMT and CDF header files + + CFLAGS= $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include @X_CFLAGS@ @CFLAGS@ +-XLIBS=@X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXmu -lXext -lX11 @X_EXTRA_LIBS@ -L.. -L$(libdir) -lgmt -lpsl -lnetcdf ++XLIBS=@X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXmu -lXext -lX11 @X_EXTRA_LIBS@ ../libgmt.la ../libpsl.la $(CDF) + + all: @buildtarget@ + + install: @buildtarget@ @installtarget@ + + xgridedit-install: +- $(INSTALL) xgridedit$(EXE) $(bindir) ++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xgridedit$(EXE) $(bindir) + + uninstall: + \rm -f $(bindir)/xgridedit$(EXE) +@@ -37,15 +37,15 @@ + \rm -f makefile config.cache config.log config.status + + clean: +- rm -f *.o xgridedit$(EXE) .gmt* ++ rm -f *.o *.lo xgridedit$(EXE) .gmt* + +-xgridedit: $(OBJS) $(EDITOBJS) xgridedit.o $(GMTLIB) +- $(CC) $(CFLAGS) xgridedit.o -o xgridedit $(OBJS) \ +- $(EDITOBJS) $(CDF) $(XLIBS) $(LIBS) $(LDFLAGS) ++xgridedit: $(OBJS) $(EDITOBJS) xgridedit.o ++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $@.o -o $@ \ ++ $(OBJS) $(EDITOBJS) $(CDF) $(XLIBS) $(LIBS) $(LDFLAGS) + + xgridedit.o: xGridEdit.c xgrid_utility.h xgrid_controls.h \ + xgrid_messages.h xgrid_view.h xgrid_textInput.h $(GMT_H) +- $(CC) $(CFLAGS) -c xGridEdit.c -o xgridedit.o ++ @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c xGridEdit.c -o xgridedit.o + + xgrid_utility.o: xgrid_utility.h + +@@ -71,3 +71,6 @@ + + xgrid_view.o: xgrid_utility.h xgrid_Xutility.h xgrid_GMTgrid.h \ + xgrid_view.h $(GMT_H) ++ ++.c.o: ++ @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-bc b/graphics/GMT/patches/patch-bc new file mode 100644 index 00000000000..7707a5ce571 --- /dev/null +++ b/graphics/GMT/patches/patch-bc @@ -0,0 +1,27 @@ +$NetBSD: patch-bc,v 1.1 2006/11/14 13:16:00 wennmach Exp $ + +Adapt to pkgsrc directory structure. + +--- src/gmt_shore.c.orig 2006-11-13 21:01:20.000000000 +0100 ++++ src/gmt_shore.c 2006-11-13 21:04:36.000000000 +0100 +@@ -957,7 +957,7 @@ + + /* This is the order of checking: + * 1. Is there a GMT_USERDIR with a coastline.conf in it? If so use its information +- * 2. Look in GMTHOME/share/coast ++ * 2. Look in GMTHOME/share/gmt/coast + * 3. Look in GMTHOME/share (backward check) + * 4. Look for GMTHOME/share/coastline.conf and use its information + * 5. Give up +@@ -971,9 +971,9 @@ + if (found) return (TRUE); + } + +- /* 2. Then check the $GMTHOME/share/coast directory */ ++ /* 2. Then check the $GMTHOME/share/gmt/coast directory */ + +- sprintf (path, "%s%cshare%ccoast%c%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); ++ sprintf (path, "%s%cshare%cgmt%ccoast%c%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); + if (!access (path, R_OK)) return (TRUE); /* File exists and is readable, return with name */ + + /* File was not readable. Now check if it exists */ |