Add DESTDIR support.

6 files changed, 29 insertions, 21 deletions

diff --git a/graphics/GMT/patches/patch-aa b/graphics/GMT/patches/patch-aa
index 8fbbf54de1e..35999c97ef4 100644
--- a/graphics/GMT/patches/patch-aa
+++ b/graphics/GMT/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-aa,v 1.9 2008/06/12 02:14:31 joerg Exp $
 
 Libtoolize.
 
---- src/Makefile.orig	2006-11-08 15:19:48.000000000 +0100
-+++ src/Makefile	2006-11-08 16:04:24.000000000 +0100
-@@ -43,7 +43,7 @@
+--- src/Makefile.orig	2006-11-01 16:41:02.000000000 +0000
++++ src/Makefile
+@@ -43,7 +43,7 @@ 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)
@@ -13,7 +13,7 @@ Libtoolize.
  
  PS	= -lpsl
  GMT	= -lgmt
-@@ -151,38 +151,34 @@
+@@ -151,38 +151,34 @@ gmt_notposix.h:	
  		./configure
  
  install:	all
@@ -65,7 +65,7 @@ Libtoolize.
  
  uninstall:
  		for i in $(ALLPROGS); do \
-@@ -207,13 +203,13 @@
+@@ -207,13 +203,13 @@ uninstall:
  		fi
  
  clean:
@@ -81,7 +81,7 @@ Libtoolize.
  		touch makegmt.macros
  
  distclean:	spotless
-@@ -225,40 +221,32 @@
+@@ -225,40 +221,32 @@ distclean:	spotless
  libs:		$(GMTLIB)
  
  pslib.o:	pslib.c $(PS_H) $(PS_I) gmt_notunix.h gmt_notposix.h gmt_math.h
@@ -103,19 +103,19 @@ Libtoolize.
 -./libpsl.$(SL):	pslib.o
 -		$(LD) $(LD_OPT) $? -o $@
 +libpsl.la:	pslib.o
-+		@$(LIBTOOL) --mode=link $(CC) -o $@ pslib.lo $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir)
++		@$(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)
 -		$(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) -o $@
 +libgmt.la:	$(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
 +		@$(LIBTOOL) --mode=link $(CC) -o $@ $(LIB_O:.o=.lo) \
 +		 $(TRIANGLE_O:.o=.lo) $(ALPHA_SINCOS_O:.o=.lo) $(LDFLAGS) \
-+		 $(CDF) $(LIBS) --version-info 0:0 -rpath $(libdir)
++		 $(CDF) $(LIBS) --version-info 0:0 -rpath $(PLAIN_LIBDIR)
  
 -./libgmtps.$(SL):	$(LIBPS_O)
 -		$(LD) $(LD_OPT) $(LIBPS_O) -o $@
 +libgmtps.la:	$(LIBPS_O) 
-+		@$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBPS_O:.o=.lo) $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir)
++		@$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBPS_O:.o=.lo) $(LDFLAGS) -lm --version-info 0:0 -rpath $(PLAIN_LIBDIR)
  
  #-------------------------------------------------------------------------------
  #	program dependencies
diff --git a/graphics/GMT/patches/patch-ab b/graphics/GMT/patches/patch-ab
index 718d2e0dd62..dd53ee679f8 100644
--- a/graphics/GMT/patches/patch-ab
+++ b/graphics/GMT/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.6 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-ab,v 1.7 2008/06/12 02:14:31 joerg 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
-@@ -49,6 +49,9 @@
+@@ -19,6 +19,7 @@ exec_prefix	= @exec_prefix@
+ srcdir		= @rootdir@/src
+ bindir		= $(DESTDIR)@bindir@
+ libdir		= $(DESTDIR)@libdir@
++PLAIN_LIBDIR	= @libdir@
+ includedir	= $(DESTDIR)@includedir@
+ mandir		= $(DESTDIR)@mandir@
+ datadir		= $(DESTDIR)@datadir@
+@@ -49,6 +50,9 @@ LIBS	= @LIBS@
  # Misc. Standard Utilities:
  #---------------------------------------------------------------
  INSTALL		= @INSTALL@
