Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching

error, and to sync with reality.

22 files changed, 47 insertions, 36 deletions

diff --git a/textproc/ja-groff/patches/patch-aa b/textproc/ja-groff/patches/patch-aa
index edfcf68776e..4f353861150 100644
--- a/textproc/ja-groff/patches/patch-aa
+++ b/textproc/ja-groff/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- afmtodit/Makefile.sub.orig	Wed Oct 28 21:48:22 1992
 +++ afmtodit/Makefile.sub	Tue Mar 26 22:38:08 1996
 @@ -15,7 +15,7 @@
diff --git a/textproc/ja-groff/patches/patch-ab b/textproc/ja-groff/patches/patch-ab
index 969f35af22c..dc42d7aa884 100644
--- a/textproc/ja-groff/patches/patch-ab
+++ b/textproc/ja-groff/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- Makefile.in.orig	Fri May 28 16:26:33 1999
 +++ Makefile.in	Fri May 28 16:34:14 1999
 @@ -175,7 +175,21 @@
diff --git a/textproc/ja-groff/patches/patch-ac b/textproc/ja-groff/patches/patch-ac
index 73c8e7e40be..2227e9e14b5 100644
--- a/textproc/ja-groff/patches/patch-ac
+++ b/textproc/ja-groff/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- troff/env.cc.orig	Fri May 28 14:52:15 1999
 +++ troff/env.cc	Fri May 28 15:00:12 1999
 @@ -765,7 +765,6 @@
diff --git a/textproc/ja-groff/patches/patch-ad b/textproc/ja-groff/patches/patch-ad
index 2c01d912635..57cddc74723 100644
--- a/textproc/ja-groff/patches/patch-ad
+++ b/textproc/ja-groff/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-ad,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- Makefile.comm.orig	Tue Jun 27 20:08:27 1995
 +++ Makefile.comm	Fri May 28 16:10:13 1999
 @@ -44,7 +44,7 @@
diff --git a/textproc/ja-groff/patches/patch-ae b/textproc/ja-groff/patches/patch-ae
index 21133cd0689..f50b20a1aeb 100644
--- a/textproc/ja-groff/patches/patch-ae
+++ b/textproc/ja-groff/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-ae,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- nroff/nroff.sh.orig	Fri May 28 17:03:23 1999
 +++ nroff/nroff.sh	Fri May 28 18:24:04 1999
 @@ -58,4 +58,4 @@
diff --git a/textproc/ja-groff/patches/patch-af b/textproc/ja-groff/patches/patch-af
index 44845f283c9..0e6fa05ca4d 100644
--- a/textproc/ja-groff/patches/patch-af
+++ b/textproc/ja-groff/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-af,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- devascii/DESC.proto.orig	Wed Jul 29 22:32:04 1992
 +++ devascii/DESC.proto	Mon May 31 14:38:42 1999
 @@ -5,4 +5,4 @@
diff --git a/textproc/ja-groff/patches/patch-ag b/textproc/ja-groff/patches/patch-ag
index 9e21fde1fe9..4ea9341164a 100644
--- a/textproc/ja-groff/patches/patch-ag
+++ b/textproc/ja-groff/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-ag,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- devdvi/DESC.in.orig	Mon May 31 13:36:28 1999
 +++ devdvi/DESC.in	Mon May 31 14:38:55 1999
 @@ -8,4 +8,4 @@
diff --git a/textproc/ja-groff/patches/patch-ah b/textproc/ja-groff/patches/patch-ah
index dfed1f23e4e..9bd974d893e 100644
--- a/textproc/ja-groff/patches/patch-ah
+++ b/textproc/ja-groff/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-ah,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- devlatin1/DESC.proto.orig	Wed Jul 29 22:32:26 1992
 +++ devlatin1/DESC.proto	Mon May 31 14:39:13 1999
 @@ -5,4 +5,4 @@
diff --git a/textproc/ja-groff/patches/patch-ai b/textproc/ja-groff/patches/patch-ai
index 74546e1cceb..341a29fc3a9 100644
--- a/textproc/ja-groff/patches/patch-ai
+++ b/textproc/ja-groff/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-ai,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- devlj4/DESC.in.orig	Wed Jul  6 22:10:25 1994
 +++ devlj4/DESC.in	Mon May 31 14:39:27 1999
 @@ -6,4 +6,4 @@
