user-destdir support

3 files changed, 27 insertions, 16 deletions

diff --git a/www/tcl-cgi/Makefile b/www/tcl-cgi/Makefile
index 7092bb39e36..872165cad22 100644
--- a/www/tcl-cgi/Makefile
+++ b/www/tcl-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:14 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/07 18:53:17 joerg Exp $
 #
 
 DISTNAME=	cgi.tcl
@@ -10,6 +10,8 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://expect.nist.gov/cgi.tcl/
 COMMENT=	Library of Tcl procedures to assist in writing CGI scripts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	tcl>=8.3.2:../../lang/tcl
 
 WRKSRC=		${WRKDIR}/cgi.tcl-1.3
@@ -17,10 +19,10 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 
 GNU_CONFIGURE=	yes
 
+INSTALLATION_DIRS=	share/doc/tcl/cgi-tcl share/examples/tcl/cgi-tcl
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcl/cgi-tcl
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tcl/cgi-tcl
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/tcl/cgi-tcl
-	${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/tcl/cgi-tcl
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/tcl/cgi-tcl
+	${INSTALL_DATA} ${WRKSRC}/example/* ${DESTDIR}${PREFIX}/share/examples/tcl/cgi-tcl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/tcl-cgi/distinfo b/www/tcl-cgi/distinfo
index e218b9b48bc..154e97a4e8c 100644
--- a/www/tcl-cgi/distinfo
+++ b/www/tcl-cgi/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:08:39 wiz Exp $
+$NetBSD: distinfo,v 1.6 2009/07/07 18:53:17 joerg Exp $
 
 SHA1 (tcl-cgi-1.3.0/cgi.tcl.tar.gz) = bbfbbbf4ce48da97ee33418a8e7790778ba84afa
 RMD160 (tcl-cgi-1.3.0/cgi.tcl.tar.gz) = 5165024a346d0e82e940baab1146905c1b8df8bd
 Size (tcl-cgi-1.3.0/cgi.tcl.tar.gz) = 114514 bytes
 SHA1 (patch-aa) = b37271c4b1d9357509ad0b95dbd432e4f1420fd9
-SHA1 (patch-ab) = cab2501a9067f279f08717948a1753619da8729d
+SHA1 (patch-ab) = 6f2267c8037e49b648f8be497254e8cc3f5ca28b
diff --git a/www/tcl-cgi/patches/patch-ab b/www/tcl-cgi/patches/patch-ab
index 140d6562328..9387eec2bb8 100644
--- a/www/tcl-cgi/patches/patch-ab
+++ b/www/tcl-cgi/patches/patch-ab
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2000/09/03 14:55:20 wiz Exp $
---- Makefile.in.orig	Thu Apr 20 11:21:24 2000
-+++ Makefile.in	Wed Aug 30 11:18:05 2000
-@@ -58,13 +58,13 @@
+$NetBSD: patch-ab,v 1.3 2009/07/07 18:53:17 joerg Exp $
+
+--- Makefile.in.orig	2000-04-20 17:21:24.000000000 +0200
++++ Makefile.in
+@@ -58,13 +58,13 @@ datadir = $(prefix)/lib
  
  mandir 	= $(prefix)/man
  man1dir = $(mandir)/man1
@@ -18,7 +19,7 @@ $NetBSD: patch-ab,v 1.2 2000/09/03 14:55:20 wiz Exp $
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -93,7 +93,7 @@
+@@ -93,19 +93,20 @@ dvi:
  # (but not the noninstalled files such as `make all' creates)
  uninstall:
  	-rm -f $(SCRIPTDIR)/cgi.tcl
@@ -27,12 +28,20 @@ $NetBSD: patch-ab,v 1.2 2000/09/03 14:55:20 wiz Exp $
  	-rm -f $(SCRIPTDIR)/pkgIndex.tcl
  
  .PHONY: install-info install info
-@@ -104,7 +104,7 @@
+ install-info:
+ 
+ install: all
+-	${srcdir}/mkinstalldirs $(man3dir) $(SCRIPTDIR) $(exampledir) $(exampledir)/data
++	${srcdir}/mkinstalldirs ${DESTDIR}$(man3dir) \
++	    ${DESTDIR}$(SCRIPTDIR) ${DESTDIR}$(exampledir) ${DESTDIR}$(exampledir)/data
  # install scripts
- 	$(INSTALL_DATA) cgi.tcl $(SCRIPTDIR)
+-	$(INSTALL_DATA) cgi.tcl $(SCRIPTDIR)
++	$(INSTALL_DATA) cgi.tcl ${DESTDIR}$(SCRIPTDIR)
  # install library man page
 -	$(INSTALL_DATA) cgi.tcl.man $(man3dir)/cgi.tcl.3
-+	$(INSTALL_DATA) cgi.tcl.man $(man3dir)/cgi.tcl.n
- 	$(INSTALL_DATA) pkgIndex.tcl $(SCRIPTDIR)
+-	$(INSTALL_DATA) pkgIndex.tcl $(SCRIPTDIR)
++	$(INSTALL_DATA) cgi.tcl.man ${DESTDIR}$(man3dir)/cgi.tcl.n
++	$(INSTALL_DATA) pkgIndex.tcl ${DESTDIR}$(SCRIPTDIR)
  
  examples:
+ 	for i in $(EXAMPLES) ; do \