head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.52 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.50 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.48 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.46 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.44 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.42 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.40 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.38 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.36 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.34 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.32 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.30 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.28 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.26 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.24 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.22 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.20 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.18 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.16 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.14 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.12 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.10 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.8 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.6 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.2 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.4 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.1.0.110 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.108 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.106 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.104 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.102 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.100 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.98 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.96 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.94 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.90 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.88 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.86 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.84 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.82 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.80 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.78 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.76 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.74 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.72 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.70 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.68 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.66 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.64 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.62 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.60 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.58 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.56 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.54 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.52 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.50 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.48 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.46 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.44 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.42 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.40 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.38 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.36 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.34 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.32 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.30 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.28 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.26 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.24 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.22 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.20 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.18 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.16 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.14 pkgsrc-2008Q1:1.1.0.12 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.10 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.8 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.6 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.4 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.2 pkgsrc-2006Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2019.11.08.03.09.22; author kivinen; state Exp; branches; next 1.1; commitid UvK6sh3K3KtDGZJB; 1.1 date 2006.11.14.13.16.00; author wennmach; state Exp; branches; next ; desc @@ 1.2 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-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 ../libgmtpsl.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) $< @ 1.1 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$ d21 1 a21 1 +XLIBS=@@X_PRE_LIBS@@ @@X_LIBS@@ -lXaw -lXt -lXmu -lXext -lX11 @@X_EXTRA_LIBS@@ ../libgmt.la ../libpsl.la $(CDF) @