Support staged installation.

4 files changed, 35 insertions, 16 deletions

diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index 16a67a43dd1..849a32a7cfc 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/05/25 10:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2009/12/12 18:03:31 asau Exp $
 
 DISTNAME=	rman-3.2
 CATEGORIES=	textproc
@@ -8,8 +8,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://polyglotman.sourceforge.net/
 COMMENT=	Produces HTML from formatted and unformatted man pages
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rman ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/rman.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/rman ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/rman.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index 9824683c091..844e2c5fe53 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2007/03/24 19:21:33 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2009/12/12 18:00:19 asau Exp $
 
 DISTNAME=		tkman-2.2
 PKGREVISION=		1
@@ -13,6 +13,8 @@ DEPENDS+=		glimpse>=4.1:../../textproc/glimpse
 DEPENDS+=		rman>=3.1:../../textproc/rman
 DEPENDS+=		tk>=8.4:../../x11/tk
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin libexec
 
 post-extract:
@@ -26,6 +28,6 @@ post-install:
 		-e 's|@@PREFIX@@|${PREFIX}|' \
 		-e 's|@@X11BASE@@|${X11BASE}|' \
 		${FILESDIR}/mkindex > ${WRKDIR}/mkindex
-	${INSTALL_SCRIPT} ${WRKDIR}/mkindex ${PREFIX}/libexec
+	${INSTALL_SCRIPT} ${WRKDIR}/mkindex ${DESTDIR}${PREFIX}/libexec
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkman/distinfo b/x11/tkman/distinfo
index 79a0e161369..baf89712b6d 100644
--- a/x11/tkman/distinfo
+++ b/x11/tkman/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/03/03 04:03:28 minskim Exp $
+$NetBSD: distinfo,v 1.5 2009/12/12 18:00:19 asau Exp $
 
 SHA1 (tkman-2.2.tar.gz) = c406b755b32292caa321397e5b76fba29d4f70b7
 RMD160 (tkman-2.2.tar.gz) = a5ab43102c3f4a3d6327c46dd4ca3ed4eed3ce15
 Size (tkman-2.2.tar.gz) = 229273 bytes
-SHA1 (patch-aa) = b30770a9bcd44a009edcf193c1b9a23f9342adc8
+SHA1 (patch-aa) = 4efc8649d6fe59c4284ff8e51956efb7a6d2b589
 SHA1 (patch-ab) = 8e3fd6e2ac4bfa439184003c7b80f89789ac1eba
 SHA1 (patch-ac) = 4178da9370cdfc5da0231b12735da89f4cc6fe41
 SHA1 (patch-ad) = 3a406eba6089305ec218ce0428296cb7f4cb438a
diff --git a/x11/tkman/patches/patch-aa b/x11/tkman/patches/patch-aa
index 76fb5bc9729..60c639d45ef 100644
--- a/x11/tkman/patches/patch-aa
+++ b/x11/tkman/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2006/03/03 04:03:28 minskim Exp $
+$NetBSD: patch-aa,v 1.9 2009/12/12 18:00:19 asau Exp $
 
---- Makefile.orig	2006-03-02 19:38:02.000000000 -0800
-+++ Makefile
-@@ -25,13 +25,13 @@ mintk = 8.4
+--- Makefile.orig	2009-12-12 20:50:01.000000000 +0300
++++ Makefile	2009-12-12 20:57:13.000000000 +0300
+@@ -25,13 +25,13 @@
  
  ### you need to localize the paths on these lines
  
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.8 2006/03/03 04:03:28 minskim Exp $
  #BINDIR = /private/share/bin
  
  
-@@ -80,11 +80,25 @@ rfcdir = ""
+@@ -80,11 +80,25 @@
  # will examine for matches if a search in the usual locations fails while searching
  # for a man pages and displaying its associated binaries (if any).
  # Use this feature carefully as a large number of directories can slow down startup.
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.8 2006/03/03 04:03:28 minskim Exp $
  
  # names of common printers, in addition to default printer (PRINTER or LPDEST)
  # (individual users can edit this list in the Preferences panel)
-@@ -113,7 +127,7 @@ dpis = "75 100"
+@@ -113,7 +127,7 @@
  # Lines are cached in .../man/cat<n>@<line-length>; 
  #   that is, the line length is appended to the usual cache directory names
  #manformat = {groff -te -Tascii -man /tmp/ll -}
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.8 2006/03/03 04:03:28 minskim Exp $
  # Ultrix users should uncomment the following line (you don't have eqn)
  #manformat = {tbl | nroff -man }
  # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff
-@@ -121,7 +135,7 @@ manformat = {groff -te -Tlatin1 -man /tm
+@@ -121,7 +135,7 @@
  #  space between the .de and the macro name, and groff doesn't like this.)
  #manformat = {tbl | neqn | nroff -man }
  # BSD macros (.Sh, .Ss, .PP, ...) need -mandoc
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.8 2006/03/03 04:03:28 minskim Exp $
  # BSDI
  #manformat = {tbl | eqn -Tascii | nroff -man }
  # It's actually legal to leave this empty if all the pages you'll ever
-@@ -349,8 +363,8 @@ tkman: $(srcs) $(libs) Makefile
+@@ -349,8 +363,8 @@
  	echo 'set manx(mintcl) $(mintcl)' >> tkman
  	echo 'set manx(mintk) $(mintk)' >> tkman
  	echo 'set manx(newuser) $(newuser)' >> tkman
@@ -76,7 +76,7 @@ $NetBSD: patch-aa,v 1.8 2006/03/03 04:03:28 minskim Exp $
  	echo 'set man(zcat) $(zcat)' >> tkman
  	echo 'set man(compress) $(compress)' >> tkman
  	echo 'set man(apropos) $(apropos)' >> tkman
-@@ -428,6 +442,9 @@ tkman: $(srcs) $(libs) Makefile
+@@ -428,6 +442,9 @@
  	echo 'image create bitmap texRebus -data {' >> tkman
  	cat xbm/tex.xbm >> tkman
  	echo '}' >> tkman
@@ -86,3 +86,16 @@ $NetBSD: patch-aa,v 1.8 2006/03/03 04:03:28 minskim Exp $
  	echo 'set manx(solaris-bindings) {' >> tkman
  	cat contrib/solaris_bindings.tcl >> tkman
  	echo '}' >> tkman
+@@ -456,10 +473,8 @@
+ 	chmod +x retkman
+ 
+ install: tkman retkman
+-	$(CP) tkman $(BINDIR)
+-	chmod +rx $(BINDIR)/tkman
+-	$(CP) retkman $(BINDIR)
+-	chmod +rx $(BINDIR)/retkman
++	$(BSD_INSTALL_SCRIPT) tkman $(DESTDIR)$(BINDIR)
++	$(BSD_INSTALL_SCRIPT) retkman $(DESTDIR)$(BINDIR)
+ 	@echo 'You also need RosettaMan to run TkMan.'
+ 
+ test: dox tkman