pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/graphics/GMT

Module Name:    pkgsrc
Committed By:   kivinen
Date:           Fri Nov  8 03:09:22 UTC 2019

Modified Files:
        pkgsrc/graphics/GMT: Makefile PLIST distinfo
        pkgsrc/graphics/GMT/patches: patch-aa patch-ab patch-ak patch-al
            patch-ao patch-ap patch-aq patch-ar patch-as patch-at patch-au
            patch-ba patch-bb

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/graphics/GMT/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/GMT/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/GMT/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/GMT/patches/patch-aa
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/GMT/patches/patch-ab
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/GMT/patches/patch-ak \
    pkgsrc/graphics/GMT/patches/patch-al
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/GMT/patches/patch-ao \
    pkgsrc/graphics/GMT/patches/patch-ap pkgsrc/graphics/GMT/patches/patch-ar \
    pkgsrc/graphics/GMT/patches/patch-as pkgsrc/graphics/GMT/patches/patch-au
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/GMT/patches/patch-aq
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/GMT/patches/patch-at
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/GMT/patches/patch-ba
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/GMT/patches/patch-bb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/graphics/GMT/Makefile
diff -u pkgsrc/graphics/GMT/Makefile:1.59 pkgsrc/graphics/GMT/Makefile:1.60
--- pkgsrc/graphics/GMT/Makefile:1.59   Sat Nov  2 22:37:53 2019
+++ pkgsrc/graphics/GMT/Makefile        Fri Nov  8 03:09:22 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2019/11/02 22:37:53 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2019/11/08 03:09:22 kivinen Exp $
 
 DISTNAME=      GMT4.1.4
 PKGNAME=       GMT-4.1.4
-PKGREVISION=   18
+PKGREVISION=   19
 CATEGORIES=    graphics
 MASTER_SITES=  ftp://ftp.scc.u-tokai.ac.jp/pub/gmt/4/
 MASTER_SITES+= ftp://ftp.iris.washington.edu/pub/gmt/4/

Index: pkgsrc/graphics/GMT/PLIST
diff -u pkgsrc/graphics/GMT/PLIST:1.6 pkgsrc/graphics/GMT/PLIST:1.7
--- pkgsrc/graphics/GMT/PLIST:1.6       Tue Dec 29 17:55:01 2015
+++ pkgsrc/graphics/GMT/PLIST   Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2015/12/29 17:55:01 dholland Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/11/08 03:09:22 kivinen Exp $
 bin/GMT
 bin/backtracker
 bin/binlegs
@@ -162,7 +162,7 @@ lib/libgmt.la
 lib/libgmt_mgg.la
 lib/libgmtps.la
 lib/libmgd77.la
-lib/libpsl.la
+lib/libgmtpsl.la
 lib/libx2sys.la
 man/man1/GMT.1
 man/man1/backtracker.1

Index: pkgsrc/graphics/GMT/distinfo
diff -u pkgsrc/graphics/GMT/distinfo:1.18 pkgsrc/graphics/GMT/distinfo:1.19
--- pkgsrc/graphics/GMT/distinfo:1.18   Tue Nov  3 21:33:51 2015
+++ pkgsrc/graphics/GMT/distinfo        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 21:33:51 agc Exp $
+$NetBSD: distinfo,v 1.19 2019/11/08 03:09:22 kivinen Exp $
 
 SHA1 (GMT4.1.4/GMT4.1.4_man.tar.bz2) = bd07c5675a2dfbba9f8d05864a1bf563c042e5dc
 RMD160 (GMT4.1.4/GMT4.1.4_man.tar.bz2) = 42927181461b35294a8702499d2a66501555dc8b
@@ -44,8 +44,8 @@ SHA1 (GMT4.1.4/GMT4.1_high.tar.bz2) = 38
 RMD160 (GMT4.1.4/GMT4.1_high.tar.bz2) = 82bb0417a9f5c92c2d5f96a173478a0c67c02b2b
 SHA512 (GMT4.1.4/GMT4.1_high.tar.bz2) = adfdb21558e4907d9980c5d47b4af3d9ca90abcf9e6a99dfd008a6776b0245e6aa201e01e581a0eae61f33e5424f13098264ca41462641c2633339bc61252266
 Size (GMT4.1.4/GMT4.1_high.tar.bz2) = 8644144 bytes
