Changes 3.38:

 Bug fixes:
   Fixed my bungled installation of Bader's patch allowing EPS previews
   Fiddled with prg2lout.c hoping to fix its intermittent crash bug
 Converted "non-zero exit status of filter" from a fatal error to a
   warning, so the unfixed prg2lout error has fewer repercussions

3 files changed, 68 insertions, 31 deletions

diff --git a/textproc/lout/Makefile b/textproc/lout/Makefile
index d3ccb6d3652..2b0ed91d7ba 100644
--- a/textproc/lout/Makefile
+++ b/textproc/lout/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2010/06/28 10:41:53 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.15 2011/01/20 09:46:55 adam Exp $
 
-DISTNAME=	lout-3.26
-PKGREVISION=	1
+DISTNAME=	lout-3.38
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lout/}
 
 MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://lout.sourceforge.net/
 COMMENT=	Basser Lout, a TeX/troff-like formatter with PostScript/PDF output
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/textproc/lout/distinfo b/textproc/lout/distinfo
index d46a452e0bf..a76da2f0d7f 100644
--- a/textproc/lout/distinfo
+++ b/textproc/lout/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2010/06/28 10:41:53 joerg Exp $
+$NetBSD: distinfo,v 1.7 2011/01/20 09:46:55 adam 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) = e2318c006d3af79ae42a1217e10e0ca4a48cdfc5
+SHA1 (lout-3.38.tar.gz) = 2c4aec500dc27a00298f8265b9249d74d97e5466
+RMD160 (lout-3.38.tar.gz) = 8835b223f67b383bdbb1d4105a28e002745d4dbb
+Size (lout-3.38.tar.gz) = 2147395 bytes
+SHA1 (patch-aa) = c65595b70cb78d83ea58ff7eb7e05c8602f5a5bc
diff --git a/textproc/lout/patches/patch-aa b/textproc/lout/patches/patch-aa
index 2118c816ac3..1888e9ae848 100644
--- a/textproc/lout/patches/patch-aa
+++ b/textproc/lout/patches/patch-aa
@@ -1,23 +1,24 @@
-$NetBSD: patch-aa,v 1.6 2010/06/28 10:41:53 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2011/01/20 09:46:56 adam Exp $
 
---- makefile.orig	2002-10-15 23:11:05.000000000 +0000
+--- makefile.orig	2008-10-13 21:35:17.000000000 +0000
 +++ makefile
-@@ -276,10 +276,10 @@ SAFEDFT = 0
- DEBUGGING = 1
- TRACING = -g
- 
--BINDIR	= /home/jeff/bin
--LIBDIR	= /home/jeff/lout.lib
--DOCDIR	= /home/jeff/lout.doc
--MANDIR	= /home/jeff/lout.man
-+BINDIR	= ${DESTDIR}@PREFIX@/bin
-+LIBDIR	= ${DESTDIR}@PREFIX@/share/lout
-+DOCDIR	= ${DESTDIR}@PREFIX@/share/doc/lout
-+MANDIR	= ${DESTDIR}@PREFIX@/${PKGMANDIR}/man1
+@@ -269,11 +269,11 @@ TRACING =
+ # DEBUGGING = 1
+ # TRACING = -g
+ 
+-PREFIX	= /home/jeff
++PREFIX	= ${DESTDIR}/usr/pkg
+ BINDIR	= $(PREFIX)/bin
+-LOUTLIBDIR	= $(PREFIX)/lout.lib
+-LOUTDOCDIR	= $(PREFIX)/lout.doc
+-MANDIR	= $(PREFIX)/lout.man
++LOUTLIBDIR	= $(PREFIX)/share/lout
++LOUTDOCDIR	= $(PREFIX)/share/doc/lout
++MANDIR	= $(PREFIX)/${PKGMANDIR}/man1
  
  LIBFONT = font
  LIBMAPS = maps
-@@ -297,8 +297,8 @@ LOC_DE	= de
+@@ -291,17 +291,16 @@ LOC_DE	= de
  
  COLLATE	= 1
  
@@ -27,17 +28,54 @@ $NetBSD: patch-aa,v 1.6 2010/06/28 10:41:53 joerg Exp $
 +ZLIB		= -lz
  ZLIBPATH	=
  
- CC	= gcc
-@@ -392,7 +392,7 @@ install: lout prg2lout
- 	chmod 755 $(LIBDIR)/$(LIBLOCA)
+-CC	= gcc
+ 
+ RCOPY	= cp -r
+ 
+-COPTS	= -ansi -pedantic -Wall -O3
++COPTS	= -ansi -pedantic -Wall
+ 
+-CFLAGS	= -DOS_UNIX=$(OSUNIX)					\
++CFLAGS	+= -DOS_UNIX=$(OSUNIX)					\
+ 	  -DOS_DOS=$(OSDOS)					\
+ 	  -DOS_MAC=$(OSMAC)					\
+ 	  -DDB_FIX=$(DBFIX)					\
+@@ -333,7 +332,7 @@ OBJS	= z01.o z02.o z03.o z04.o z05.o z06
+ 	  z49.o z50.o z51.o z52.o
+ 
+ lout:	$(OBJS)
+-	$(CC) -o lout $(OBJS) $(ZLIB) -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o lout $(OBJS) $(ZLIB) -lm
+ 	chmod a+x lout
+ 
+ $(OBJS): externs.h
+@@ -341,7 +340,7 @@ $(OBJS): externs.h
+ externs.h:
+ 
+ prg2lout:	prg2lout.c
+-	$(CC) $(COPTS) -o prg2lout prg2lout.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o prg2lout prg2lout.c
+ 	chmod a+x prg2lout
+ 
+ all:	lout prg2lout
+@@ -387,7 +386,7 @@ install: lout prg2lout
+ 	chmod 755 $(LOUTLIBDIR)/$(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
+-	$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
++	$(BINDIR)/lout -D $(LIBDIR)/$(LIBDATA) -H $(LIBDIR)/$(LIBHYPH) -I $(LIBDIR)/$(LIBINCL) -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
  	@echo ""
  	@echo "(d) Changing mode of files just created by initializing run"
- 	chmod 644 $(LIBDIR)/$(LIBDATA)/*
-@@ -450,3 +450,6 @@ clean:	
+ 	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
+@@ -406,6 +405,7 @@ installman:
+ installdoc:
+ 	@echo ""
+ 	@echo "Creating LOUTDOCDIR $(LOUTDOCDIR) and copying documentation into it"
++	mkdir $(LOUTDOCDIR)
+ 	$(RCOPY) doc/* $(LOUTDOCDIR)
+ 	chmod 755 $(LOUTDOCDIR)
+ 	chmod 755 $(LOUTDOCDIR)/*
+@@ -447,3 +447,6 @@ clean:	
  	-rm -f lout prg2lout *.o
  
  restart:	clean uninstall