head 1.9; access; symbols pkgsrc-2026Q1:1.9.0.52 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.50 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.9.0.48 pkgsrc-2025Q3-base:1.9 pkgsrc-2025Q2:1.9.0.46 pkgsrc-2025Q2-base:1.9 pkgsrc-2025Q1:1.9.0.44 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.42 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.40 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.38 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.36 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.34 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.32 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.30 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.28 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.26 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.24 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.22 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.20 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.18 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.16 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.14 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.12 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.10 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.8 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.6 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.2 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.4 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.8.0.98 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.96 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.94 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.92 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.90 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.88 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.86 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.84 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.82 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.78 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.76 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.74 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.72 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.70 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.68 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.66 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.64 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.62 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.60 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.58 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.56 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.54 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.52 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.50 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.48 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.46 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.44 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.42 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.40 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.38 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.36 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.34 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.32 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.30 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.28 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.26 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.24 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.22 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.20 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.18 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.16 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.14 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.12 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.10 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.8 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.6 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.4 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.2 pkgsrc-2008Q1:1.7.0.12 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.10 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.8 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.6 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.4 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.2 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.6.0.12 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.10 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.8 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.6 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.4 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.2 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.5.0.12 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.10 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.8 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.6 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4; locks; strict; comment @# @; 1.9 date 2019.11.08.03.09.22; author kivinen; state Exp; branches; next 1.8; commitid UvK6sh3K3KtDGZJB; 1.8 date 2008.06.12.02.14.31; author joerg; state Exp; branches; next 1.7; 1.7 date 2006.11.14.13.16.00; author wennmach; state Exp; branches; next 1.6; 1.6 date 2005.06.22.08.34.54; author jlam; state Exp; branches; next 1.5; 1.5 date 2003.05.01.11.31.46; author kivinen; state Exp; branches; next 1.4; 1.4 date 2001.04.20.17.16.19; author jtb; state Exp; branches; next 1.3; 1.3 date 2001.04.19.21.36.31; author jtb; state Exp; branches; next 1.2; 1.2 date 2001.04.19.20.51.33; author jtb; state Exp; branches; next 1.1; 1.1 date 2001.01.27.08.16.02; author jtb; state Exp; branches; next ; desc @@ 1.9 log @Fixed graphics/GMT package to not have conflict with www/libpsl. Both of them installed libpsl library, meaning only one of them could be installed at one time. Changed the GMT libpsl library name to libgmtpsl. Changing GMT library was more appropriate as only iGMT depends on GMT and it does not use libraries. @ text @$NetBSD: patch-at,v 1.8 2008/06/12 02:14:31 joerg 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 @@@@ -9,7 +9,7 @@@@ #------------------------- stop here -------------------------- 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 ../libgmtpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) XSYSTEM_H = x2sys.h 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 $(PLAIN_LIBDIR) install: all - for i in $(XSYSTEM); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ - done if [ ! -d $(libdir) ]; then \ 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); \ - fi; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) libx2sys.la $(libdir); \ fi + for i in $(XSYSTEM); do \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ + done + if [ ! -d $(datadir)/x2sys ]; then \ mkdir -p $(datadir)/x2sys; \ fi @@@@ -68,8 +65,8 @@@@ spotless: clean \rm -f *.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: $(XSYSTEM_H) $(GMT_H) - $(CC) -c $(CFLAGS) $< + @@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $< @ 1.8 log @Add DESTDIR support. @ text @d1 1 a1 1 $NetBSD: patch-at,v 1.7 2006/11/14 13:16:00 wennmach Exp $ d12 1 a12 1 +ALLLIB = ../mgd77/libmgd77.la ../mgg/libgmt_mgg.la ../libgmt.la ../libpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) @ 1.7 log @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 @ text @d1 1 a1 1 $NetBSD: patch-at,v 1.6 2005/06/22 08:34:54 jlam Exp $ d27 1 a27 1 + $(LIBTOOL) --mode=link $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(libdir) @ 1.6 log @* Ensure NETCDF is defined properly during the build. As part of this change, remove some unnecessary changes to the configure script and makefiles that caused @@NETCDF@@ to be substituted since the existing mechanism (simply set NETCDFHOME in the environment) is more than sufficient. * Remove some unnecessary changes to the configure script and makefiles to cause @@LIBTOOL@@ to be substituted. We can simply pass in the right value via MAKE_ENV instead of hardcoding the value. * Fix a place where we weren't calling the compiler correctly, which broke the build of certain programs that should be installed and which were already listed in the PLIST. * Add --mode=MODE tags in the appropriate places to suppress the warnings from libtool that were cluttering the build log. Commit approved during the deep freeze by . @ text @d1 3 a3 1 $NetBSD: patch-at,v 1.5 2003/05/01 11:31:46 kivinen Exp $ d7 1 a7 1 @@@@ -7,7 +7,7 @@@@ d10 3 a12 3 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) d15 2 a16 2 XSYSTEM_C = x2sys_datalist.c x2sys_cross.c @@@@ -18,25 +18,21 @@@@ d20 3 a28 3 -all: $(XSYSTEM) libx2sys.a +all: libx2sys.la $(XSYSTEM) d37 1 d47 5 a51 4 uninstall: for i in $(XSYSTEM); do \ @@@@ -58,8 +54,8 @@@@ d55 1 a55 1 -$(XSYSTEM): $(XSYSTEM_O) libx2sys.a d60 1 a60 1 .c.o: @ 1.5 log @ Fixed libx2sys.a to libx2sys.la in src/x2sys/makefile (patch-at). @ text @d1 1 a1 1 $NetBSD: patch-at,v 1.4 2001/04/20 17:16:19 jtb Exp $ d22 1 a22 1 + $(LIBTOOL) $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(libdir) d39 1 a39 1 + $(LIBTOOL) $(INSTALL_DATA) libx2sys.la $(libdir); \ d42 1 a42 1 + $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ d54 1 a54 1 + @@$(LIBTOOL) $(CC) $(CFLAGS) $@@.lo -o $@@ libx2sys.la $(ALLLIB) $(LDFLAGS) d58 1 a58 1 + @@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< @ 1.4 log @Fix byte ordering in grdraster. Proper location of HTML docs in the GMT help script. Fix some patch fuzz. Install libgmt_mgg.la before the programs depending on it, saving some warnings from libtool. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- src/x2sys/makefile.orig Wed Apr 11 19:58:09 2001 +++ src/x2sys/makefile d47 2 a48 1 @@@@ -59,7 +55,7 @@@@ d51 1 a51 1 $(XSYSTEM): $(XSYSTEM_O) libx2sys.a d53 1 @ 1.3 log @Build libx2sys before the x2sys executables. @ text @d14 1 a14 1 @@@@ -18,24 +18,20 @@@@ d28 1 a28 1 for i in $(XSYSTEM); do \ d30 1 a30 2 + $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done d41 3 d46 1 @ 1.2 log @Update of GMT to 3.4. See http://imina.soest.hawaii.edu/gmt/gmt/gmt_releases.html for details of changes. @ text @d24 2 a25 1 all: $(XSYSTEM) libx2sys.a d49 1 a49 1 + @@$(LIBTOOL) $(CC) $(CFLAGS) $@@.lo -o $@@ -L. -lx2sys $(ALLLIB) $(LDFLAGS) @ 1.1 log @Added the 39 supplemental programs, html documentation, and example scripts. @ text @d3 1 a3 1 --- src/x2sys/makefile.orig Wed Oct 18 03:01:23 2000 d8 3 a10 3 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) d14 2 a15 1 @@@@ -19,14 +19,13 @@@@ d18 1 a18 1 libx2sys.a: x2sys.o d21 2 a22 1 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@@ x2sys.lo d29 1 a29 1 + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ d31 10 d43 2 a44 13 @@@@ -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 d48 1 a48 1 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $@@.lo -o $@@ -L. -lx2sys $(ALLLIB) $(LDFLAGS) d52 1 a52 1 + $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< @