-SHA1 (patch-aa) = 66afc127dcf3cbafc4e6d7ee979f0403703ce163
-SHA1 (patch-ab) = 7449fd466d969c2b882218eb59e63c4e0b2c64d3
+SHA1 (patch-aa) = 660cfc2e76c4e2bc2b4a9205db8f0dcc019ed12d
+SHA1 (patch-ab) = ea3ad9775719530d0f8216ae89e2c64715ad1efe
 SHA1 (patch-ac) = 70e02872abf33386ed766b2ec59270227ed6571d
 SHA1 (patch-ad) = fab72f2d1942f548f87154da39f5344fe2693a8a
 SHA1 (patch-ae) = 7f74635ab750a6c03cb8cae1cf8b99a00a5b63da
@@ -54,18 +54,18 @@ SHA1 (patch-ag) = 93cea6588dba67624a5425
 SHA1 (patch-ah) = 7925e788bb0bb753ab65d7379e90bedb2a47cece
 SHA1 (patch-ai) = 6bead94706dedbadfa87fd3ac4668783ae6869ab
 SHA1 (patch-aj) = 735d9a56f796ae905e52f45dcf2079b2a19b0c77
-SHA1 (patch-ak) = 2632fdeafeac1d89b96e00c07cc5aca12bf47e60
-SHA1 (patch-al) = 35303bd0de71eec8a759b95b83321b442a37b7c8
+SHA1 (patch-ak) = aeb17f68d8b0eefa52df91896dcb6f4ee9e5f4f8
+SHA1 (patch-al) = 93f5a7a83c60868ee9d49f000deaeb7eb6c03d99
 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) = d799fc9a000d331a73ef07fbe758e8c8b273ef58
-SHA1 (patch-au) = af7b30735382479dc4c4ac813244feb3f116bb6e
+SHA1 (patch-ao) = 39875ee81169f1dad06a7635c0907edd7f10f09e
+SHA1 (patch-ap) = ee5fb8abdfd98522318ea7dc87ac96384a3959d4
+SHA1 (patch-aq) = 985a200e216bef22ec3bf5b639715c3a9e43fba1
+SHA1 (patch-ar) = 7ad8ae758727e6e5e7db47e814e1e9de07b7963d
+SHA1 (patch-as) = 8d514f7eed844aa8b6392a43aa3dac627201a809
+SHA1 (patch-at) = 90901906a9a5e97cbaf18d4574fbbb3b19adaa2a
+SHA1 (patch-au) = b332cd700e13a1c0841a027ab488185ff8cc4df3
 SHA1 (patch-ay) = eccd5c6dee172793d3e2499447386cb262897a32
 SHA1 (patch-az) = 20a0266f828e5c0c2dd437e279374593b349a1cf
-SHA1 (patch-ba) = 865e9197cde43566ef7f85aa5f79ed55d08f2d5d
-SHA1 (patch-bb) = 65a651d2075d6457e7725bbe8196c7a514fb3414
+SHA1 (patch-ba) = 819a3bfdb71fb9eefad8a85613525961346e90e6
+SHA1 (patch-bb) = aa1b42463977553797982012918757ec343bdb98
 SHA1 (patch-bc) = 706878d5067eb22b579b110929a1069d67aece64

Index: pkgsrc/graphics/GMT/patches/patch-aa
diff -u pkgsrc/graphics/GMT/patches/patch-aa:1.9 pkgsrc/graphics/GMT/patches/patch-aa:1.10
--- pkgsrc/graphics/GMT/patches/patch-aa:1.9    Thu Jun 12 02:14:31 2008
+++ pkgsrc/graphics/GMT/patches/patch-aa        Fri Nov  8 03:09:22 2019
@@ -1,18 +1,21 @@
-$NetBSD: patch-aa,v 1.9 2008/06/12 02:14:31 joerg Exp $
+$NetBSD: patch-aa,v 1.10 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
 --- src/Makefile.orig  2006-11-01 16:41:02.000000000 +0000
 +++ src/Makefile
-@@ -43,7 +43,7 @@ include makegmt.macros       # GMT-specific se
+@@ -43,9 +43,9 @@ include makegmt.macros       # GMT-specific se
  NETCDFLIB     = $(NETCDF)/lib
  NETCDFINC     = $(NETCDF)/include
  CFLAGS                = -I$(NETCDFINC) $(WIN32) $(CC_OPT) -DGMT_DEFAULT_PATH=\"$(GMT_DEFAULT_PATH)\" $(TRIANGLE_D)
 -CDF           = -L$(NETCDFLIB) -lnetcdf
 +CDF           = -Wl,-R$(NETCDFLIB) -L$(NETCDFLIB) -lnetcdf
  