@@ -12,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2006/11/14 13:16:00 wennmach Exp $
  AWK		= @AWK@
  AS		= @AS@
  AR		= @AR@
-@@ -146,4 +149,4 @@
+@@ -146,4 +150,4 @@ ALPHA_SINCOS_O	= @ALPHA_SINCOS_O@
  #	Select STATIC (Default) or SHARED libraries
  #-------------------------------------------------------------------------------
  #
diff --git a/graphics/GMT/patches/patch-ak b/graphics/GMT/patches/patch-ak
index 0832b87e6d9..109735694c9 100644
--- a/graphics/GMT/patches/patch-ak
+++ b/graphics/GMT/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.4 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-ak,v 1.5 2008/06/12 02:14:31 joerg 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$(libdir) ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) grdraster.lo -L$(PLAIN_LIBDIR) ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster
  
  spotless:	clean
  
diff --git a/graphics/GMT/patches/patch-al b/graphics/GMT/patches/patch-al
index faf57fb7712..95baaffd1ba 100644
--- a/graphics/GMT/patches/patch-al
+++ b/graphics/GMT/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.5 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-al,v 1.6 2008/06/12 02:14:31 joerg Exp $
 
 Libtoolize.
 
@@ -44,7 +44,7 @@ Libtoolize.
  libgmt_mgg.a:	gmt_mgg.o
 -		$(AR) cvr libgmt_mgg.a $?
 -		$(RANLIB) libgmt_mgg.a
-+		@$(LIBTOOL) --mode=link $(CC) -o libgmt_mgg.la gmt_mgg.lo --version-info 0:0  -rpath $(libdir)
++		@$(LIBTOOL) --mode=link $(CC) -o libgmt_mgg.la gmt_mgg.lo --version-info 0:0  -rpath $(PLAIN_LIBDIR)
  
  gmt_mgg.o:	$(MGG_H)
  
diff --git a/graphics/GMT/patches/patch-at b/graphics/GMT/patches/patch-at
index f4bc26dfb1a..e8fd64d3c60 100644
--- a/graphics/GMT/patches/patch-at
+++ b/graphics/GMT/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.7 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-at,v 1.8 2008/06/12 02:14:31 joerg Exp $
 
 Libtoolize.
 
@@ -24,7 +24,7 @@ Libtoolize.
 -			$(AR) cvr libx2sys.a $?
 -			$(RANLIB) libx2sys.a
 +libx2sys.la:		x2sys.o
-+			$(LIBTOOL) --mode=link $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(libdir)
++			$(LIBTOOL) --mode=link $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(PLAIN_LIBDIR)
  
  install:		all
 -			for i in $(XSYSTEM); do \
diff --git a/graphics/GMT/patches/patch-ba b/graphics/GMT/patches/patch-ba
index e07b805d750..d4fac2d3d33 100644
--- a/graphics/GMT/patches/patch-ba
+++ b/graphics/GMT/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1 2006/11/14 13:16:00 wennmach Exp $
+$NetBSD: patch-ba,v 1.2 2008/06/12 02:14:31 joerg Exp $
 
 Libtoolize.
 
@@ -77,7 +77,7 @@ Libtoolize.
 -		$(AR) cvur $@ $?
 -		$(RANLIB) $@
 +libmgd77.la:	$(LIB_O)
-+		@$(LIBTOOL) --mode=link $(CC) -o libmgd77.la $(LIB_O:.o=.lo) --version-info 0:0  -rpath $(libdir)
++		@$(LIBTOOL) --mode=link $(CC) -o libmgd77.la $(LIB_O:.o=.lo) --version-info 0:0  -rpath $(PLAIN_LIBDIR)
  
  #-------------------------------------------------------------------------------
  #	program dependencies