Support staged installation.

4 files changed, 32 insertions, 12 deletions

diff --git a/devel/cvsclone/Makefile b/devel/cvsclone/Makefile
index 49627f80985..e1473368ba5 100644
--- a/devel/cvsclone/Makefile
+++ b/devel/cvsclone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/12 10:16:05 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/11 17:01:35 asau Exp $
 #
 
 DISTNAME=		cvsclone
@@ -12,6 +12,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Clone a CVS repository using the :pserver: access method
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
+PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALLATION_DIRS=	bin
 WRKSRC=			${WRKDIR}
 USE_TOOLS+=		lex
@@ -23,8 +24,8 @@ do-build:
 	cd ${WRKSRC} && ${HEAD} -88 cvsclone.l > README.txt
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cvsclone ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cvsclone
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/cvsclone
+	${INSTALL_PROGRAM} ${WRKSRC}/cvsclone ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cvsclone
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/share/doc/cvsclone
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xplot/Makefile b/graphics/xplot/Makefile
index b3e4f3b9d40..f42d1002645 100644
--- a/graphics/xplot/Makefile
+++ b/graphics/xplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/02/01 16:06:03 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2009/12/11 16:57:12 asau Exp $
 
 DISTNAME=	xplot-0.90.7.1
 PKGREVISION=	5
@@ -9,6 +9,8 @@ HOMEPAGE=	http://www.xplot.org/
 MAINTAINER=	dan@NetBSD.org
 COMMENT=	Plotting program, most often used in conjunction with tcptrace
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 
@@ -17,9 +19,9 @@ DOCFILES=	ANNOUNCE README README.tcp_plots
 #		demo.0 demo.1 demo.2 demo.3 demo.4 demo.5 demo.6 demo.7
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xplot
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xplot
 .for file in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xplot
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/share/doc/xplot
 .endfor
 
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/graphics/xplot/distinfo b/graphics/xplot/distinfo
index 66584883d2c..a2e36c38290 100644
--- a/graphics/xplot/distinfo
+++ b/graphics/xplot/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2006/10/14 09:13:14 bad Exp $
+$NetBSD: distinfo,v 1.9 2009/12/11 16:57:12 asau Exp $
 
 SHA1 (xplot-0.90.7.1.tar.gz) = 164074206addaeb971d2fa65069c7c7be654efc5
 RMD160 (xplot-0.90.7.1.tar.gz) = 166915e138ea52e58a67e80cb20d42005fa54621
 Size (xplot-0.90.7.1.tar.gz) = 60166 bytes
-SHA1 (patch-aa) = 48a475a550a2ea9d2bc50f2782d598830802817e
+SHA1 (patch-aa) = 487b2f4b55c4851ec7b0ae8770c5f741187a061d
 SHA1 (patch-ab) = 97c7b292a1c1f8d9294c69d4cc2eacbbff411d2e
 SHA1 (patch-ac) = 671b63a8db7c41df4e9f14147988d81ff921aca7
 SHA1 (patch-ad) = fd19823030badf91734fde92b45fcaecc06cf0f8
diff --git a/graphics/xplot/patches/patch-aa b/graphics/xplot/patches/patch-aa
index 769bdceffc7..1728a358223 100644
--- a/graphics/xplot/patches/patch-aa
+++ b/graphics/xplot/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2003/09/27 12:03:50 tron Exp $
+$NetBSD: patch-aa,v 1.8 2009/12/11 16:57:12 asau Exp $
 
---- Makefile.in.orig	Thu May  4 23:04:20 2000
-+++ Makefile.in	Sat Sep 27 14:00:42 2003
+--- Makefile.in.orig	2000-05-05 01:04:20.000000000 +0400
++++ Makefile.in	2009-12-11 19:54:53.000000000 +0300
 @@ -62,7 +62,7 @@
  all:	${PROG}
  
@@ -11,3 +11,20 @@ $NetBSD: patch-aa,v 1.7 2003/09/27 12:03:50 tron Exp $
  	-mv -f $@ $@.old
  	mv -f $@.new $@
  
+@@ -70,11 +70,11 @@
+ 	echo 'char *version_string = "'`cat version`'";' >version_string.c
+ 
+ install: all
+-	mkdir -p $(bindir)
+-	$(INSTALL_PROGRAM) xplot $(bindir)/xplot
+-	$(INSTALL) tcpdump2xplot.pl $(bindir)/tcpdump2xplot
+-	mkdir -p $(mandir)
+-	$(INSTALL_MAN) $(MANFILES) $(mandir)
++	mkdir -p $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) xplot $(DESTDIR)$(bindir)/xplot
++	$(INSTALL) tcpdump2xplot.pl $(DESTDIR)$(bindir)/tcpdump2xplot
++	mkdir -p $(DESTDIR)$(mandir)
++	$(INSTALL_MAN) $(MANFILES) $(DESTDIR)$(mandir)
+ clean:
+ 	rm -f ${PROG} ${PROG}.old *.o version_string.c
+