diff --git a/textproc/ja-groff/patches/patch-aj b/textproc/ja-groff/patches/patch-aj
index daf39fa24e1..cfb9ad38683 100644
--- a/textproc/ja-groff/patches/patch-aj
+++ b/textproc/ja-groff/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-aj,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- devnippon/DESC.proto.orig	Mon May 31 13:36:29 1999
 +++ devnippon/DESC.proto	Mon May 31 14:39:40 1999
 @@ -6,4 +6,4 @@
diff --git a/textproc/ja-groff/patches/patch-ak b/textproc/ja-groff/patches/patch-ak
index 9a7851e01fe..44877eb0103 100644
--- a/textproc/ja-groff/patches/patch-ak
+++ b/textproc/ja-groff/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-ak,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 --- devps/DESC.in.orig	Mon May 31 13:36:29 1999
 +++ devps/DESC.in	Mon May 31 14:39:52 1999
 @@ -11,4 +11,4 @@
diff --git a/textproc/ja-groff/patches/patch-al b/textproc/ja-groff/patches/patch-al
index 6e21165ff6a..ef7addd984d 100644
--- a/textproc/ja-groff/patches/patch-al
+++ b/textproc/ja-groff/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $
+$NetBSD: patch-al,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 
 --- include/lib.h.orig	Thu Jun 22 09:41:29 1995
 +++ include/lib.h
diff --git a/textproc/kbanner/PLIST b/textproc/kbanner/PLIST
index 74da37508df..359843baf81 100644
--- a/textproc/kbanner/PLIST
+++ b/textproc/kbanner/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 bin/kbanner
 man/man1/kbanner.1
diff --git a/textproc/kbanner/patches/patch-ab b/textproc/kbanner/patches/patch-ab
index 685c6192228..a8b6024e660 100644
--- a/textproc/kbanner/patches/patch-ab
+++ b/textproc/kbanner/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
+$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 
 --- kbanner.c.orig	Fri Oct 15 17:43:31 1993
 +++ kbanner.c	Thu May 18 00:28:39 2000
diff --git a/textproc/kbanner/patches/patch-ac b/textproc/kbanner/patches/patch-ac
index 61f4c9fced6..e19c9109c22 100644
--- a/textproc/kbanner/patches/patch-ac
+++ b/textproc/kbanner/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
+$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 
 --- font1.c.orig	Fri Oct 15 14:18:50 1993
 +++ font1.c	Thu May 18 00:27:02 2000
diff --git a/textproc/kbanner/patches/patch-ad b/textproc/kbanner/patches/patch-ad
index 3e8f061a22e..2a1b830651c 100644
--- a/textproc/kbanner/patches/patch-ad
+++ b/textproc/kbanner/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
+$NetBSD: patch-ad,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 
 --- font2.c.orig	Fri Oct 15 14:18:52 1993
 +++ font2.c	Thu May 18 00:27:02 2000
diff --git a/textproc/kbanner/patches/patch-ae b/textproc/kbanner/patches/patch-ae
index 8d422d0651d..301f1be0bdb 100644
--- a/textproc/kbanner/patches/patch-ae
+++ b/textproc/kbanner/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
+$NetBSD: patch-ae,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 
 --- font3.c.orig	Fri Oct 15 14:18:55 1993
 +++ font3.c	Thu May 18 00:27:03 2000
diff --git a/textproc/kbanner/patches/patch-af b/textproc/kbanner/patches/patch-af
index ffeb8a0193b..4e0f7003db2 100644
--- a/textproc/kbanner/patches/patch-af
+++ b/textproc/kbanner/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $
+$NetBSD: patch-af,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $
 
 JIS X0208-1990 characters.
 
diff --git a/textproc/lout/Makefile b/textproc/lout/Makefile
index 61430cb2b1b..ccb677a0181 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.13.10.1 2010/07/04 07:27:30 agc 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..a9ed3ec3108 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.5.32.1 2010/07/04 07:27:30 agc 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..98cddd4dc67 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.5.32.1 2010/07/04 07:27:30 agc 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
diff --git a/textproc/troffcvt/Makefile b/textproc/troffcvt/Makefile
index 876d112b1f1..fa89828d544 100644
--- a/textproc/troffcvt/Makefile
+++ b/textproc/troffcvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/07/07 20:35:27 joerg Exp $
+# $NetBSD: Makefile,v 1.16.8.1 2010/07/04 07:27:30 agc Exp $
 #
 
 DISTNAME=		troffcvt-1.04
@@ -11,6 +11,7 @@ HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Troff/groff to RTF/HTML/TEXT converter
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+MAKE_JOBS_SAFE=		no
 
 USE_TOOLS+=		perl:run