- PS    = -lpsl
+-PS    = -lpsl
++PS    = -lgmtpsl
  GMT   = -lgmt
+ GMTPS = -lgmtps
+ 
 @@ -151,38 +151,34 @@ gmt_notposix.h:  
                ./configure
  
@@ -28,7 +31,7 @@ Libtoolize.
                        mkdir -p $(libdir); \
                fi
                if [ ! $(libdir) = $(srcdir) ]; then \
-                       rm -f $(libdir)/libpsl.* $(libdir)/libgmt.* $(libdir)/libgmtps.*; \
+-                      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); \
@@ -37,7 +40,8 @@ Libtoolize.
 -                              $(INSTALL) -m 444 libgmt.$(SL) $(libdir); \
 -                              $(INSTALL) -m 444 libgmtps.$(SL) $(libdir); \
 -                      fi; \
-+                      $(LIBTOOL) --mode=install $(INSTALL_DATA) libpsl.la $(libdir); \
++                      rm -f $(libdir)/libgmtpsl.* $(libdir)/libgmt.* $(libdir)/libgmtps.*; \
++                      $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmtpsl.la $(libdir); \
 +                      $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt.la $(libdir); \
 +                      $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmtps.la $(libdir); \
                fi
@@ -65,6 +69,19 @@ Libtoolize.
  
  uninstall:
                for i in $(ALLPROGS); do \
+@@ -190,9 +186,9 @@ uninstall:
+               done
+               \rm -f $(bindir)/GMT
+               if [ ! $(libdir) = $(srcdir) ]; then \
+-                      \rm -f $(libdir)/libgmt.a $(libdir)/libpsl.a $(libdir)/libgmtps.a ; \
+-                      if [ -f libpsl.$(SL) ]; then \
+-                              \rm -f $(libdir)/libpsl.$(SL); \
++                      \rm -f $(libdir)/libgmt.a $(libdir)/libgmtpsl.a $(libdir)/libgmtps.a ; \
++                      if [ -f libgmtpsl.$(SL) ]; then \
++                              \rm -f $(libdir)/libgmtpsl.$(SL); \
+                               \rm -f $(libdir)/libgmt.$(SL); \
+                               \rm -f $(libdir)/libgmtps.$(SL); \
+                       fi; \
 @@ -207,13 +203,13 @@ uninstall:
                fi
  
@@ -102,7 +119,7 @@ Libtoolize.
  
 -./libpsl.$(SL):       pslib.o
 -              $(LD) $(LD_OPT) $? -o $@
-+libpsl.la:    pslib.o
++libgmtpsl.la: pslib.o
 +              @$(LIBTOOL) --mode=link $(CC) -o $@ pslib.lo $(LDFLAGS) -lm --version-info 0:0 -rpath $(PLAIN_LIBDIR)
  
 -./libgmt.$(SL):       $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
@@ -124,13 +141,13 @@ Libtoolize.
  $(PROGS):     $(GMTLIB) $(PROGS_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 $@
++               libgmt.la libgmtpsl.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 $@
++                 libgmt.la libgmtps.la libgmtpsl.la $(CDF) $(LIBS) $(LDFLAGS) -o $@
                $(COMPRESS) $@$(EXE)
  
  .c.o:

Index: pkgsrc/graphics/GMT/patches/patch-ab
diff -u pkgsrc/graphics/GMT/patches/patch-ab:1.7 pkgsrc/graphics/GMT/patches/patch-ab:1.8
--- pkgsrc/graphics/GMT/patches/patch-ab:1.7    Thu Jun 12 02:14:31 2008
+++ pkgsrc/graphics/GMT/patches/patch-ab        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2008/06/12 02:14:31 joerg Exp $
+$NetBSD: patch-ab,v 1.8 2019/11/08 03:09:22 kivinen Exp $
 
 --- 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
@@ -25,4 +25,4 @@ $NetBSD: patch-ab,v 1.7 2008/06/12 02:14
  #-------------------------------------------------------------------------------
  #
 -GMTLIB        = @GMTLIB@
-+GMTLIB        = libpsl.la libgmt.la libgmtps.la
++GMTLIB        = libgmtpsl.la libgmt.la libgmtps.la

Index: pkgsrc/graphics/GMT/patches/patch-ak
diff -u pkgsrc/graphics/GMT/patches/patch-ak:1.6 pkgsrc/graphics/GMT/patches/patch-ak:1.7
--- pkgsrc/graphics/GMT/patches/patch-ak:1.6    Mon Nov 23 16:00:34 2009
+++ pkgsrc/graphics/GMT/patches/patch-ak        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.6 2009/11/23 16:00:34 joerg Exp $
+$NetBSD: patch-ak,v 1.7 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -24,7 +24,7 @@ Libtoolize.
 -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$(PLAIN_LIBDIR) ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster
++              @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) grdraster.lo -L$(PLAIN_LIBDIR) ../libgmt.la ../libgmtpsl.la $(CDF) $(LIBS) -o grdraster
  
  spotless:     clean
  
