>Number:         18687
>Category:       pkg
>Synopsis:       update textproc/lout to 3.26 and fix default papersize configuration
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Oct 17 15:50:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Greg A. Woods
>Release:        pkgsrc-current 2002/10/15
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
System: NetBSD
>Description:

	the following changes update textproc/lout to use the new 3.26
	release and also add a minor new feature to automatically and
	correctly set the default papersize according to local
	configuration settings.

>How-To-Repeat:

>Fix:

cvs diff: Diffing textproc/lout
Index: textproc/lout/DESCR
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/textproc/lout/DESCR,v
retrieving revision 1.1
diff -c -r1.1 DESCR
*** textproc/lout/DESCR	31 Oct 2001 22:57:24 -0000	1.1
--- textproc/lout/DESCR	19 Apr 2002 01:27:31 -0000
***************
*** 1,7 ****
  THE LOUT DOCUMENT FORMATTING SYSTEM
  
  Lout is a document formatting system similar in style to LaTeX.  It
! offers a very full range of features, including PostScript, PDF, and
  plain text output, optimal paragraph and page breaking, automatic
  hyphenation, PostScript EPS file inclusion and generation, equation
  formatting, tables, diagrams, rotation and scaling, sorted indexes,
--- 1,7 ----
  THE LOUT DOCUMENT FORMATTING SYSTEM
  
  Lout is a document formatting system similar in style to LaTeX.  It
! offers a very full range of features, including PostScript, and
  plain text output, optimal paragraph and page breaking, automatic
  hyphenation, PostScript EPS file inclusion and generation, equation
  formatting, tables, diagrams, rotation and scaling, sorted indexes,
Index: textproc/lout/Makefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/textproc/lout/Makefile,v
retrieving revision 1.5
diff -c -r1.5 Makefile
*** textproc/lout/Makefile	17 Feb 2001 17:37:33 -0000	1.5
--- textproc/lout/Makefile	16 Oct 2002 19:27:00 -0000
***************
*** 1,16 ****
  # $NetBSD: Makefile,v 1.5 2001/02/17 17:37:33 wiz Exp $
  #
  
! DISTNAME=	lout-3.21
  CATEGORIES=	textproc
! MASTER_SITES=	ftp://ftp.cs.usyd.edu.au/jeff/lout/
  
  MAINTAINER=	tsarna@netbsd.org
  HOMEPAGE=	http://snark.niif.spb.su/~uwe/lout/lout.html
