Thu Jan 20 09:46:56 2011 UTC ()
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


(adam)
diff -r1.14 -r1.15 pkgsrc/textproc/lout/Makefile
diff -r1.6 -r1.7 pkgsrc/textproc/lout/distinfo
diff -r1.6 -r1.7 pkgsrc/textproc/lout/patches/patch-aa
cvs diff -r1.14 -r1.15 pkgsrc/textproc/lout/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/lout/Makefile 2010/06/28 10:41:53 1.14
+++ pkgsrc/textproc/lout/Makefile 2011/01/20 09:46:55 1.15
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.14 2010/06/28 10:41:53 joerg Exp $ 1# $NetBSD: Makefile,v 1.15 2011/01/20 09:46:55 adam Exp $
2# 
3 2
4DISTNAME= lout-3.26 3DISTNAME= lout-3.38
5PKGREVISION= 1 
6CATEGORIES= textproc 4CATEGORIES= textproc
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lout/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lout/}
8 6
9MAINTAINER= tsarna@NetBSD.org 7MAINTAINER= tsarna@NetBSD.org
10HOMEPAGE= http://lout.sourceforge.net/ 8HOMEPAGE= http://lout.sourceforge.net/
11COMMENT= Basser Lout, a TeX/troff-like formatter with PostScript/PDF output 9COMMENT= Basser Lout, a TeX/troff-like formatter with PostScript/PDF output
 10LICENSE= gnu-gpl-v3
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15PLIST_SRC= ${WRKDIR}/.PLIST_SRC 14PLIST_SRC= ${WRKDIR}/.PLIST_SRC
16INSTALL_TARGET= allinstall 15INSTALL_TARGET= allinstall
17INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc 16INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc
18 17
19do-configure: 18do-configure:
20 ${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.in 19 ${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.in
21 ${SED} -e "s,@PREFIX@,${PREFIX}," <${WRKSRC}/makefile.in >${WRKSRC}/Makefile 20 ${SED} -e "s,@PREFIX@,${PREFIX}," <${WRKSRC}/makefile.in >${WRKSRC}/Makefile
22 21
23post-install: 22post-install:
24 ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC} 23 ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
cvs diff -r1.6 -r1.7 pkgsrc/textproc/lout/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/lout/distinfo 2010/06/28 10:41:53 1.6
+++ pkgsrc/textproc/lout/distinfo 2011/01/20 09:46:55 1.7
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.6 2010/06/28 10:41:53 joerg Exp $ 1$NetBSD: distinfo,v 1.7 2011/01/20 09:46:55 adam Exp $
2 2
3SHA1 (lout-3.26.tar.gz) = f32c15a538a0b46b85ccaa1a9716c4c3b87dcd75 3SHA1 (lout-3.38.tar.gz) = 2c4aec500dc27a00298f8265b9249d74d97e5466
4RMD160 (lout-3.26.tar.gz) = 336f341dd79b128fa945f08c463ec944cd82d5d2 4RMD160 (lout-3.38.tar.gz) = 8835b223f67b383bdbb1d4105a28e002745d4dbb
5Size (lout-3.26.tar.gz) = 1881323 bytes 5Size (lout-3.38.tar.gz) = 2147395 bytes
6SHA1 (patch-aa) = e2318c006d3af79ae42a1217e10e0ca4a48cdfc5 6SHA1 (patch-aa) = c65595b70cb78d83ea58ff7eb7e05c8602f5a5bc
cvs diff -r1.6 -r1.7 pkgsrc/textproc/lout/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/lout/patches/patch-aa 2010/06/28 10:41:53 1.6
+++ pkgsrc/textproc/lout/patches/patch-aa 2011/01/20 09:46:56 1.7
@@ -1,46 +1,84 @@ @@ -1,46 +1,84 @@
1$NetBSD: patch-aa,v 1.6 2010/06/28 10:41:53 joerg Exp $ 1$NetBSD: patch-aa,v 1.7 2011/01/20 09:46:56 adam Exp $
2 2
3--- makefile.orig 2002-10-15 23:11:05.000000000 +0000 3--- makefile.orig 2008-10-13 21:35:17.000000000 +0000
4+++ makefile 4+++ makefile
5@@ -276,10 +276,10 @@ SAFEDFT = 0 5@@ -269,11 +269,11 @@ TRACING =
6 DEBUGGING = 1 6 # DEBUGGING = 1
7 TRACING = -g 7 # TRACING = -g
8  8
9-BINDIR = /home/jeff/bin 9-PREFIX = /home/jeff
10-LIBDIR = /home/jeff/lout.lib 10+PREFIX = ${DESTDIR}/usr/pkg
11-DOCDIR = /home/jeff/lout.doc 11 BINDIR = $(PREFIX)/bin
12-MANDIR = /home/jeff/lout.man 12-LOUTLIBDIR = $(PREFIX)/lout.lib
13+BINDIR = ${DESTDIR}@PREFIX@/bin 13-LOUTDOCDIR = $(PREFIX)/lout.doc
14+LIBDIR = ${DESTDIR}@PREFIX@/share/lout 14-MANDIR = $(PREFIX)/lout.man
15+DOCDIR = ${DESTDIR}@PREFIX@/share/doc/lout 15+LOUTLIBDIR = $(PREFIX)/share/lout
16+MANDIR = ${DESTDIR}@PREFIX@/${PKGMANDIR}/man1 16+LOUTDOCDIR = $(PREFIX)/share/doc/lout
 17+MANDIR = $(PREFIX)/${PKGMANDIR}/man1
17  18
18 LIBFONT = font 19 LIBFONT = font
19 LIBMAPS = maps 20 LIBMAPS = maps
20@@ -297,8 +297,8 @@ LOC_DE = de 21@@ -291,17 +291,16 @@ LOC_DE = de
21  22
22 COLLATE = 1 23 COLLATE = 1
23  24
24-PDF_COMPRESSION = 0 25-PDF_COMPRESSION = 0
25-ZLIB = 26-ZLIB =
26+PDF_COMPRESSION = 1 27+PDF_COMPRESSION = 1
27+ZLIB = -lz 28+ZLIB = -lz
28 ZLIBPATH = 29 ZLIBPATH =
29  30
30 CC = gcc 31-CC = gcc
31@@ -392,7 +392,7 @@ install: lout prg2lout 32
32 chmod 755 $(LIBDIR)/$(LIBLOCA) 33 RCOPY = cp -r
 34
 35-COPTS = -ansi -pedantic -Wall -O3
 36+COPTS = -ansi -pedantic -Wall
 37
 38-CFLAGS = -DOS_UNIX=$(OSUNIX) \
 39+CFLAGS += -DOS_UNIX=$(OSUNIX) \
 40 -DOS_DOS=$(OSDOS) \
 41 -DOS_MAC=$(OSMAC) \
 42 -DDB_FIX=$(DBFIX) \
 43@@ -333,7 +332,7 @@ OBJS = z01.o z02.o z03.o z04.o z05.o z06
 44 z49.o z50.o z51.o z52.o
 45
 46 lout: $(OBJS)
 47- $(CC) -o lout $(OBJS) $(ZLIB) -lm
 48+ $(CC) $(CFLAGS) $(LDFLAGS) -o lout $(OBJS) $(ZLIB) -lm
 49 chmod a+x lout
 50
 51 $(OBJS): externs.h
 52@@ -341,7 +340,7 @@ $(OBJS): externs.h
 53 externs.h:
 54
 55 prg2lout: prg2lout.c
 56- $(CC) $(COPTS) -o prg2lout prg2lout.c
 57+ $(CC) $(CFLAGS) $(LDFLAGS) -o prg2lout prg2lout.c
 58 chmod a+x prg2lout
 59
 60 all: lout prg2lout
 61@@ -387,7 +386,7 @@ install: lout prg2lout
 62 chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
33 @echo "" 63 @echo ""
34 @echo "(c) Initializing run (should be silent, no errors expected)" 64 @echo "(c) Initializing run (should be silent, no errors expected)"
35- $(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init 65- $(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
36+ $(BINDIR)/lout -D $(LIBDIR)/$(LIBDATA) -H $(LIBDIR)/$(LIBHYPH) -I $(LIBDIR)/$(LIBINCL) -x -s $(LIBDIR)/$(LIBINCL)/init 66+ $(BINDIR)/lout -D $(LIBDIR)/$(LIBDATA) -H $(LIBDIR)/$(LIBHYPH) -I $(LIBDIR)/$(LIBINCL) -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
37 @echo "" 67 @echo ""
38 @echo "(d) Changing mode of files just created by initializing run" 68 @echo "(d) Changing mode of files just created by initializing run"
39 chmod 644 $(LIBDIR)/$(LIBDATA)/* 69 chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
40@@ -450,3 +450,6 @@ clean:  70@@ -406,6 +405,7 @@ installman:
 71 installdoc:
 72 @echo ""
 73 @echo "Creating LOUTDOCDIR $(LOUTDOCDIR) and copying documentation into it"
 74+ mkdir $(LOUTDOCDIR)
 75 $(RCOPY) doc/* $(LOUTDOCDIR)
 76 chmod 755 $(LOUTDOCDIR)
 77 chmod 755 $(LOUTDOCDIR)/*
 78@@ -447,3 +447,6 @@ clean:
41 -rm -f lout prg2lout *.o 79 -rm -f lout prg2lout *.o
42  80
43 restart: clean uninstall 81 restart: clean uninstall
44+ 82+
45+all: lout prg2lout 83+all: lout prg2lout
46+allinstall: install installman installdoc 84+allinstall: install installman installdoc