Add DESTDIR support.

8 files changed, 52 insertions, 45 deletions

diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
index 1549f627d5b..730fd00a0a0 100644
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/05/26 02:13:20 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2008/06/12 02:14:31 joerg Exp $
 
 DISTNAME=	GMT4.1.4
 PKGNAME=	GMT-4.1.4
@@ -17,6 +17,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gmt.soest.hawaii.edu/
 COMMENT=	Generic Mapping Tools
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	${DISTNAME}
 
@@ -40,26 +42,23 @@ post-extract:
 	${MV} -f ${WRKSRC}/www/gmt/doc/pdf ${WRKSRC}
 	${RM} -f ${WRKSRC}/examples/*.bat ${WRKSRC}/examples/*/*.bat
 
+INSTALLATION_DIRS=	share/doc/gmt share/examples/gmt/tutorial share/gmt
+
+pre-install:
+	rm -f ${WRKSRC}/share/.gmtdefaults_SI.orig
+	rm -f ${WRKSRC}/share/.gmtdefaults_US.orig
+	rm -f ${WRKSRC}/share/gmt.conf.orig
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gmt
 	cd ${WRKSRC}/pdf && ${INSTALL_DATA} GMT_Docs.pdf		\
-		 GMT_Tutorial.pdf ${PREFIX}/share/doc/gmt
-	(cd ${PREFIX}/share/doc/html/gmt/doc && ${LN} -sf		\
-	../../../gmt pdf)
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt/tutorial
+		 GMT_Tutorial.pdf ${DESTDIR}${PREFIX}/share/doc/gmt
+	ln -sf ../../../gmt ${DESTDIR}${PREFIX}/share/doc/html/gmt/doc/pdf
 	cd ${WRKSRC}/tutorial && ${INSTALL_DATA} bermuda.nc quakes.cpt	\
 		ship.xyz us.nc data quakes.ngdc topo.cpt		\
-		${PREFIX}/share/examples/gmt/tutorial;
-	${INSTALL_DATA_DIR} ${PREFIX}/share/gmt
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/share
-	cd ${WRKSRC}/share && pax -rw . ${PREFIX}/share/gmt
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/examples/
-	cd ${WRKSRC}/examples && pax -rw . ${PREFIX}/share/examples/gmt
-	${RM} ${PREFIX}/share/gmt/.gmtdefaults_SI.orig
-	${RM} ${PREFIX}/share/gmt/.gmtdefaults_US.orig
-	${RM} ${PREFIX}/share/gmt/gmt.conf.orig
-	cd ${WRKDIR}/share && pax -rw . ${PREFIX}/share/gmt
+		${DESTDIR}${PREFIX}/share/examples/gmt/tutorial;
+	cd ${WRKSRC}/share && pax -rw . ${DESTDIR}${PREFIX}/share/gmt
+	cd ${WRKDIR}/share && pax -rw . ${DESTDIR}${PREFIX}/share/gmt
+	cd ${WRKSRC}/examples && pax -rw . ${DESTDIR}${PREFIX}/share/examples/gmt
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff --git a/graphics/GMT/distinfo b/graphics/GMT/distinfo
index a9f787a118b..df571319173 100644
--- a/graphics/GMT/distinfo
+++ b/graphics/GMT/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2007/07/23 11:56:05 wennmach Exp $
+$NetBSD: distinfo,v 1.16 2008/06/12 02:14:31 joerg Exp $
 
 SHA1 (GMT4.1.4/GMT4.1.4_man.tar.bz2) = bd07c5675a2dfbba9f8d05864a1bf563c042e5dc
 RMD160 (GMT4.1.4/GMT4.1.4_man.tar.bz2) = 42927181461b35294a8702499d2a66501555dc8b
@@ -33,8 +33,8 @@ Size (GMT4.1.4/GMT4.1_full.tar.bz2) = 28805855 bytes
 SHA1 (GMT4.1.4/GMT4.1_high.tar.bz2) = 38f221c050be8a5c21fa54dd1c8da2b0ca230910
 RMD160 (GMT4.1.4/GMT4.1_high.tar.bz2) = 82bb0417a9f5c92c2d5f96a173478a0c67c02b2b
 Size (GMT4.1.4/GMT4.1_high.tar.bz2) = 8644144 bytes
-SHA1 (patch-aa) = b548d839e719ea92d8cfa11f72069216ee2ef43d
-SHA1 (patch-ab) = a1d95e5654f0b202d6a1f8d7bd7c146d317191d1
+SHA1 (patch-aa) = 66afc127dcf3cbafc4e6d7ee979f0403703ce163
+SHA1 (patch-ab) = 7449fd466d969c2b882218eb59e63c4e0b2c64d3
 SHA1 (patch-ac) = 70e02872abf33386ed766b2ec59270227ed6571d
 SHA1 (patch-ad) = fab72f2d1942f548f87154da39f5344fe2693a8a
 SHA1 (patch-ae) = 7f74635ab750a6c03cb8cae1cf8b99a00a5b63da
@@ -43,18 +43,18 @@ SHA1 (patch-ag) = 93cea6588dba67624a54251faf9b47fd3eeb6c2b
 SHA1 (patch-ah) = 7925e788bb0bb753ab65d7379e90bedb2a47cece
 SHA1 (patch-ai) = 6bead94706dedbadfa87fd3ac4668783ae6869ab
 SHA1 (patch-aj) = 735d9a56f796ae905e52f45dcf2079b2a19b0c77
-SHA1 (patch-ak) = 5e9a6f7e287ef0cc7b757029e66c406ac9649eac
-SHA1 (patch-al) = b438da24161e7c6031e6337d9ff7ca22294fd4d9
+SHA1 (patch-ak) = 4d55645a0750f2c4a850b627763ed1de508b852a
+SHA1 (patch-al) = 35303bd0de71eec8a759b95b83321b442a37b7c8
 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) = 731039e254c4bf0a8f1346b07fcb211a8bc0661f
+SHA1 (patch-at) = d799fc9a000d331a73ef07fbe758e8c8b273ef58
 SHA1 (patch-au) = af7b30735382479dc4c4ac813244feb3f116bb6e
 SHA1 (patch-ay) = eccd5c6dee172793d3e2499447386cb262897a32
 SHA1 (patch-az) = 20a0266f828e5c0c2dd437e279374593b349a1cf
-SHA1 (patch-ba) = e1b331a4946472582f1c948c416b9cd108316fbd
+SHA1 (patch-ba) = 865e9197cde43566ef7f85aa5f79ed55d08f2d5d
 SHA1 (patch-bb) = 65a651d2075d6457e7725bbe8196c7a514fb3414
 SHA1 (patch-bc) = 706878d5067eb22b579b110929a1069d67aece64
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