DESTDIR support

3 files changed, 27 insertions, 17 deletions

diff --git a/textproc/lout/Makefile b/textproc/lout/Makefile
index 61430cb2b1b..d3ccb6d3652 100644
--- a/textproc/lout/Makefile
+++ b/textproc/lout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/06/14 22:58:09 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/28 10:41:53 joerg Exp $
 #
 
 DISTNAME=	lout-3.26
@@ -10,9 +10,11 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://lout.sourceforge.net/
 COMMENT=	Basser Lout, a TeX/troff-like formatter with PostScript/PDF output
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 INSTALL_TARGET=	allinstall
-INSTALLATION_DIRS=	bin share/doc
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc
 
 do-configure:
 	${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.in
@@ -20,9 +22,8 @@ do-configure:
 
 post-install:
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${PREFIX}; ${FIND} share/doc/lout -type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} share/lout -type f -print >>${PLIST_SRC})
-	${ECHO} "@unexec ${RM} -rf %D/share/doc/lout" >>${PLIST_SRC}
+	(cd ${DESTDIR}${PREFIX}; ${FIND} share/doc/lout -type f -print >>${PLIST_SRC})
+	(cd ${DESTDIR}${PREFIX}; ${FIND} share/lout -type f -print >>${PLIST_SRC})
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/lout/distinfo b/textproc/lout/distinfo
index 442a7bca5b7..d46a452e0bf 100644
--- a/textproc/lout/distinfo
+++ b/textproc/lout/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/04/01 19:36:08 rillig Exp $
+$NetBSD: distinfo,v 1.6 2010/06/28 10:41:53 joerg Exp $
 
 SHA1 (lout-3.26.tar.gz) = f32c15a538a0b46b85ccaa1a9716c4c3b87dcd75
 RMD160 (lout-3.26.tar.gz) = 336f341dd79b128fa945f08c463ec944cd82d5d2
 Size (lout-3.26.tar.gz) = 1881323 bytes
-SHA1 (patch-aa) = c2b33f9a894346fc3754b8be470c2f4332034e5c
+SHA1 (patch-aa) = e2318c006d3af79ae42a1217e10e0ca4a48cdfc5
diff --git a/textproc/lout/patches/patch-aa b/textproc/lout/patches/patch-aa
index 252f9946695..2118c816ac3 100644
--- a/textproc/lout/patches/patch-aa
+++ b/textproc/lout/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2007/04/01 19:36:08 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2010/06/28 10:41:53 joerg Exp $
 
---- makefile.orig	2002-10-16 00:11:05.000000000 +0100
-+++ makefile	2003-09-15 10:19:50.000000000 +0100
-@@ -276,10 +276,10 @@
+--- makefile.orig	2002-10-15 23:11:05.000000000 +0000
++++ makefile
+@@ -276,10 +276,10 @@ SAFEDFT = 0
  DEBUGGING = 1
  TRACING = -g
  
@@ -10,14 +10,14 @@ $NetBSD: patch-aa,v 1.5 2007/04/01 19:36:08 rillig Exp $
 -LIBDIR	= /home/jeff/lout.lib
 -DOCDIR	= /home/jeff/lout.doc
 -MANDIR	= /home/jeff/lout.man
-+BINDIR	= @PREFIX@/bin
-+LIBDIR	= @PREFIX@/share/lout
-+DOCDIR	= @PREFIX@/share/doc/lout
-+MANDIR	= @PREFIX@/${PKGMANDIR}/man1
++BINDIR	= ${DESTDIR}@PREFIX@/bin
++LIBDIR	= ${DESTDIR}@PREFIX@/share/lout
++DOCDIR	= ${DESTDIR}@PREFIX@/share/doc/lout
++MANDIR	= ${DESTDIR}@PREFIX@/${PKGMANDIR}/man1
  
  LIBFONT = font
  LIBMAPS = maps
-@@ -297,8 +297,8 @@
+@@ -297,8 +297,8 @@ LOC_DE	= de
  
  COLLATE	= 1
  
@@ -28,7 +28,16 @@ $NetBSD: patch-aa,v 1.5 2007/04/01 19:36:08 rillig Exp $
  ZLIBPATH	=
  
  CC	= gcc
-@@ -450,3 +450,6 @@
+@@ -392,7 +392,7 @@ install: lout prg2lout
+ 	chmod 755 $(LIBDIR)/$(LIBLOCA)
+ 	@echo ""
+ 	@echo "(c) Initializing run (should be silent, no errors expected)"
+-	$(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init
++	$(BINDIR)/lout -D $(LIBDIR)/$(LIBDATA) -H $(LIBDIR)/$(LIBHYPH) -I $(LIBDIR)/$(LIBINCL) -x -s $(LIBDIR)/$(LIBINCL)/init
+ 	@echo ""
+ 	@echo "(d) Changing mode of files just created by initializing run"
+ 	chmod 644 $(LIBDIR)/$(LIBDATA)/*
+@@ -450,3 +450,6 @@ clean:	
  	-rm -f lout prg2lout *.o
  
  restart:	clean uninstall