Index: pkgsrc/graphics/GMT/patches/patch-al
diff -u pkgsrc/graphics/GMT/patches/patch-al:1.6 pkgsrc/graphics/GMT/patches/patch-al:1.7
--- pkgsrc/graphics/GMT/patches/patch-al:1.6    Thu Jun 12 02:14:31 2008
+++ pkgsrc/graphics/GMT/patches/patch-al        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.6 2008/06/12 02:14:31 joerg Exp $
+$NetBSD: patch-al,v 1.7 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -55,13 +55,13 @@ Libtoolize.
 -$(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 $@
++              @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libgmtpsl.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 $@
++              @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libgmt.la ../libgmtps.la ../libgmtpsl.la $(CDF) $(LIBS) -o $@
  
  .c.o:
 -              $(CC) -c $(CFLAGS) $<

Index: pkgsrc/graphics/GMT/patches/patch-ao
diff -u pkgsrc/graphics/GMT/patches/patch-ao:1.4 pkgsrc/graphics/GMT/patches/patch-ao:1.5
--- pkgsrc/graphics/GMT/patches/patch-ao:1.4    Tue Nov 14 13:16:00 2006
+++ pkgsrc/graphics/GMT/patches/patch-ao        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.4 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-ao,v 1.5 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -11,7 +11,7 @@ Libtoolize.
 -CDF           = -L$(NETCDF)/lib -lnetcdf
 -GMT           = -L.. -L$(libdir) -lgmt
 +CDF           = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf
-+GMT           = ../libgmt.la ../libpsl.la
++GMT           = ../libgmt.la ../libgmtpsl.la
  CFLAGS                = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include
  
  all:          img2mercgrd
Index: pkgsrc/graphics/GMT/patches/patch-ap
diff -u pkgsrc/graphics/GMT/patches/patch-ap:1.4 pkgsrc/graphics/GMT/patches/patch-ap:1.5
--- pkgsrc/graphics/GMT/patches/patch-ap:1.4    Tue Nov 14 13:16:00 2006
+++ pkgsrc/graphics/GMT/patches/patch-ap        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.4 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-ap,v 1.5 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -12,7 +12,7 @@ Libtoolize.
 +CDF           = -Wl,-R$(NETCDFLIB) -L$(NETCDFLIB) -lnetcdf
  CFLAGS                = $(CC_OPT) -I$(srcdir) -I$(NETCDFINC)
 -ALLLIB                = -L.. -L$(libdir) -lgmt -lgmtps -lpsl $(CDF) $(LIBS) $(LDFLAGS)
-+ALLLIB                = ../libgmt.la ../libgmtps.la ../libpsl.la $(CDF) $(LIBS) $(LDFLAGS)
++ALLLIB                = ../libgmt.la ../libgmtps.la ../libgmtpsl.la $(CDF) $(LIBS) $(LDFLAGS)
  #
  #
  
Index: pkgsrc/graphics/GMT/patches/patch-ar
diff -u pkgsrc/graphics/GMT/patches/patch-ar:1.4 pkgsrc/graphics/GMT/patches/patch-ar:1.5
--- pkgsrc/graphics/GMT/patches/patch-ar:1.4    Tue Nov 14 13:16:00 2006
+++ pkgsrc/graphics/GMT/patches/patch-ar        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.4 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-ar,v 1.5 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -9,7 +9,7 @@ Libtoolize.
  
  CFLAGS        = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include -I$(GMT_DEFAULT_PATH)/src
 -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)