! COMMENT=	Basser Lout, a TeX/troff-like formatter with PostScript/PDF output
  
  PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
  INSTALL_TARGET=	allinstall
  
  do-configure:
  	${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.in
--- 1,26 ----
  # $NetBSD: Makefile,v 1.5 2001/02/17 17:37:33 wiz Exp $
  #
  
! DISTNAME=	lout-3.26
  CATEGORIES=	textproc
! MASTER_SITES=	ftp://ftp.it.usyd.edu.au/jeff/lout/
  
  MAINTAINER=	tsarna@netbsd.org
+ # XXX this page is sadly somewhat out-dated....
  HOMEPAGE=	http://snark.niif.spb.su/~uwe/lout/lout.html
! COMMENT=	The Lout Document Formatting System
  
  PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
  INSTALL_TARGET=	allinstall
+ 
+ .include "../../mk/bsd.prefs.mk"
+ 
+ # XXX unfortunately this isn't in <bsd.prefs.mk>, but only in <bsd.pkg.mk>
+ PATCHDIR=	${.CURDIR}/patches
+ 
+ .if exists(${PATCHDIR}/patch-optional-${PAPERSIZE}-papersize)
+ OPTIONAL_PATCHFILES+=	${PATCHDIR}/patch-optional-${PAPERSIZE}-papersize
+ .endif
  
  do-configure:
  	${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.in
Index: textproc/lout/distinfo
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/textproc/lout/distinfo,v
retrieving revision 1.2
diff -c -r1.2 distinfo
*** textproc/lout/distinfo	20 Apr 2001 15:05:01 -0000	1.2
--- textproc/lout/distinfo	17 Oct 2002 22:18:51 -0000
***************
*** 1,5 ****
  $NetBSD: distinfo,v 1.2 2001/04/20 15:05:01 skrll Exp $
  
! SHA1 (lout-3.21.tar.gz) = f6b6599d7a0913c169465e7b1760b64d5d82170e
! Size (lout-3.21.tar.gz) = 1793297 bytes
! SHA1 (patch-aa) = cbd26d1a2a87af5a60ba53de294a40cbb16ae786
--- 1,6 ----
  $NetBSD: distinfo,v 1.2 2001/04/20 15:05:01 skrll Exp $
  
! SHA1 (lout-3.26.tar.gz) = f32c15a538a0b46b85ccaa1a9716c4c3b87dcd75
! Size (lout-3.26.tar.gz) = 1881323 bytes
! SHA1 (patch-aa) = 3806c7e0dbeb653f0c337721393fcdb35dc8019f
! SHA1 (patch-optional-Letter-papersize) = a7f6f36450db7b45a7b59dc94141b0b8f8522d64
cvs diff: Diffing textproc/lout/patches
Index: textproc/lout/patches/patch-aa
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/textproc/lout/patches/patch-aa,v
retrieving revision 1.3
diff -c -r1.3 patch-aa
*** textproc/lout/patches/patch-aa	16 Jun 2000 02:13:24 -0000	1.3
--- textproc/lout/patches/patch-aa	17 Oct 2002 22:18:49 -0000
***************
*** 1,36 ****
  $NetBSD: patch-aa,v 1.3 2000/06/16 02:13:24 itojun Exp $
  
! --- makefile.orig	Wed May 10 19:32:45 2000
! +++ makefile	Fri Jun 16 10:41:38 2000
! @@ -255,8 +255,8 @@
   USESTAT = 1
  -SAFEDFT = 0
  +SAFEDFT = 1
   
! -BINDIR	= /export/home/6monthspace/jeff/bin
! -LIBDIR	= /export/home/6monthspace/jeff/lout.lib
! -DOCDIR	= /export/home/6monthspace/jeff/lout.doc
! -MANDIR	= /export/home/6monthspace/jeff/lout.man
  +BINDIR	= @PREFIX@/bin
  +LIBDIR	= @PREFIX@/share/lout
  +DOCDIR	= @PREFIX@/share/doc/lout
  +MANDIR	= @PREFIX@/man/man1
   
! @@ -278,4 +278,4 @@
   
  -PDF_COMPRESSION	= 0
  -ZLIB		=
  +PDF_COMPRESSION	= 1
  +ZLIB		= -lz
   ZLIBPATH	=
! @@ -307,3 +307,3 @@
!  	  -DASSERT_ON=1 $(COPTS)				\
! -	  -DDEBUG_ON=1  -g					\
! +	  -DDEBUG_ON=1  -g -O2					\
!  	  -DPDF_COMPRESSION=$(PDF_COMPRESSION)			\
! @@ -317,2 +317,5 @@
!  	  z41.o z42.o z43.o z44.o z45.o z46.o z47.o z48.o
  +
  +all: lout prg2lout
  +allinstall: install installman installdoc
   
--- 1,49 ----
  $NetBSD: patch-aa,v 1.3 2000/06/16 02:13:24 itojun Exp $
  
! --- makefile.orig	Sun Dec 23 23:44:25 2001
! +++ makefile	Thu Apr 18 21:12:49 2002
! @@ -268,7 +268,7 @@
!  DBFIX   = 0
!  
   USESTAT = 1
  -SAFEDFT = 0
  +SAFEDFT = 1
   
!  # DEBUGGING = 0
!  # TRACING =
! @@ -276,10 +276,10 @@
!  DEBUGGING = 1
!  TRACING = -g
!  
! -BINDIR	= /home/jeff/bin
! -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@/man/man1
   
!  LIBFONT = font
!  LIBMAPS = maps
! @@ -297,8 +297,8 @@
!  
!  COLLATE	= 1
   
  -PDF_COMPRESSION	= 0
  -ZLIB		=
  +PDF_COMPRESSION	= 1
  +ZLIB		= -lz
   ZLIBPATH	=
!  
!  CC	= gcc
! @@ -338,6 +338,9 @@
!  	  z33.o z34.o z35.o z36.o z37.o z38.o z39.o z40.o	\
!  	  z41.o z42.o z43.o z44.o z45.o z46.o z47.o z48.o	\
!  	  z49.o z50.o z51.o
  +
  +all: lout prg2lout
  +allinstall: install installman installdoc
   
+  lout:	$(OBJS)
+  	$(CC) -o lout $(OBJS) $(ZLIB) -lm
Index: textproc/lout/patches/patch-optional-Letter-papersize
===================================================================
RCS file: textproc/lout/patches/patch-optional-Letter-papersize
diff -N textproc/lout/patches/patch-optional-Letter-papersize
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- textproc/lout/patches/patch-optional-Letter-papersize	19 Apr 2002 01:17:34 -0000
***************
*** 0 ****
--- 1,13 ----
+ #ident "@(#)$NetBSD$"
+ 
+ --- include/dsf.orig	Thu Apr 18 21:15:30 2002
+ +++ include/dsf	Thu Apr 18 21:16:49 2002
+ @@ -56,7 +56,7 @@
+  
+  
+  def @DocumentSetup
+ -    named @PageType		{ A4    @OrIfPlain Other} # page type (width, height)
+ +    named @PageType		{ Letter @OrIfPlain Other} # page type (width, height)
+      named @PageWidth		{ 80s			} # page width if type Other
+      named @PageHeight		{ 66f			} # page height if type Other
+      named @PageOrientation	{ Portrait		} # Portrait, Landscape, etc.
>Release-Note:
>Audit-Trail:
>Unformatted: