diff options
| author | jtb <jtb@pkgsrc.org> | 2001-04-19 20:51:30 +0000 |
|---|---|---|
| committer | jtb <jtb@pkgsrc.org> | 2001-04-19 20:51:30 +0000 |
| commit | d43e77975ba39e3e8d73990e695f887c35d804cd (patch) | |
| tree | dacfc8a80b269f51d493ee01239a3630299d6bec /graphics/GMT | |
| parent | 65c1175e78ca81e5cc5cb01253e2f577a575a85b (diff) | |
| download | pkgsrc-d43e77975ba39e3e8d73990e695f887c35d804cd.tar.gz | |
Update of GMT to 3.4. See
http://imina.soest.hawaii.edu/gmt/gmt/gmt_releases.html
for details of changes.
Diffstat (limited to 'graphics/GMT')
26 files changed, 538 insertions, 657 deletions
diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile index 795bf5e844c..871ef6242a8 100644 --- a/graphics/GMT/Makefile +++ b/graphics/GMT/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2001/04/14 21:43:42 jtb Exp $ +# $NetBSD: Makefile,v 1.12 2001/04/19 20:51:30 jtb Exp $ -DISTNAME= GMT3.3.6 -PKGNAME= GMT-3.3.6 +DISTNAME= GMT3.4 +PKGNAME= GMT-3.4 CATEGORIES= graphics MASTER_SITES= ftp://gmt.soest.hawaii.edu/pub/gmt/ \ ftp://falcon.grdl.noaa.gov/pub/gmt/ \ @@ -9,40 +9,35 @@ MASTER_SITES= ftp://gmt.soest.hawaii.edu/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.3.6_progs.tar.bz2 GMT3.3.6_doc.tar.bz2 GMT_share.tar.bz2 \ - GMT3.3.6_suppl.tar.bz2 GMT3.3.6_scripts.tar.bz2 \ - GMT3.3.6_web.tar.bz2 +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 MAINTAINER= packages@netbsd.org HOMEPAGE= http://imina.soest.hawaii.edu/gmt/ COMMENT= Generic Mapping Tools DEPENDS+= netcdf>=3.2:../../devel/netcdf -BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf EXTRACT_SUFFIX= .tar.bz2 +DIST_SUBDIR= ${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME} -USE_X11= yes -USE_XAW= yes -DIST_SUBDIR= GMT + GNU_CONFIGURE= yes USE_LIBTOOL= yes EVAL_PREFIX+= NETCDF=netcdf -CONFIGURE_ARGS+="--includedir=${PREFIX}/include/gmt" -CONFIGURE_ARGS+="--datadir=${PREFIX}/share/gmt" -CONFIGURE_ARGS+="--enable-eps" -CONFIGURE_ARGS+="--enable-www=${PREFIX}/share/doc/html" -CONFIGURE_ARGS+="--enable-mansect=1" +CONFIGURE_ARGS+=--includedir=${PREFIX}/include/gmt +CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gmt +CONFIGURE_ARGS+=--enable-eps +CONFIGURE_ARGS+=--enable-www=${PREFIX}/share/doc/html +CONFIGURE_ARGS+=--enable-mansect=1 ALL_TARGET= all suppl INSTALL_TARGET= install-all post-extract: ${MV} -f ${WRKSRC}/www/gmt/doc/ps/ ${WRKSRC} - -pre-configure: - (cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf) ${RM} -f ${WRKSRC}/examples/*.bat ${WRKSRC}/examples/*/*.bat for f in ${WRKSRC}/examples/do_view.bash \ ${WRKSRC}/examples/do_view.csh; do \ @@ -52,34 +47,18 @@ pre-configure: post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gmt - for f in GMT_Docs.ps GMT_Tutorial.ps; do \ - ${INSTALL_DATA} ${WRKSRC}/ps/$$f ${PREFIX}/share/doc/gmt; \ - done + cd ${WRKSRC}/ps && ${INSTALL_DATA} GMT_Docs.ps GMT_Tutorial.ps \ + ${PREFIX}/share/doc/gmt (cd ${PREFIX}/share/doc/html/gmt/doc && ${LN} -sf \ ../../../gmt ps) ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt/tutorial - for f in bermuda.grd quakes.cpt ship.xyz us.grd data quakes.ngdc \ - topo.cpt; do \ - ${INSTALL_DATA} ${WRKSRC}/tutorial/$$f \ - ${PREFIX}/share/examples/gmt/tutorial; \ - done; + cd ${WRKSRC}/tutorial && ${INSTALL_DATA} bermuda.grd quakes.cpt \ + ship.xyz us.grd data quakes.ngdc \ + ${PREFIX}/share/examples/gmt/tutorial; ${INSTALL_DATA} ${WRKSRC}/../share/* ${PREFIX}/share/gmt - for i in ${WRKSRC}/examples/*.bash ${WRKSRC}/examples/*.csh \ - ${WRKSRC}/examples/README.SCRIPTS; do \ - ${INSTALL_DATA} $$i ${PREFIX}/share/examples/gmt; \ - done ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt - for f in README.SCRIPTS do_examples.bash do_examples.csh \ - do_view.bash do_view.csh; do \ - ${INSTALL_DATA} ${WRKSRC}/examples/$$f \ - ${PREFIX}/share/examples/gmt; \ - done - for i in 01 02 03 04 05 06 07 08 09 10 \ - 11 12 13 14 15 16 17 18 19 20; do \ - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt/ex$$i; \ - for j in ${WRKSRC}/examples/ex$$i/*; do \ - ${INSTALL_DATA} $$j ${PREFIX}/share/examples/gmt/ex$$i; \ - done; \ - done + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/examples/ + (cd ${WRKSRC}/examples; ${GTAR} cf - . ) | \ + (cd ${PREFIX}/share/examples/gmt/; ${GTAR} xvf - ) .include "../../mk/bsd.pkg.mk" diff --git a/graphics/GMT/distinfo b/graphics/GMT/distinfo index a6bd15cdf40..2de17bc6062 100644 --- a/graphics/GMT/distinfo +++ b/graphics/GMT/distinfo @@ -1,34 +1,44 @@ -$NetBSD: distinfo,v 1.1 2001/04/17 11:22:36 agc Exp $ +$NetBSD: distinfo,v 1.2 2001/04/19 20:51:30 jtb Exp $ -MD5 (GMT/GMT3.3.6_progs.tar.bz2) = f727d799357583a2b901d832d37d561d -MD5 (GMT/GMT3.3.6_doc.tar.bz2) = 2c025e7fcd997a58bafbebba1138cd9e -MD5 (GMT/GMT_share.tar.bz2) = 35a67867ecbb8461690109beb663f317 -MD5 (GMT/GMT3.3.6_suppl.tar.bz2) = e9aaf803366856993c341e2d70c6e85e -MD5 (GMT/GMT3.3.6_scripts.tar.bz2) = 75118b19340b5b918562cae462f9d692 -MD5 (GMT/GMT3.3.6_web.tar.bz2) = 7bd286c088a166651456e203e5647665 -SHA1 (patch-aa) = 75b073c40bcff5bde65b4aeb25f164dbac4519d5 -SHA1 (patch-ab) = 3707fa9b99b72aceacae8266998b700dd377ca59 -SHA1 (patch-ac) = c314d354f78c35227be0a5d2df266fe2c18c6e93 -SHA1 (patch-ad) = fea2b81ecb54a643abbaaea21b786615442bb2ea -SHA1 (patch-ae) = f87c702fbe91f77ec0273a0515be923e24615a91 -SHA1 (patch-af) = 738950d60a7c1b7eaafbb8f0f4144ae9790f9144 -SHA1 (patch-ag) = da95b6e041a3fa2d5476115b39d4d2c0f7ead3c1 -SHA1 (patch-ah) = 3a8e3ee14a309f3760ce06336f47a8c6560bba4c -SHA1 (patch-ai) = 7ba770e49bcd06adea0696ec406285339cb54f31 +SHA1 (GMT3.4/GMT3.4_progs.tar.bz2) = b9fa8f60fe20ff9509ef3ebdf15fcc74e01d3f95 +Size (GMT3.4/GMT3.4_progs.tar.bz2) = 551406 bytes +SHA1 (GMT3.4/GMT3.4_suppl.tar.bz2) = 9e961d24d804e71c9b4f32bce729899c56dde360 +Size (GMT3.4/GMT3.4_suppl.tar.bz2) = 534636 bytes +SHA1 (GMT3.4/GMT_share.tar.bz2) = da4496d09010d9a562da6bfa303e6c5942bb6bc5 +Size (GMT3.4/GMT_share.tar.bz2) = 3662173 bytes +SHA1 (GMT3.4/GMT3.4_ps.tar.bz2) = 5490ad074e8801c1b1dc85108d3ebf3c0d2b1746 +Size (GMT3.4/GMT3.4_ps.tar.bz2) = 3140145 bytes +SHA1 (GMT3.4/GMT3.4_man.tar.bz2) = 3f33b1eee6c47faf3f8d2d6c7efb27b57b88c303 +Size (GMT3.4/GMT3.4_man.tar.bz2) = 86015 bytes +SHA1 (GMT3.4/GMT3.4_tut.tar.bz2) = 64476de1f504a3561574705a52cd87fee82dae67 +Size (GMT3.4/GMT3.4_tut.tar.bz2) = 986173 bytes +SHA1 (GMT3.4/GMT3.4_scripts.tar.bz2) = a0013ce9141cb668df1af5025ac54cb09fab6b7c +Size (GMT3.4/GMT3.4_scripts.tar.bz2) = 3050798 bytes +SHA1 (GMT3.4/GMT3.4_web.tar.bz2) = efbde777b67d45cf706b680f23c0171bc983c4e3 +Size (GMT3.4/GMT3.4_web.tar.bz2) = 1644571 bytes +SHA1 (patch-aa) = b36fa4900d8f27b1c9663172ccf95b8810f0afcc +SHA1 (patch-ab) = 51e6616f5c08c7e1f0ae414f310b01e42c90e91f +SHA1 (patch-ac) = d4ae35538313806567af7f077ad3d5b73ceea3dc +SHA1 (patch-ad) = e59e871e51e9a46909de5ec389cad5744de62016 +SHA1 (patch-ae) = e543e7593b949e1476d9f8b8f85b65a892967fb1 +SHA1 (patch-af) = eac4b86614b6ffe88a3790b37b3f0b17f999947d +SHA1 (patch-ag) = d78cf5b95dd18e4aa5aca68fd62a5793ec7d966f +SHA1 (patch-ah) = 80fe4869af2c3c2eacf4f24dd9e6585153479f41 +SHA1 (patch-ai) = 039e4164425eed0a3ea03867cce3f55c0ee36d4a SHA1 (patch-aj) = a24396010796de92963b30ef1e8709bddbda0f83 -SHA1 (patch-ak) = 683832fa858b98f07b592abf9d892ff125a2d38f -SHA1 (patch-al) = ba832c377d6b01118b53c3fb8833d09d8cb022ec -SHA1 (patch-am) = 68a2e6011e27a53120998f74aee36b0afc46a402 -SHA1 (patch-an) = bdd7d552c69d82edd86ca0b1be68d449f787f402 -SHA1 (patch-ao) = 777182dafb5dd8b29a970faa3210885d6cc06341 -SHA1 (patch-ap) = 695b5873af36d256dbdd1c56e016296b68969416 -SHA1 (patch-aq) = 44da0f5af6d2462e401fd68a117de74869dbe5e8 -SHA1 (patch-ar) = 6dbf662a6781ab36c59b7a81399e151792443a85 -SHA1 (patch-as) = d8cd515386282addd2a8986ea3e91083f9faee16 -SHA1 (patch-at) = fbb76939958209d15107e6fdee979b60d93a592d -SHA1 (patch-au) = 3c59b16d995de7b0b3cb837971dbcd995b34c685 +SHA1 (patch-ak) = 78a08380047c154cf11ad41d94619e05375b7a6d +SHA1 (patch-al) = 56df465d532b01c8ea065717e6a66799cc1a8916 +SHA1 (patch-am) = cbff4b734cabea337a504779d92a17584064a9f0 +SHA1 (patch-an) = c043f414d4bf96a788637663f81eb3eb46f65995 +SHA1 (patch-ao) = 671e4bfb66628e231e193c807aca8866cc09cc52 +SHA1 (patch-ap) = 3475a19a50375dd50aba4ac0dda0d55acc085635 +SHA1 (patch-aq) = cb36055875a8de6a7fa894b2b747dd148c7a132e +SHA1 (patch-ar) = f5628cff11b6330207c3c87217c8c00eb2f596e5 +SHA1 (patch-as) = 42da16147de379bc55a0f6e0f4e7aeb62cfc9843 +SHA1 (patch-at) = 5a33fbc5231cdf0fe569be5f87e7ac34b5393829 +SHA1 (patch-au) = d4ac8225cdd83f81b71af7ca26d79a45bb76e283 SHA1 (patch-av) = fcc8aafb4a8163c0eb38744b9c7a05162d57db08 SHA1 (patch-aw) = 52375a2781c5e8085d84dbee245b6bae2d6eb2cf -SHA1 (patch-ax) = 745fdb9e572f4ffb4564206069f9fa60e2069547 -SHA1 (patch-ay) = 67e36ed193f062d1216ee6ee9e52c62bc6c5b30d -SHA1 (patch-az) = 442c210689410914cb68c2597903c3c21fa98942 +SHA1 (patch-ax) = 2475174e67f445a0f025cf409832676dfda96db9 +SHA1 (patch-ay) = 7ed3c53a48d8387bb4fb2a0b51bddc07bafd08d7 +SHA1 (patch-az) = 4db3d50e182e2efb7d60ae7746c062dfffed5f2f diff --git a/graphics/GMT/patches/patch-aa b/graphics/GMT/patches/patch-aa index 06c3f73c070..2deb46b7f08 100644 --- a/graphics/GMT/patches/patch-aa +++ b/graphics/GMT/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2001/01/29 04:10:39 jtb Exp $ +$NetBSD: patch-aa,v 1.6 2001/04/19 20:51:31 jtb Exp $ ---- src/Makefile.orig Wed Oct 18 03:30:08 2000 +--- src/Makefile.orig Fri Mar 9 19:20:44 2001 +++ src/Makefile @@ -43,7 +43,7 @@ NETCDFLIB = $(NETCDF)/lib @@ -18,19 +18,19 @@ $NetBSD: patch-aa,v 1.5 2001/01/29 04:10:39 jtb Exp $ -SHARED_LIB = libpsl.a libgmt.a libpsl.$(SL) libgmt.$(SL) -STATIC_LIB = libpsl.a libgmt.a +SHARED_LIB = libpsl.la libgmt.la -+STATIC_LIB = ++STATIC_LIB = #------------------------------------------------------------------------------- all: init libs $(PROGS) - init: gmt_notposix.h gmt_nan.h + init: gmtmacros gmt_notposix.h gmt_nan.h - + - gmt_nan.h: - $(CC) $(CFLAGS) gmt_nan_init.c $(CDF) $(LIBS) -o gmt_nan_init - $(COMPRESS) gmt_nan_init$(EXE) -@@ -156,23 +156,19 @@ + 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 @@ ./configure install: all @@ -40,6 +40,7 @@ $NetBSD: patch-aa,v 1.5 2001/01/29 04:10:39 jtb Exp $ - for i in $(PROGS); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ - done +- $(INSTALL) GMT $(bindir) if [ ! -d $(libdir) ]; then \ mkdir -p $(libdir); \ fi @@ -50,71 +51,71 @@ $NetBSD: patch-aa,v 1.5 2001/01/29 04:10:39 jtb Exp $ - $(INSTALL) -m 444 libpsl.$(SL) $(libdir); \ - $(INSTALL) -m 444 libgmt.$(SL) $(libdir); \ - fi; \ -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) libpsl.la $(libdir);\ -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) libgmt.la $(libdir);\ -+ fi -+ if [ ! -d $(bindir) ]; then \ -+ mkdir -p $(bindir); \ ++ $(LIBTOOL) $(INSTALL_DATA) libpsl.la $(libdir); \ ++ $(LIBTOOL) $(INSTALL_DATA) libgmt.la $(libdir); \ fi -+ for i in $(PROGS); do \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ -+ done if [ ! -d $(includedir) ]; then \ mkdir -p $(includedir); \ fi -@@ -187,11 +183,7 @@ - \rm -f $(bindir)/$$i$(EXE); \ - done - if [ ! $(libdir) = $(srcdir) ]; then \ -- \rm -f $(libdir)/libgmt.a $(libdir)/libpsl.a; \ -- if [ -f libpsl.$(SL) ]; then \ -- \rm -f $(libdir)/libpsl.$(SL); \ -- \rm -f $(libdir)/libgmt.$(SL); \ -- fi; \ -+ \rm -f $(libdir)/libgmt.* $(libdir)/libpsl.*; \ - fi if [ ! $(includedir) = $(srcdir) ]; then \ for i in $(GMT_H); do \ -@@ -200,7 +192,7 @@ +- $(INSTALL) -m 444 $$i $(includedir); \ ++ $(INSTALL_DATA) $$i $(includedir); \ + done; \ + fi ++ if [ ! -d $(bindir) ]; then \ ++ mkdir -p $(bindir); \ ++ fi ++ for i in $(PROGS); do \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ done ++ $(INSTALL) GMT $(bindir) + + uninstall: + for i in $(PROGS); do \ +@@ -208,13 +204,13 @@ fi clean: - rm -f *.o gmt_nan_init$(EXE) -+ rm -rf *.o *.lo .libs libgmt.la libpsl.la gmt_nan_init$(EXE) ++ rm -f *.o *.lo gmt_nan_init$(EXE) for i in $(PROGS); do \ rm -f $$i$(EXE); \ done -@@ -214,31 +206,27 @@ - # libraries - #------------------------------------------------------------------------------- --libs: $(GMTLIB) -+libs: libpsl.la libgmt.la + 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 + touch makegmt.macros + + distclean: spotless +@@ -225,29 +221,24 @@ + + libs: $(GMTLIB) -libpsl.a: pslib.o - $(AR) cvur libpsl.a $? - $(RANLIB) libpsl.a -+libpsl.la: pslib.o -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ \ -+ pslib.lo -lm -rpath $(libdir) --version-info 0:0 ++libpsl.la: pslib.o ++ @$(LIBTOOL) $(CC) -o $@ pslib.lo $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir) pslib.o: pslib.c $(PS_H) - $(CC) $(CFLAGS) -c pslib.c -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c pslib.c - +- -libgmt.a: $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) - $(AR) cvur $@ $? - $(RANLIB) $@ - -libpsl.$(SL): pslib.o - $(LD) $(LD_OPT) $? -o $@ -- ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) -c pslib.c + -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) $(CFLAGS) -o $@ \ -+ $(LIB_O:.o=.lo) $(TRIANGLE_O:.o=.lo) $(ALPHA_SINCOS_O.o=.lo) \ -+ $(LDFLAGS) $(CDF) $(LIBS) -rpath $(libdir) --version-info 0:0 ++libgmt.la: $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) ++ @$(LIBTOOL) $(CC) -o $@ $(LIB_O:.o=.lo) $(TRIANGLE_O:.o=.lo) \ ++ $(ALPHA_SINCOS_O:.o=.lo) $(LDFLAGS) $(CDF) $(LIBS) \ ++ --version-info 0:0 -rpath $(libdir) #------------------------------------------------------------------------------- # program dependencies @@ -122,9 +123,9 @@ $NetBSD: patch-aa,v 1.5 2001/01/29 04:10:39 jtb Exp $ $(PROGS): $(GMTLIB) $(PROGS_O) - $(CC) $(CFLAGS) $@.o -L. -lgmt -lpsl $(CDF) $(LIBS) $(LDFLAGS) -o $@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $@.o libgmt.la libpsl.la $(CDF) $(LIBS) $(LDFLAGS) -o $@ ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) $@.o libgmt.la \ ++ libpsl.la $(CDF) $(LIBS) $(LDFLAGS) -o $@ $(COMPRESS) $@$(EXE) -+ .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-ab b/graphics/GMT/patches/patch-ab index 26c6b9e2173..f27777beb18 100644 --- a/graphics/GMT/patches/patch-ab +++ b/graphics/GMT/patches/patch-ab @@ -1,34 +1,25 @@ -$NetBSD: patch-ab,v 1.3 2001/01/27 10:36:54 jtb Exp $ +$NetBSD: patch-ab,v 1.4 2001/04/19 20:51:31 jtb Exp $ ---- src/makegmt.macros.in.orig Fri Jul 14 02:10:54 2000 +--- src/makegmt.macros.in.orig Fri Mar 2 05:40:57 2001 +++ src/makegmt.macros.in -@@ -26,7 +26,7 @@ - mansection = @mansection@ - - # Compiler, if $CC not set in environment --CC = @CC@ -+#CC = @CC@ - - # Link flags if $LDFLAGS is not set in environment - LDFLAGS = @LDFLAGS@ -@@ -46,12 +46,14 @@ +@@ -48,12 +48,16 @@ # Misc. Standard Utilities: #--------------------------------------------------------------- INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_DATA = @INSTALL_DATA@ AWK = @AWK@ AS = @AS@ AR = @AR@ --RANLIB = @RANLIB@ + RANLIB = @RANLIB@ CSH = @CSH@ --LD = @LD@ + LD = @LD@ +LIBTOOL = @LIBTOOL@ #--------------------------------------------------------------- # Misc. macros for Cygwin # Normally empty, EXE=.exe and WIN32=_WIN32 under Cygwin -@@ -71,7 +73,7 @@ +@@ -73,7 +77,7 @@ # Required path to netcdf (with lib & include) #--------------------------------------------------------------- # @@ -37,21 +28,9 @@ $NetBSD: patch-ab,v 1.3 2001/01/27 10:36:54 jtb Exp $ #--------------------------------------------------------------- # Required path to GMT home (used as $GMTHOME by users) #--------------------------------------------------------------- -@@ -82,7 +84,7 @@ - # Compiler switches (set a total of one only) +@@ -139,4 +143,4 @@ + # Select STATIC (Default) or SHARED libraries #------------------------------------------------------------------------------- # --CC_OPT = @CC_OPT@ -+#CC_OPT = @CC_OPT@ - # - #------------------------------------------------------------------------------- - # For your information, here are some CC_OPT options known to work on other systems: -@@ -92,7 +94,7 @@ - #CC_OPT = -mieee -O2 # Dec Alpha/Alpha PC Linux - #CC_OPT = -Aa +Ofltacc +O1 +Olibcalls # HPUX - #CC_OPT = -Daux -O # A/UX --#CC_OPT = -O -ansi -pedantic # Gnu gcc compiler -+CC_OPT = -O2 -ansi -pedantic # Gnu gcc compiler - #CC_OPT = -O -Xc # Sun Solaris - #CC_OPT = -O -w # SGI IRIX - #CC_OPT = -O2 # IBM AIX +-GMTLIB = @GMTLIB@ ++GMTLIB = libpsl.la libgmt.la diff --git a/graphics/GMT/patches/patch-ac b/graphics/GMT/patches/patch-ac index 8f157756bef..ffba57aa934 100644 --- a/graphics/GMT/patches/patch-ac +++ b/graphics/GMT/patches/patch-ac @@ -1,24 +1,36 @@ -$NetBSD: patch-ac,v 1.2 2001/01/27 08:16:01 jtb Exp $ +$NetBSD: patch-ac,v 1.3 2001/04/19 20:51:31 jtb Exp $ ---- configure.in.orig Wed Oct 18 02:59:42 2000 -+++ configure.in -@@ -29,6 +29,7 @@ - AC_SUBST(TRIANGLE_O) - AC_SUBST(ALPHA_SINCOS_O) - AC_SUBST(GMTLIB) -+AC_SUBST(NETCDF) - AC_SUBST(CC_OPT) - AC_SUBST(LD_OPT) - AC_SUBST(LDFLAGS) -@@ -58,7 +59,11 @@ - AC_CHECK_PROG(CSH, csh, csh, bash, ) - AC_CHECK_PROG(LD, ld, ld, :) - AC_CHECK_PROG(AS, as, as, :) -+AC_SUBST(LIBTOOL) - AC_PROG_INSTALL -+AC_SUBST(INSTALL_PROGRAM) -+AC_SUBST(INSTALL_SCRIPT) -+AC_SUBST(INSTALL_DATA) - AC_PROG_AWK - AC_PROG_RANLIB - dnl +--- configure.orig Wed Apr 18 09:28:26 2001 ++++ configure +@@ -2904,9 +2904,7 @@ + + fi + +-subdirs="src/mex" +- +-subdirs="src/mex src/xgrid" ++subdirs="src/xgrid" + + trap '' 1 2 15 + cat > confcache <<\EOF +@@ -3074,9 +3072,11 @@ + s%@wrapbindir@%$wrapbindir%g + s%@wrapmandir@%$wrapmandir%g + s%@mansection@%$mansection%g ++s%@NETCDF@%$NETCDF%g + s%@AR@%$AR%g + s%@CSH@%$CSH%g + s%@LD@%$LD%g ++s%@LIBTOOL@%$LIBTOOL%g + s%@AS@%$AS%g + s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g + s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +@@ -3328,7 +3328,7 @@ + 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 9b1289f0ad1..b57938c1db6 100644 --- a/graphics/GMT/patches/patch-ad +++ b/graphics/GMT/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/11/26 22:48:16 jtb Exp $ +$NetBSD: patch-ad,v 1.2 2001/04/19 20:51:31 jtb Exp $ ---- src/gmt_init.c.orig Tue Oct 24 17:24:38 2000 +--- src/gmt_init.c.orig Thu Apr 19 18:02:09 2001 +++ src/gmt_init.c @@ -1488,7 +1488,7 @@ diff --git a/graphics/GMT/patches/patch-ae b/graphics/GMT/patches/patch-ae index 0ff0e6e937a..7ae38b8e903 100644 --- a/graphics/GMT/patches/patch-ae +++ b/graphics/GMT/patches/patch-ae @@ -1,17 +1,20 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/11/26 22:48:16 jtb Exp $ +$NetBSD: patch-ae,v 1.2 2001/04/19 20:51:31 jtb Exp $ ---- src/gmt_support.c.orig Tue Oct 24 17:24:38 2000 +--- src/gmt_support.c.orig Thu Apr 19 18:02:09 2001 +++ src/gmt_support.c -@@ -3456,7 +3456,7 @@ +@@ -3483,9 +3483,9 @@ + char dir[BUFSIZ]; + FILE *fp; - /* First check the $GMTHOME/share directory */ +- /* 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 */ -@@ -3470,7 +3470,7 @@ +@@ -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 */ diff --git a/graphics/GMT/patches/patch-af b/graphics/GMT/patches/patch-af index 0d970ac6dea..4494b3fd0cb 100644 --- a/graphics/GMT/patches/patch-af +++ b/graphics/GMT/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $ +$NetBSD: patch-af,v 1.2 2001/04/19 20:51:31 jtb Exp $ ---- src/grd2cpt.c.orig Tue Oct 24 17:24:38 2000 +--- src/grd2cpt.c.orig Thu Apr 19 18:02:09 2001 +++ src/grd2cpt.c @@ -64,7 +64,7 @@ diff --git a/graphics/GMT/patches/patch-ag b/graphics/GMT/patches/patch-ag index 2917cf7532f..aad87120919 100644 --- a/graphics/GMT/patches/patch-ag +++ b/graphics/GMT/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $ +$NetBSD: patch-ag,v 1.2 2001/04/19 20:51:31 jtb Exp $ ---- src/makecpt.c.orig Tue Oct 24 17:24:39 2000 +--- src/makecpt.c.orig Thu Apr 19 18:02:08 2001 +++ src/makecpt.c @@ -48,7 +48,7 @@ diff --git a/graphics/GMT/patches/patch-ah b/graphics/GMT/patches/patch-ah index 702b4f96621..93958f0737b 100644 --- a/graphics/GMT/patches/patch-ah +++ b/graphics/GMT/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $ +$NetBSD: patch-ah,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/grdreformat.c.orig Tue Oct 24 17:24:39 2000 +--- src/grdreformat.c.orig Thu Apr 19 18:02:08 2001 +++ src/grdreformat.c @@ -86,7 +86,7 @@ GMT_explain_option ('V'); diff --git a/graphics/GMT/patches/patch-ai b/graphics/GMT/patches/patch-ai index f432415a804..0dee1abccf3 100644 --- a/graphics/GMT/patches/patch-ai +++ b/graphics/GMT/patches/patch-ai @@ -1,13 +1,13 @@ -$NetBSD: patch-ai,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $ +$NetBSD: patch-ai,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/pslib.c.orig Tue Oct 24 17:24:39 2000 +--- 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); ++ sprintf (file, "%s%cshare%gmt%cps_pattern_%2.2d.ras\0", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, image_no); ps_pattern_status[image_no][invert] = 1; } else { /* User image, check to see if already used */ @@ -16,16 +16,16 @@ $NetBSD: patch-ai,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $ 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); ++ sprintf (file, "%s%cshare%gmt%c%s\0", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, imagefile); } 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); -@@ -3190,7 +3190,7 @@ +@@ -3189,7 +3189,7 @@ /* Load PSL_text procedures from file for now */ 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); ++ sprintf (line, "%s%cshare%gmt%cPSL_text.ps\0", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); if ((fp = fopen (line, "r")) == NULL) { fprintf (stderr, "pslib: ERROR: Cannot open file %s\n", line); diff --git a/graphics/GMT/patches/patch-ak b/graphics/GMT/patches/patch-ak index 14aaab8be6c..4fa3d1d0775 100644 --- a/graphics/GMT/patches/patch-ak +++ b/graphics/GMT/patches/patch-ak @@ -1,27 +1,26 @@ -$NetBSD: patch-ak,v 1.1 2001/01/27 08:16:01 jtb Exp $ +$NetBSD: patch-ak,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/dbase/makefile.orig Wed Oct 18 03:01:08 2000 -+++ src/dbase/makefile -@@ -14,18 +14,18 @@ +--- ./src/dbase/makefile.orig Wed Apr 11 19:58:09 2001 ++++ ./src/dbase/makefile +@@ -14,13 +14,13 @@ all: grdraster install: all - $(INSTALL) grdraster$(EXE) $(bindir) -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) grdraster$(EXE) $(bindir) ++ @$(LIBTOOL) $(INSTALL_PROGRAM) grdraster$(EXE) $(bindir) uninstall: \rm -f $(bindir)/grdraster$(EXE) grdraster: grdraster.o -- $(CC) $(CFLAGS) $(LDFLAGS) grdraster.o -L.. -lgmt -lpsl $(CDF) $(LIBS) -o grdraster -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) grdraster.o ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster +- $(CC) $(CFLAGS) $(LDFLAGS) grdraster.o -L.. -L$(libdir) -lgmt -lpsl $(CDF) $(LIBS) -o grdraster ++ @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) grdraster.lo -L$(libdir) ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster spotless: clean - clean: -- rm -f *.o grdraster$(EXE) -+ rm -f *.o *.lo .libs grdraster$(EXE) +@@ -28,4 +28,4 @@ + rm -f *.o grdraster$(EXE) .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-al b/graphics/GMT/patches/patch-al index e458d8fd532..4b4e017dbc2 100644 --- a/graphics/GMT/patches/patch-al +++ b/graphics/GMT/patches/patch-al @@ -1,48 +1,52 @@ -$NetBSD: patch-al,v 1.1 2001/01/27 08:16:01 jtb Exp $ +$NetBSD: patch-al,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/mgg/makefile.orig Wed Oct 18 03:01:19 2000 -+++ src/mgg/makefile -@@ -45,7 +45,7 @@ +--- ./src/mgg/makefile.orig Wed Apr 11 19:58:09 2001 ++++ ./src/mgg/makefile +@@ -22,7 +22,7 @@ + include ../makegmt.macros + + CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include +-CDF = -L$(NETCDF)/lib -lnetcdf ++CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf + + MGG_H = gmt_mgg.h + +@@ -45,16 +45,13 @@ install: all for i in $(MGG); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done + if [ ! -d $(libdir) ]; then \ + mkdir -p $(libdir); \ + fi + if [ ! $(libdir) = $(srcdir) ]; then \ +- $(INSTALL) -m 444 libgmt_mgg.a $(libdir); \ +- if [ -f libgmt_mgg.$(SL) ]; then \ +- $(INSTALL) -m 444 libgmt_mgg.$(SL) $(libdir); \ +- fi; \ ++ $(LIBTOOL) $(INSTALL_DATA) libgmt_mgg.la $(libdir); \ + fi uninstall: -@@ -54,21 +54,20 @@ - done - - clean: -- rm -f *.o -+ rm -f *.o *.lo - for i in $(MGG); do \ - rm -f $$i$(EXE); \ - done - - spotless: clean -- rm -f *.a -+ rm -fr .libs *.la - - #------------------------------------------------------------------------------- - # library +@@ -82,8 +79,7 @@ #------------------------------------------------------------------------------- libgmt_mgg.a: gmt_mgg.o - $(AR) cvr libgmt_mgg.a $? - $(RANLIB) libgmt_mgg.a -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ gmt_mgg.lo ++ @$(LIBTOOL) $(CC) -o libgmt_mgg.la gmt_mgg.lo --version-info 0:0 -rpath $(libdir) gmt_mgg.o: $(MGG_H) -@@ -77,7 +76,7 @@ +@@ -92,7 +88,7 @@ #------------------------------------------------------------------------------- $(MGG): libgmt_mgg.a $(MGG_O) -- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -lpsl -lgmt $(CDF) $(LIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-am b/graphics/GMT/patches/patch-am index f2c6c82b544..d1f25b96923 100644 --- a/graphics/GMT/patches/patch-am +++ b/graphics/GMT/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.1 2001/01/27 08:16:01 jtb Exp $ +$NetBSD: patch-am,v 1.2 2001/04/19 20:51:32 jtb Exp $ --- src/cps/makefile.orig Wed Oct 18 03:01:09 2000 +++ src/cps/makefile @@ -8,8 +8,8 @@ $NetBSD: patch-am,v 1.1 2001/01/27 08:16:01 jtb Exp $ 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) ++ @$(LIBTOOL) $(INSTALL_PROGRAM) cpsencode$(EXE) $(bindir) ++ @$(LIBTOOL) $(INSTALL_PROGRAM) cpsdecode$(EXE) $(bindir) uninstall: \rm -f $(bindir)/cpsencode$(EXE) @@ -30,19 +30,19 @@ $NetBSD: patch-am,v 1.1 2001/01/27 08:16:01 jtb Exp $ libuu.a: libuu.o - $(AR) cvr libuu.a $? - $(RANLIB) libuu.a -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ libuu.lo ++ @$(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 $@ ++ @$(LIBTOOL) $(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 $@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $? -o $@ .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(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 8d9c5f05172..f78d3aeaf1d 100644 --- a/graphics/GMT/patches/patch-an +++ b/graphics/GMT/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.1 2001/01/27 08:16:01 jtb Exp $ +$NetBSD: patch-an,v 1.2 2001/04/19 20:51:32 jtb Exp $ --- src/gshhs/makefile.orig Sat Jan 27 03:10:36 2001 +++ src/gshhs/makefile @@ -8,8 +8,8 @@ $NetBSD: patch-an,v 1.1 2001/01/27 08:16:01 jtb Exp $ install: all - $(INSTALL) gshhs$(EXE) $(bindir) - $(INSTALL) gshhs_dp$(EXE) $(bindir) -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) gshhs$(EXE) $(bindir) -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) gshhs_dp$(EXE) $(bindir) ++ @$(LIBTOOL) $(INSTALL_PROGRAM) gshhs$(EXE) $(bindir) ++ @$(LIBTOOL) $(INSTALL_PROGRAM) gshhs_dp$(EXE) $(bindir) clean: - \rm -f *.o *% gshhs$(EXE) gshhs_dp$(EXE) @@ -19,12 +19,12 @@ $NetBSD: patch-an,v 1.1 2001/01/27 08:16:01 jtb Exp $ gshhs: gshhs.o - $(CC) $(CFLAGS) gshhs.o $(LIBS) $(LDFLAGS) -o gshhs -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) gshhs.lo $(LIBS) $(LDFLAGS) -o $@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) gshhs.lo $(LIBS) $(LDFLAGS) -o $@ gshhs_dp: gshhs_dp.o - $(CC) $(CFLAGS) gshhs_dp.o $(LIBS) $(LDFLAGS) -o gshhs_dp -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) gshhs_dp.lo $(LIBS) $(LDFLAGS) -o $@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) gshhs_dp.lo $(LIBS) $(LDFLAGS) -o $@ .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-ao b/graphics/GMT/patches/patch-ao index a1bb3a5fcc9..444b83d45f6 100644 --- a/graphics/GMT/patches/patch-ao +++ b/graphics/GMT/patches/patch-ao @@ -1,35 +1,36 @@ -$NetBSD: patch-ao,v 1.1 2001/01/27 08:16:01 jtb Exp $ +$NetBSD: patch-ao,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/imgsrc/makefile.orig Sat Jan 27 03:13:35 2001 -+++ src/imgsrc/makefile -@@ -7,24 +7,24 @@ +--- ./src/imgsrc/makefile.orig Wed Apr 11 19:58:09 2001 ++++ ./src/imgsrc/makefile +@@ -6,25 +6,25 @@ + include ../makegmt.macros - CDF = -L$(NETCDF)/lib -lnetcdf --GMT = -L.. -lgmt -lpsl +-CDF = -L$(NETCDF)/lib -lnetcdf +-GMT = -L.. -L$(libdir) -lgmt -lpsl ++CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf +GMT = ../libgmt.la ../libpsl.la - CFLAGS = $(CC_OPT) $(WIN32) -I.. -I$(NETCDF)/include + CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include all: img2mercgrd install: all - $(INSTALL) img2mercgrd$(EXE) $(bindir) - $(INSTALL) img2grd $(bindir) -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) img2mercgrd$(EXE) $(bindir) -+ $(INSTALL_SCRIPT) img2grd $(bindir) ++ @$(LIBTOOL) $(INSTALL_PROGRAM) img2mercgrd$(EXE) $(bindir) ++ @$(LIBTOOL) $(INSTALL_SCRIPT) img2grd $(bindir) uninstall: \rm -f $(bindir)/img2mercgrd$(EXE) $(bindir)/img2grd img2mercgrd: img2mercgrd.o gmt_imgsubs.o - $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.o gmt_imgsubs.o $(GMT) $(CDF) $(LIBS) -o img2mercgrd -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.lo gmt_imgsubs.lo $(GMT) $(CDF) $(LIBS) -o img2mercgrd ++ @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.lo gmt_imgsubs.lo $(GMT) $(CDF) $(LIBS) -o img2mercgrd spotless: clean clean: -- rm -f *.o img2mercgrd$(EXE) -+ rm -fr *.o *.lo .libs img2mercgrd$(EXE) + rm -f *.o img2mercgrd$(EXE) .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-ap b/graphics/GMT/patches/patch-ap index 34f6220052d..6d19994403e 100644 --- a/graphics/GMT/patches/patch-ap +++ b/graphics/GMT/patches/patch-ap @@ -1,51 +1,50 @@ -$NetBSD: patch-ap,v 1.1 2001/01/27 08:16:02 jtb Exp $ +$NetBSD: patch-ap,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/meca/makefile.orig Sat Jan 27 03:17:16 2001 -+++ src/meca/makefile -@@ -9,7 +9,7 @@ +--- ./src/meca/makefile.orig Wed Apr 11 19:58:09 2001 ++++ ./src/meca/makefile +@@ -9,9 +9,9 @@ + + NETCDFLIB = $(NETCDF)/lib NETCDFINC = $(NETCDF)/include - CDF = -L$(NETCDFLIB) -lnetcdf - CFLAGS = $(CC_OPT) -I.. -I$(NETCDFINC) --ALLLIB = -L.. -lpsl -lgmt $(CDF) $(LIBS) $(LDFLAGS) +-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) # # -@@ -21,7 +21,7 @@ +@@ -23,7 +23,7 @@ install: all for i in $(MECA); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done uninstall: -@@ -32,22 +32,22 @@ +@@ -34,19 +34,19 @@ spotless: clean psmeca: psmeca.o utilmeca.o nrutil.o - $(CC) $(CFLAGS) psmeca.o utilmeca.o nrutil.o $(ALLLIB) -o ./$@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) psmeca.lo utilmeca.lo nrutil.lo $(ALLLIB) -o ./$@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) psmeca.lo utilmeca.lo nrutil.lo $(ALLLIB) -o ./$@ pscoupe: pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o - $(CC) $(CFLAGS) pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o $(ALLLIB) -o ./$@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) pscoupe.lo utilmeca.lo submeca.lo distaz.lo nrutil.lo $(ALLLIB) -o ./$@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) pscoupe.lo utilmeca.lo submeca.lo distaz.lo nrutil.lo $(ALLLIB) -o ./$@ pspolar: pspolar.o - $(CC) $(CFLAGS) pspolar.o $(ALLLIB) -o ./$@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) pspolar.lo $(ALLLIB) -o ./$@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) pspolar.lo $(ALLLIB) -o ./$@ psvelo: psvelo.o utilvelo.o utilstrain.o - $(CC) $(CFLAGS) psvelo.o utilvelo.o utilstrain.o $(ALLLIB) -o ./$@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) psvelo.lo utilvelo.lo utilstrain.lo $(ALLLIB) -o ./$@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) psvelo.lo utilvelo.lo utilstrain.lo $(ALLLIB) -o ./$@ .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< clean: -- rm -f *.o -+ rm -fr *.o *.lo .libs - for i in $(MECA); do \ - rm -f $$i$(EXE); \ - done + rm -f *.o diff --git a/graphics/GMT/patches/patch-aq b/graphics/GMT/patches/patch-aq index 27c6919f27b..524d33c1b39 100644 --- a/graphics/GMT/patches/patch-aq +++ b/graphics/GMT/patches/patch-aq @@ -1,32 +1,32 @@ -$NetBSD: patch-aq,v 1.1 2001/01/27 08:16:02 jtb Exp $ +$NetBSD: patch-aq,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/misc/makefile.orig Sat Jan 27 03:22:03 2001 +--- src/misc/makefile.orig Wed Apr 11 19:58:09 2001 +++ src/misc/makefile +@@ -6,7 +6,7 @@ + + include ../makegmt.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 @@ install: all for i in $(MISC); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done uninstall: -@@ -41,7 +41,7 @@ - spotless: clean - - clean: -- rm -f *.o -+ rm -fr *.o *.lo .libs - for i in $(MISC); do \ - \rm -f $$i$(EXE); \ - done @@ -51,7 +51,7 @@ #------------------------------------------------------------------------------- $(MISC): $(MISC_O) -- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L.. -lpsl -lgmt $(CDF) $(LIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@ ++ $(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ $(LIBTOOL) $(CPPFLAGS) $(CC) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-ar b/graphics/GMT/patches/patch-ar index 7e1b6a6654f..6a57b0d5b62 100644 --- a/graphics/GMT/patches/patch-ar +++ b/graphics/GMT/patches/patch-ar @@ -1,13 +1,13 @@ -$NetBSD: patch-ar,v 1.1 2001/01/27 08:16:02 jtb Exp $ +$NetBSD: patch-ar,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/segyprogs/makefile.orig Sat Jan 27 03:25:15 2001 -+++ src/segyprogs/makefile +--- ./src/segyprogs/makefile.orig Wed Apr 11 19:58:09 2001 ++++ ./src/segyprogs/makefile @@ -8,7 +8,7 @@ #------------------------- stop here -------------------------- - CFLAGS = $(CC_OPT) $(WIN32) -I.. -I$(NETCDF)/include -I$(GMT_DEFAULT_PATH)/src --ALLLIB = -L.. -L$(GMT_DEFAULT_PATH)/bin -lgmt -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) -+ALLLIB = ../libgmt.la ../libpsl.la -L$(NETCDF)/lib -lnetcdf $(LIBS) + 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) SEGYPLOT_H = segy_io.h segy.h segyreel.h SEGYPLOT_C = pssegyz.c pssegy.c @@ -16,28 +16,21 @@ $NetBSD: patch-ar,v 1.1 2001/01/27 08:16:02 jtb Exp $ install: all for i in $(SEGYPLOT); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done uninstall: -@@ -32,16 +32,16 @@ - done - - clean: -- \rm -f *.o -+ \rm -f *.o *.lo - for i in $(SEGYPLOT); do \ - \rm -f $$i$(EXE); \ - done +@@ -41,10 +41,10 @@ + \rm -f *.a - spotless: clean -- \rm -f *.a -+ \rm -fr .libs *.la + segy_io.o: $(SEGYPLOT_H) segy_io.c +- $(CC) -c $(CFLAGS) segy_io.c ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) segy_io.c $(SEGYPLOT): $(SEGYPLOT_O) segy_io.o - $(CC) $(CFLAGS) segy_io.o $@.o -o $@ $(ALLLIB) $(LDFLAGS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) segy_io.lo $@.lo -o $@ $(ALLLIB) $(LDFLAGS) ++ @$(LIBTOOL) $(CC) $(CFLAGS) segy_io.lo $@.lo -o $@ $(ALLLIB) $(LDFLAGS) .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-as b/graphics/GMT/patches/patch-as index 05ce332f062..566bb925732 100644 --- a/graphics/GMT/patches/patch-as +++ b/graphics/GMT/patches/patch-as @@ -1,48 +1,32 @@ -$NetBSD: patch-as,v 1.1 2001/01/27 08:16:02 jtb Exp $ +$NetBSD: patch-as,v 1.2 2001/04/19 20:51:33 jtb Exp $ ---- src/spotter/makefile.orig Wed Oct 18 03:01:22 2000 -+++ src/spotter/makefile +--- ./src/spotter/makefile.orig Wed Apr 11 19:58:09 2001 ++++ ./src/spotter/makefile +@@ -19,7 +19,7 @@ + include ../makegmt.macros + + CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include +-CDF = -L$(NETCDF)/lib -lnetcdf ++CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf + + SPOT_H = spotter.h + @@ -41,7 +41,7 @@ install: all for i in $(SPOT); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done uninstall: -@@ -50,21 +50,20 @@ - done - - clean: -- rm -f *.o -+ rm -f *.o *.la - for i in $(SPOT); do \ - rm -f $$i$(EXE); \ - done - - spotless: clean -- rm -f *.a -+ rm -fr .libs *.la - - #------------------------------------------------------------------------------- - # library - #------------------------------------------------------------------------------- - - libspotter.a: libspotter.o -- $(AR) cvr libspotter.a $? -- $(RANLIB) libspotter.a -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ libspotter.lo - - libspotter.o: $(SPOT_H) - -@@ -73,7 +72,7 @@ +@@ -73,7 +73,7 @@ #------------------------------------------------------------------------------- $(SPOT): libspotter.a $(SPOT_O) -- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lspotter -L.. -lpsl -lgmt $(CDF) $(LIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo -L. -lspotter ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lspotter -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.lo -L. -lspotter -L.. ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-at b/graphics/GMT/patches/patch-at index 3d39c2889c1..bed354ac275 100644 --- a/graphics/GMT/patches/patch-at +++ b/graphics/GMT/patches/patch-at @@ -1,51 +1,52 @@ -$NetBSD: patch-at,v 1.1 2001/01/27 08:16:02 jtb Exp $ +$NetBSD: patch-at,v 1.2 2001/04/19 20:51:33 jtb Exp $ ---- src/x2sys/makefile.orig Wed Oct 18 03:01:23 2000 +--- src/x2sys/makefile.orig Wed Apr 11 19:58:09 2001 +++ src/x2sys/makefile @@ -7,7 +7,7 @@ #------------------------- stop here -------------------------- - CFLAGS = $(CC_OPT) $(WIN32) -I.. -I../mgg -I$(NETCDF)/include --ALLLIB = -L.. -lgmt -L../mgg -lgmt_mgg -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) -+ALLLIB = ../libgmt.la -L../mgg -lgmt_mgg ../libpsl.la -L$(NETCDF)/lib -lnetcdf $(LIBS) + 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) XSYSTEM_H = x2sys.h XSYSTEM_C = x2sys_datalist.c x2sys_cross.c -@@ -19,14 +19,13 @@ +@@ -18,24 +18,20 @@ + #--------------------------------------------------------------- - libx2sys.a: x2sys.o +-libx2sys.a: x2sys.o - $(AR) cvr libx2sys.a $? - $(RANLIB) libx2sys.a -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ x2sys.lo ++libx2sys.la: x2sys.o ++ $(LIBTOOL) $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(libdir) all: $(XSYSTEM) libx2sys.a install: all for i in $(XSYSTEM); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done + if [ ! -d $(libdir) ]; then \ + mkdir -p $(libdir); \ + fi + if [ ! $(libdir) = $(srcdir) ]; then \ +- $(INSTALL) -m 444 libx2sys.a $(libdir); \ +- if [ -f libx2sys.$(SL) ]; then \ +- $(INSTALL) -m 444 libx2sys.$(SL) $(libdir); \ +- fi; \ ++ $(LIBTOOL) $(INSTALL_DATA) libx2sys.la $(libdir); \ + fi uninstall: -@@ -35,16 +34,16 @@ - done - - clean: -- \rm -f *.o -+ \rm -f *.o *.lo - for i in $(XSYSTEM); do \ - \rm -f $$i$(EXE); \ - done - - spotless: clean -- \rm -f *.a -+ \rm -fr .libs *.la +@@ -59,7 +55,7 @@ + \rm -f *.a $(XSYSTEM): $(XSYSTEM_O) libx2sys.a - $(CC) $(CFLAGS) $@.o -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $@.lo -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS) ++ @$(LIBTOOL) $(CC) $(CFLAGS) $@.lo -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS) .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-au b/graphics/GMT/patches/patch-au index 538d0ddd828..bc6bcd3f75d 100644 --- a/graphics/GMT/patches/patch-au +++ b/graphics/GMT/patches/patch-au @@ -1,13 +1,15 @@ -$NetBSD: patch-au,v 1.1 2001/01/27 08:16:02 jtb Exp $ +$NetBSD: patch-au,v 1.2 2001/04/19 20:51:33 jtb Exp $ ---- src/x_system/makefile.orig Wed Oct 18 03:01:25 2000 +--- src/x_system/makefile.orig Wed Apr 11 19:58:09 2001 +++ src/x_system/makefile -@@ -21,7 +21,7 @@ +@@ -20,8 +20,8 @@ + include ../makegmt.macros # - CFLAGS = $(CC_OPT) $(WIN32) -I.. -I../mgg -I$(NETCDF)/include --ALLLIB = -L.. -lgmt -L../mgg -lgmt_mgg -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) -+ALLLIB = ../libgmt.la -L../mgg -lgmt_mgg ../libpsl.la -L$(NETCDF)/lib -lnetcdf $(LIBS) +-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) 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 @@ -16,28 +18,20 @@ $NetBSD: patch-au,v 1.1 2001/01/27 08:16:02 jtb Exp $ install: all for i in $(ALL); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done uninstall: -@@ -44,7 +44,7 @@ - done - - clean: -- rm -f *.o -+ rm -fr *.o *.lo .libs - for i in $(ALL); do \ - rm -f $$i$(EXE); \ - done -@@ -56,9 +56,9 @@ +@@ -56,9 +56,10 @@ #------------------------------------------------------------------------------- $(ALL): $(ALL_O) - $(CC) $(CFLAGS) $(LDFLAGS) $@.o $(ALLLIB) -o $@ -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo $(ALLLIB) -o $@ ++ @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.lo $(ALLLIB) -o $@ .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< $(ALL_O): x_system.h ++ diff --git a/graphics/GMT/patches/patch-ax b/graphics/GMT/patches/patch-ax index 2cf1aba6e9a..ec00ed2e53c 100644 --- a/graphics/GMT/patches/patch-ax +++ b/graphics/GMT/patches/patch-ax @@ -1,6 +1,6 @@ -$NetBSD: patch-ax,v 1.1 2001/01/27 08:16:02 jtb Exp $ +$NetBSD: patch-ax,v 1.2 2001/04/19 20:51:33 jtb Exp $ ---- Makefile.orig Sat Jan 27 04:38:15 2001 +--- Makefile.orig Wed Apr 18 09:22:35 2001 +++ Makefile @@ -62,7 +62,7 @@ # !! STOP EDITING HERE, THE REST IS FIXED !! @@ -15,8 +15,26 @@ $NetBSD: patch-ax,v 1.1 2001/01/27 08:16:02 jtb Exp $ $(MAKE) uninstall; \ cd .. --suppl: mex_config xgrid_config -+suppl: xgrid_config +-suppl: gmtmacros mex_config xgrid_config ++suppl: gmtmacros xgrid_config for d in $(SUPPL); do \ - if [ -d src/$$d ] ; then \ + 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 8060fbbd31c..e0d726e839a 100644 --- a/graphics/GMT/patches/patch-ay +++ b/graphics/GMT/patches/patch-ay @@ -1,50 +1,13 @@ -$NetBSD: patch-ay,v 1.3 2001/03/25 23:33:48 jtb Exp $ +$NetBSD: patch-ay,v 1.4 2001/04/19 20:51:33 jtb Exp $ ---- src/xgrid/makefile.in.orig -+++ src/xgrid/makefile.in -@@ -19,14 +19,14 @@ - # Location of GMT and CDF header files +--- src/dbase/grdraster.c.orig Thu Apr 19 18:16:18 2001 ++++ src/dbase/grdraster.c +@@ -601,7 +601,7 @@ + struct RASTER_INFO *rasinfo; - CFLAGS= $(CC_OPT) $(WIN32) -I.. -I$(NETCDF)/include @X_CFLAGS@ @CFLAGS@ --XLIBS=@X_PRE_LIBS@ @X_LIBS@ -lXt -lXaw -lXmu -lXext -lX11 @X_EXTRA_LIBS@ -L.. -lgmt -lpsl -lnetcdf -+XLIBS=@X_PRE_LIBS@ @X_LIBS@ -lXt -lXaw -lXmu -lXext -lX11 @X_EXTRA_LIBS@ ../libgmt.la ../libpsl.la -lnetcdf + 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); - all: @buildtarget@ - - install: @installtarget@ - - xgridedit-install: -- $(INSTALL) xgridedit$(EXE) $(bindir) -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xgridedit$(EXE) $(bindir) - - uninstall: - \rm -f $(bindir)/xgridedit$(EXE) -@@ -35,15 +35,17 @@ - \rm -f makefile config.cache config.log config.status - - clean: -- rm -f *.o xgridedit$(EXE) -+ rm -fr *.o *.lo .libs xgridedit$(EXE) - - xgridedit: $(OBJS) $(EDITOBJS) xgridedit.o -- $(CC) $(CFLAGS) xgridedit.o -o xgridedit $(OBJS) \ -- $(EDITOBJS) $(CDF) $(XLIBS) $(LIBS) $(LDFLAGS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o xgridedit \ -+ xgridedit.lo $(OBJS:.o=.lo) $(EDITOBJS:.o=.lo) $(CDF) \ -+ $(XLIBS) $(LIBS) $(LDFLAGS) - - xgridedit.o: xGridEdit.c xgrid_utility.h xgrid_controls.h \ - xgrid_messages.h xgrid_view.h xgrid_textInput.h -- $(CC) $(CFLAGS) -c xGridEdit.c -o xgridedit.o -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c xGridEdit.c \ -+ -o xgridedit.lo - - xgrid_utility.o: xgrid_utility.h - -@@ -69,3 +71,6 @@ - - xgrid_view.o: xgrid_utility.h xgrid_Xutility.h xgrid_GMTgrid.h \ - xgrid_view.h -+ -+.c.o: -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< diff --git a/graphics/GMT/patches/patch-az b/graphics/GMT/patches/patch-az index 3ece5e9ec53..bc75ab3b1ce 100644 --- a/graphics/GMT/patches/patch-az +++ b/graphics/GMT/patches/patch-az @@ -1,22 +1,13 @@ -$NetBSD: patch-az,v 1.1 2001/01/27 10:36:54 jtb Exp $ +$NetBSD: patch-az,v 1.2 2001/04/19 20:51:33 jtb Exp $ ---- src/xgrid/configure.orig Sat Jan 27 10:15:57 2001 -+++ src/xgrid/configure -@@ -1190,7 +1190,7 @@ - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then -- X_LIBS="$X_LIBS -L$x_libraries" -+ X_LIBS="$X_LIBS -Wl,-R$x_libraries -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case "`(uname -sr) 2>/dev/null`" in -@@ -1725,7 +1725,7 @@ - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS="$LDFLAGS" -- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. +--- src/dbase/grdraster.man.orig Thu Apr 12 00:08:51 2001 ++++ src/dbase/grdraster.man +@@ -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. diff --git a/graphics/GMT/pkg/PLIST b/graphics/GMT/pkg/PLIST index 77aab234db9..32eeab7c5ae 100644 --- a/graphics/GMT/pkg/PLIST +++ b/graphics/GMT/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.5 2001/01/27 10:36:54 jtb Exp $ +@comment $NetBSD: PLIST,v 1.6 2001/04/19 20:51:33 jtb Exp $ +bin/GMT bin/backtracker bin/binlegs bin/blockmean @@ -97,7 +98,6 @@ bin/x_report bin/x_setup bin/x_solve_dc_drift bin/x_update -bin/xgridedit bin/xyz2grd include/gmt/gmt.h include/gmt/gmt_bcr.h @@ -123,11 +123,22 @@ lib/libgmt.la lib/libgmt.so lib/libgmt.so.0 lib/libgmt.so.0.0 +lib/libgmt_mgg.a +lib/libgmt_mgg.la +lib/libgmt_mgg.so +lib/libgmt_mgg.so.0 +lib/libgmt_mgg.so.0.0 lib/libpsl.a lib/libpsl.la lib/libpsl.so lib/libpsl.so.0 lib/libpsl.so.0.0 +lib/libx2sys.a +lib/libx2sys.la +lib/libx2sys.so +lib/libx2sys.so.0 +lib/libx2sys.so.0.0 +man/man1/GMT.1 man/man1/backtracker.1 man/man1/binlegs.1 man/man1/blockmean.1 @@ -138,7 +149,6 @@ man/man1/cpsencode.1 man/man1/dat2gmt.1 man/man1/filter1d.1 man/man1/fitcircle.1 -man/man1/gmt.1 man/man1/gmt2bin.1 man/man1/gmt2dat.1 man/man1/gmtconvert.1 @@ -232,7 +242,7 @@ share/doc/gmt/GMT_Docs.ps share/doc/gmt/GMT_Tutorial.ps 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_motif.gif +share/doc/html/gmt/doc/html/GMT_Docs/contents.gif 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 @@ -258,15 +268,100 @@ 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 @@ -353,9 +448,9 @@ 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_motif.gif -share/doc/html/gmt/doc/html/GMT_Docs/next_motif.gif -share/doc/html/gmt/doc/html/GMT_Docs/next_motif_gr.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/node1.html share/doc/html/gmt/doc/html/GMT_Docs/node10.html share/doc/html/gmt/doc/html/GMT_Docs/node100.html @@ -414,41 +509,9 @@ 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/node19.html share/doc/html/gmt/doc/html/GMT_Docs/node2.html share/doc/html/gmt/doc/html/GMT_Docs/node20.html @@ -538,10 +601,10 @@ 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/previous_motif.gif -share/doc/html/gmt/doc/html/GMT_Docs/previous_motif_gr.gif -share/doc/html/gmt/doc/html/GMT_Docs/up_motif.gif -share/doc/html/gmt/doc/html/GMT_Docs/up_motif_gr.gif +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/backtracker.html share/doc/html/gmt/doc/html/binlegs.html share/doc/html/gmt/doc/html/blockmean.html @@ -629,7 +692,7 @@ 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_motif.gif +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 @@ -663,15 +726,47 @@ 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_motif.gif -share/doc/html/gmt/doc/html/tutorial/next_motif.gif -share/doc/html/gmt/doc/html/tutorial/next_motif_gr.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 @@ -752,12 +847,12 @@ 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/previous_motif.gif -share/doc/html/gmt/doc/html/tutorial/previous_motif_gr.gif +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_motif.gif -share/doc/html/gmt/doc/html/tutorial/up_motif_gr.gif +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_cross.html share/doc/html/gmt/doc/html/x2sys_datalist.html share/doc/html/gmt/doc/html/x_edit.html @@ -778,135 +873,11 @@ 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/README.SCRIPTS -share/examples/gmt/do_examples.bash -share/examples/gmt/do_examples.csh -share/examples/gmt/do_view.bash -share/examples/gmt/do_view.csh -share/examples/gmt/ex01/job01.bash -share/examples/gmt/ex01/job01.csh -share/examples/gmt/ex01/osu91a1f_16.grd -share/examples/gmt/ex02/etopo5.grd -share/examples/gmt/ex02/geosat5.grd -share/examples/gmt/ex02/job02.bash -share/examples/gmt/ex02/job02.csh -share/examples/gmt/ex03/job03.bash -share/examples/gmt/ex03/job03.csh -share/examples/gmt/ex03/sat.xyg -share/examples/gmt/ex03/ship.xyg -share/examples/gmt/ex03/shipsat.dos -share/examples/gmt/ex04/geoid.cpt -share/examples/gmt/ex04/geoid.grd -share/examples/gmt/ex04/job04.bash -share/examples/gmt/ex04/job04.csh -share/examples/gmt/ex04/job4c.bash -share/examples/gmt/ex04/job4c.csh -share/examples/gmt/ex04/topo.cpt -share/examples/gmt/ex04/topo.grd -share/examples/gmt/ex05/job05.bash -share/examples/gmt/ex05/job05.csh -share/examples/gmt/ex06/fractures.d -share/examples/gmt/ex06/job06.bash -share/examples/gmt/ex06/job06.csh -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/quakes.xym -share/examples/gmt/ex07/ridge.xy -share/examples/gmt/ex08/job08.bash -share/examples/gmt/ex08/job08.csh -share/examples/gmt/ex08/topo.grd -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/ridge.xy -share/examples/gmt/ex09/track_d.107.xys -share/examples/gmt/ex09/track_d.109.xys -share/examples/gmt/ex09/track_d.111.xys -share/examples/gmt/ex09/track_d.137.xys -share/examples/gmt/ex09/track_d.139.xys -share/examples/gmt/ex09/track_d.165.xys -share/examples/gmt/ex09/track_d.167.xys -share/examples/gmt/ex09/track_d.193.xys -share/examples/gmt/ex09/track_d.195.xys -share/examples/gmt/ex09/track_d.197.xys -share/examples/gmt/ex09/track_d.21.xys -share/examples/gmt/ex09/track_d.223.xys -share/examples/gmt/ex09/track_d.225.xys -share/examples/gmt/ex09/track_d.23.xys -share/examples/gmt/ex09/track_d.25.xys -share/examples/gmt/ex09/track_d.251.xys -share/examples/gmt/ex09/track_d.253.xys -share/examples/gmt/ex09/track_d.279.xys -share/examples/gmt/ex09/track_d.281.xys -share/examples/gmt/ex09/track_d.283.xys -share/examples/gmt/ex09/track_d.309.xys -share/examples/gmt/ex09/track_d.311.xys -share/examples/gmt/ex09/track_d.337.xys -share/examples/gmt/ex09/track_d.339.xys -share/examples/gmt/ex09/track_d.365.xys -share/examples/gmt/ex09/track_d.367.xys -share/examples/gmt/ex09/track_d.369.xys -share/examples/gmt/ex09/track_d.395.xys -share/examples/gmt/ex09/track_d.397.xys -share/examples/gmt/ex09/track_d.423.xys -share/examples/gmt/ex09/track_d.425.xys -share/examples/gmt/ex09/track_d.427.xys -share/examples/gmt/ex09/track_d.451.xys -share/examples/gmt/ex09/track_d.453.xys -share/examples/gmt/ex09/track_d.455.xys -share/examples/gmt/ex09/track_d.481.xys -share/examples/gmt/ex09/track_d.483.xys -share/examples/gmt/ex09/track_d.49.xys -share/examples/gmt/ex09/track_d.51.xys -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/ex11/contoured_cube.ps.bz2 -share/examples/gmt/ex11/job11.bash -share/examples/gmt/ex11/job11.csh -share/examples/gmt/ex11/rgb_cube.awk -share/examples/gmt/ex12/job12.bash -share/examples/gmt/ex12/job12.csh -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/ex14/job14.csh -share/examples/gmt/ex14/table_5.11 -share/examples/gmt/ex15/job15.bash -share/examples/gmt/ex15/job15.csh -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/table_5.11 -share/examples/gmt/ex17/etopo5.grd -share/examples/gmt/ex17/geoid.grd -share/examples/gmt/ex17/job17.bash -share/examples/gmt/ex17/job17.csh -share/examples/gmt/ex18/job18.bash -share/examples/gmt/ex18/job18.csh -share/examples/gmt/ex18/ss_grav.grd -share/examples/gmt/ex19/job19.bash -share/examples/gmt/ex19/job19.csh -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/tutorial/data share/examples/gmt/tutorial/quakes.cpt share/examples/gmt/tutorial/quakes.ngdc share/examples/gmt/tutorial/ship.xyz -share/examples/gmt/tutorial/topo.cpt share/examples/gmt/tutorial/us.grd share/gmt/.gmtdefaults_SI share/gmt/.gmtdefaults_SI.orig @@ -1043,27 +1014,6 @@ share/gmt/ps_pattern_90.ras @dirrm share/gmt/dbase @dirrm share/gmt @dirrm share/examples/gmt/tutorial -@dirrm share/examples/gmt/ex20 -@dirrm share/examples/gmt/ex19 -@dirrm share/examples/gmt/ex18 -@dirrm share/examples/gmt/ex17 -@dirrm share/examples/gmt/ex16 -@dirrm share/examples/gmt/ex15 -@dirrm share/examples/gmt/ex14 -@dirrm share/examples/gmt/ex13 -@dirrm share/examples/gmt/ex12 -@dirrm share/examples/gmt/ex11 -@dirrm share/examples/gmt/ex10 -@dirrm share/examples/gmt/ex09 -@dirrm share/examples/gmt/ex08 -@dirrm share/examples/gmt/ex07 -@dirrm share/examples/gmt/ex06 -@dirrm share/examples/gmt/ex05 -@dirrm share/examples/gmt/ex04 -@dirrm share/examples/gmt/ex03 -@dirrm share/examples/gmt/ex02 -@dirrm share/examples/gmt/ex01 -@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 |