Support staged installation.

4 files changed, 51 insertions, 11 deletions

diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index b9c76b8c7b2..4354dcdc83a 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/02/15 15:48:46 gdt Exp $
+# $NetBSD: Makefile,v 1.28 2009/12/11 01:41:53 asau Exp $
 #
 
 DISTNAME=		rcs-5.7
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.cs.purdue.edu/homes/trinkle/RCS/
 COMMENT=		GNU Revision Control System - version control software
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
 .include "../../mk/bsd.prefs.mk"
@@ -25,9 +26,9 @@ CONFIGURE_ENV+=		PATH=${LOCALBASE}/bin:"$$PATH"
 CONFIGURE_HAS_MANDIR=	no
 
 post-install:
-	${RM} -f ${PREFIX}/bin/rcslog
-	${LN} -s ${PREFIX}/bin/rlog ${PREFIX}/bin/rcslog
-	${RM} -f ${PREFIX}/${PKGMANDIR}/man1/rcslog.1 ${PREFIX}/${PKGMANDIR}/man1/rcslog.1.gz
-	${LN} -s ${PREFIX}/${PKGMANDIR}/man1/rlog.1 ${PREFIX}/${PKGMANDIR}/man1/rcslog.1
+	${RM} -f ${DESTDIR}${PREFIX}/bin/rcslog
+	${LN} -s ${DESTDIR}${PREFIX}/bin/rlog ${DESTDIR}${PREFIX}/bin/rcslog
+	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rcslog.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rcslog.1.gz
+	${LN} -s ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rlog.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/rcslog.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rcs/distinfo b/devel/rcs/distinfo
index de7ba7b33e1..cee0dc9acbf 100644
--- a/devel/rcs/distinfo
+++ b/devel/rcs/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2008/02/14 21:42:20 tnn Exp $
+$NetBSD: distinfo,v 1.10 2009/12/11 01:41:53 asau Exp $
 
 SHA1 (rcs-5.7.tar.gz) = a5c7982cf538d5e006b5db40f0aefaea5eb2cbba
 RMD160 (rcs-5.7.tar.gz) = 6ade4d835f7586416abe8b9bc768912eb722dff3
 Size (rcs-5.7.tar.gz) = 282413 bytes
-SHA1 (patch-ab) = aec735f6e1746ced1179049bab46f4f1521996ee
+SHA1 (patch-ab) = ea5df55a17845ea8255ae3cc454d7ba0b90958dc
 SHA1 (patch-ac) = d529a44d9562c5c734555391e8cf594b4fc858a3
+SHA1 (patch-ad) = 26fc5bed4f4fdcbb5b4b1d508d128d2528a6815c
diff --git a/devel/rcs/patches/patch-ab b/devel/rcs/patches/patch-ab
index eb5955a5582..1caf89848a5 100644
--- a/devel/rcs/patches/patch-ab
+++ b/devel/rcs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2008/02/14 21:42:21 tnn Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/11 01:41:53 asau Exp $
 
---- man/Makefile.in.orig	1995-06-16 08:19:24.000000000 +0200
-+++ man/Makefile.in
-@@ -34,8 +34,8 @@ INSTALL_DATA = @INSTALL_DATA@
+--- man/Makefile.in.orig	1995-06-16 10:19:24.000000000 +0400
++++ man/Makefile.in	2009-12-11 03:40:07.000000000 +0300
+@@ -34,8 +34,8 @@
  PIC = @PIC@
  
  prefix = @prefix@
@@ -13,3 +13,23 @@ $NetBSD: patch-ab,v 1.3 2008/02/14 21:42:21 tnn Exp $
  man1ext = .1
  man5ext = .5
  
+@@ -49,16 +49,16 @@
+ check dvi info TAGS ::
+ 
+ installdirs :: ../mkinstalldirs
+-	-$(srcdir)/../mkinstalldirs $(man1dir) $(man5dir)
++	-$(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
+ 
+ man1pages = ci co ident merge rcs rcsclean rcsdiff rcsintro rcsmerge rlog
+ 
+ install :: installdirs
+ 	-for m in $(man1pages); do \
+-		$(INSTALL_DATA) $(srcdir)/$$m.1 $(man1dir)/$$m$(man1ext); \
++		$(INSTALL_DATA) $(srcdir)/$$m.1 $(DESTDIR)$(man1dir)/$$m$(man1ext); \
+ 	done
+ 	-{ test -f rcsfile.5 || cd $(srcdir); } && \
+-	$(INSTALL_DATA) rcsfile.5 $(man5dir)/rcsfile$(man5ext)
++	$(INSTALL_DATA) rcsfile.5 $(DESTDIR)$(man5dir)/rcsfile$(man5ext)
+ 
+ uninstall ::
+ 	for m in $(man1pages); do \
diff --git a/devel/rcs/patches/patch-ad b/devel/rcs/patches/patch-ad
new file mode 100644
index 00000000000..86bcc034d94
--- /dev/null
+++ b/devel/rcs/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2009/12/11 01:41:53 asau Exp $
+
+--- src/Makefile.in.orig	1995-06-16 10:19:24.000000000 +0400
++++ src/Makefile.in	2009-12-11 03:38:57.000000000 +0300
+@@ -110,11 +110,11 @@
+ 	$(CC) -c $(ALL_CFLAGS) $<
+ 
+ installdirs :: ../mkinstalldirs
+-	$(srcdir)/../mkinstalldirs $(bindir)
++	$(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
+ 
+ install :: all installdirs
+ 	for p in $(PROGRAMS); do \
+-	  $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
++	  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
+ 	done
+ 
+ uninstall ::