++ALLLIB        = ../libgmt.la ../libgmtps.la ../libgmtpsl.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 segy2grd.c
Index: pkgsrc/graphics/GMT/patches/patch-as
diff -u pkgsrc/graphics/GMT/patches/patch-as:1.4 pkgsrc/graphics/GMT/patches/patch-as:1.5
--- pkgsrc/graphics/GMT/patches/patch-as:1.4    Tue Nov 14 13:16:00 2006
+++ pkgsrc/graphics/GMT/patches/patch-as        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.4 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-as,v 1.5 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -29,7 +29,7 @@ Libtoolize.
 -$(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 $@
++              @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo -L. -lspotter -L.. ../libgmtpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
  
  .c.o:
 -              $(CC) -c $(CFLAGS) $<
Index: pkgsrc/graphics/GMT/patches/patch-au
diff -u pkgsrc/graphics/GMT/patches/patch-au:1.4 pkgsrc/graphics/GMT/patches/patch-au:1.5
--- pkgsrc/graphics/GMT/patches/patch-au:1.4    Tue Nov 14 13:16:00 2006
+++ pkgsrc/graphics/GMT/patches/patch-au        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.4 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-au,v 1.5 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -9,7 +9,7 @@ Libtoolize.
  
  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)
++ALLLIB  = ../mgg/libgmt_mgg.la ../libgmt.la ../libgmtpsl.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
  

Index: pkgsrc/graphics/GMT/patches/patch-aq
diff -u pkgsrc/graphics/GMT/patches/patch-aq:1.5 pkgsrc/graphics/GMT/patches/patch-aq:1.6
--- pkgsrc/graphics/GMT/patches/patch-aq:1.5    Tue Nov 14 13:16:00 2006
+++ pkgsrc/graphics/GMT/patches/patch-aq        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.5 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-aq,v 1.6 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -29,12 +29,12 @@ Libtoolize.
 -$(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 $@
++              @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libgmt.la ../libgmtpsl.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 $@
++              @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libgmt.la ../libgmtps.la  ../libgmtpsl.la $(CDF) $(LIBS) -o $@
  
  .c.o:
 -              $(CC) -c $(CFLAGS) $<

Index: pkgsrc/graphics/GMT/patches/patch-at
diff -u pkgsrc/graphics/GMT/patches/patch-at:1.8 pkgsrc/graphics/GMT/patches/patch-at:1.9
--- pkgsrc/graphics/GMT/patches/patch-at:1.8    Thu Jun 12 02:14:31 2008
+++ pkgsrc/graphics/GMT/patches/patch-at        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.8 2008/06/12 02:14:31 joerg Exp $
+$NetBSD: patch-at,v 1.9 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -9,7 +9,7 @@ Libtoolize.
  
  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)
++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

Index: pkgsrc/graphics/GMT/patches/patch-ba
diff -u pkgsrc/graphics/GMT/patches/patch-ba:1.2 pkgsrc/graphics/GMT/patches/patch-ba:1.3
--- pkgsrc/graphics/GMT/patches/patch-ba:1.2    Thu Jun 12 02:14:31 2008
+++ pkgsrc/graphics/GMT/patches/patch-ba        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.2 2008/06/12 02:14:31 joerg Exp $
+$NetBSD: patch-ba,v 1.3 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -91,7 +91,7 @@ Libtoolize.
 -$(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 $@
++              @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libmgd77.la ../libgmt.la ../libgmtps.la ../libgmtpsl.la $(CDF) $(LIBS) -o $@
  
  .c.o:
 -              $(CC) -c $(CFLAGS) $<

Index: pkgsrc/graphics/GMT/patches/patch-bb
diff -u pkgsrc/graphics/GMT/patches/patch-bb:1.1 pkgsrc/graphics/GMT/patches/patch-bb:1.2
--- pkgsrc/graphics/GMT/patches/patch-bb:1.1    Tue Nov 14 13:16:00 2006
+++ pkgsrc/graphics/GMT/patches/patch-bb        Fri Nov  8 03:09:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.1 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-bb,v 1.2 2019/11/08 03:09:22 kivinen Exp $
 
 Libtoolize.
 
@@ -18,7 +18,7 @@ Libtoolize.
  
  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)
++XLIBS=@X_PRE_LIBS@ @X_LIBS@ -lXaw -lXt -lXmu -lXext -lX11 @X_EXTRA_LIBS@ ../libgmt.la ../libgmtpsl.la $(CDF)
  
  all:          @buildtarget@
Home | Main Index | Thread Index | Old Index