4 files changed, 86 insertions, 84 deletions

diff --git a/print/lout/Makefile b/print/lout/Makefile
index ce02139ba91d..90d8fe069cf5 100644
--- a/print/lout/Makefile
+++ b/print/lout/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lout
-PORTVERSION=	3.31
+PORTVERSION=	3.36
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.it.usyd.edu.au/jeff/lout/
diff --git a/print/lout/distinfo b/print/lout/distinfo
index 818cbb309374..42cb6f893b9c 100644
--- a/print/lout/distinfo
+++ b/print/lout/distinfo
@@ -1,3 +1,3 @@
-MD5 (lout-3.31.tar.gz) = 8cc03412d5c26c208811877b89ad3174
-SHA256 (lout-3.31.tar.gz) = 3593d02ed6d1f83dbecdf680de00eda103d91deda1d6d8c947d9b6fbf2d2f424
-SIZE (lout-3.31.tar.gz) = 1987038
+MD5 (lout-3.36.tar.gz) = 9fb418e5db4cb242f7ab1c6e8c59a1c2
+SHA256 (lout-3.36.tar.gz) = b689cbe12074be8817c90070b162593fc9cc51f2f8868701833ff599b24fd4ad
+SIZE (lout-3.36.tar.gz) = 2125218
diff --git a/print/lout/files/patch-01 b/print/lout/files/patch-01
index c6a60ea0f6c5..86f391da3456 100644
--- a/print/lout/files/patch-01
+++ b/print/lout/files/patch-01
@@ -1,17 +1,17 @@
 --- makefile.orig	Wed Aug 24 08:45:25 2005
 +++ makefile	Fri Oct 14 02:14:23 2005
-@@ -259,10 +259,10 @@
+@@ -269,11 +269,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
+-PREFIX	= /home/jeff
+ 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)/man/man1
  
  LIBFONT = font
  LIBMAPS = maps
@@ -57,58 +57,58 @@
 +	install -c -s -o bin -g bin lout $(BINDIR)/lout
 +	install -c -s -o bin -g bin prg2lout $(BINDIR)/prg2lout
  	@echo ""
- 	@echo "(b) Installing library files into LIBDIR $(LIBDIR)"
--	mkdir $(LIBDIR)
-+	-mkdir $(LIBDIR)
- 	chmod 755 $(LIBDIR)
+ 	@echo "(b) Installing library files into LOUTLIBDIR $(LOUTLIBDIR)"
+-	mkdir $(LOUTLIBDIR)
++	-mkdir $(LOUTLIBDIR)
+ 	chmod 755 $(LOUTLIBDIR)
  	@echo ""
--	mkdir $(LIBDIR)/$(LIBINCL)
-+	-mkdir $(LIBDIR)/$(LIBINCL)
- 	chmod 755 $(LIBDIR)/$(LIBINCL)
- 	cp include/* $(LIBDIR)/$(LIBINCL)
- 	chmod 644 $(LIBDIR)/$(LIBINCL)/*
+-	mkdir $(LOUTLIBDIR)/$(LIBINCL)
++	-mkdir $(LOUTLIBDIR)/$(LIBINCL)
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBINCL)
+ 	cp include/* $(LOUTLIBDIR)/$(LIBINCL)
+ 	chmod 644 $(LOUTLIBDIR)/$(LIBINCL)/*
  	@echo ""
--	mkdir $(LIBDIR)/$(LIBDATA)
-+	-mkdir $(LIBDIR)/$(LIBDATA)
- 	chmod 755 $(LIBDIR)/$(LIBDATA)
- 	cp data/* $(LIBDIR)/$(LIBDATA)
- 	chmod 644 $(LIBDIR)/$(LIBDATA)/*
+-	mkdir $(LOUTLIBDIR)/$(LIBDATA)
++	-mkdir $(LOUTLIBDIR)/$(LIBDATA)
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBDATA)
+ 	cp data/* $(LOUTLIBDIR)/$(LIBDATA)
+ 	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
  	@echo ""
--	mkdir $(LIBDIR)/$(LIBHYPH)
-+	-mkdir $(LIBDIR)/$(LIBHYPH)
- 	chmod 755 $(LIBDIR)/$(LIBHYPH)
- 	cp hyph/* $(LIBDIR)/$(LIBHYPH)
- 	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
+-	mkdir $(LOUTLIBDIR)/$(LIBHYPH)
++	-mkdir $(LOUTLIBDIR)/$(LIBHYPH)
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBHYPH)
+ 	cp hyph/* $(LOUTLIBDIR)/$(LIBHYPH)
+ 	chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
  	@echo ""
--	mkdir $(LIBDIR)/$(LIBFONT)
-+	-mkdir $(LIBDIR)/$(LIBFONT)
- 	chmod 755 $(LIBDIR)/$(LIBFONT)
- 	cp font/* $(LIBDIR)/$(LIBFONT)
- 	chmod 644 $(LIBDIR)/$(LIBFONT)/*
+-	mkdir $(LOUTLIBDIR)/$(LIBFONT)
++	-mkdir $(LOUTLIBDIR)/$(LIBFONT)
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBFONT)
+ 	cp font/* $(LOUTLIBDIR)/$(LIBFONT)
+ 	chmod 644 $(LOUTLIBDIR)/$(LIBFONT)/*
  	@echo ""
--	mkdir $(LIBDIR)/$(LIBMAPS)
-+	-mkdir $(LIBDIR)/$(LIBMAPS)
- 	chmod 755 $(LIBDIR)/$(LIBMAPS)
- 	cp maps/* $(LIBDIR)/$(LIBMAPS)
- 	chmod 644 $(LIBDIR)/$(LIBMAPS)/*
+-	mkdir $(LOUTLIBDIR)/$(LIBMAPS)
++	-mkdir $(LOUTLIBDIR)/$(LIBMAPS)
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBMAPS)
+ 	cp maps/* $(LOUTLIBDIR)/$(LIBMAPS)
+ 	chmod 644 $(LOUTLIBDIR)/$(LIBMAPS)/*
  	@echo ""
--	mkdir $(LIBDIR)/$(LIBLOCA)
-+	-mkdir $(LIBDIR)/$(LIBLOCA)
- 	chmod 755 $(LIBDIR)/$(LIBLOCA)
-+	touch $(LIBDIR)/$(LIBLOCA)/.place_holder
+-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)
++	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
++	touch $(LOUTLIBDIR)/$(LIBLOCA)/.place_holder
  	@echo ""
  	@echo "(c) Initializing run (should be silent, no errors expected)"
- 	$(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init
+ 	$(BINDIR)/lout -x -s $(LOUTLIBDIR)/$(LIBINCL)/init
 @@ -379,6 +378,7 @@
  	@echo "(d) Changing mode of files just created by initializing run"
- 	chmod 644 $(LIBDIR)/$(LIBDATA)/*
- 	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
-+	chown -R bin:bin $(LIBDIR)
+ 	chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
+ 	chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
++	chown -R bin:bin $(LOUTLIBDIR)
  
  installman:
  	@echo ""
-@@ -387,23 +387,27 @@
- 	    -e "s@<DOCDIR>@$(DOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"	\
+@@ -387,25 +387,29 @@
+ 	    -e "s@<LOUTDOCDIR>@$(LOUTDOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"	\
  	man/lout.1 > $(MANDIR)/lout.1
  	chmod 644 $(MANDIR)/lout.1
 +	chown bin:bin $(MANDIR)/lout.1
@@ -118,35 +118,36 @@
  
  installdoc:
  	@echo ""
- 	@echo "Creating DOCDIR $(DOCDIR) and copying documentation into it"
--	$(RCOPY) doc $(DOCDIR)
-+	-mkdir -p $(DOCDIR)
-+	$(RCOPY) doc/* $(DOCDIR)
- 	chmod 755 $(DOCDIR)
- 	chmod 755 $(DOCDIR)/*
- 	chmod 644 $(DOCDIR)/*/*
-+	chown -R bin:bin $(DOCDIR)
+ 	@echo "Creating LOUTDOCDIR $(LOUTDOCDIR) and copying documentation into it"
++	-mkdir -p $(LOUTDOCDIR)
+ 	$(RCOPY) doc/* $(LOUTDOCDIR)
+ 	chmod 755 $(LOUTDOCDIR)
+ 	chmod 755 $(LOUTDOCDIR)/*
+ 	chmod 644 $(LOUTDOCDIR)/*/*
++	chown -R bin:bin $(LOUTDOCDIR)
+ 
+ allinstall:	install installman installdoc
  
  installfr:
  	@echo ""
- 	@echo "Putting French error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)"
--	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
-+	-mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
- 	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)
--	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
-+	-mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
- 	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
- 	cp locale/msgs.fr $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
- 	gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
+ 	@echo "Putting French error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)"
+-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
++	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)
+-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
++	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES
+ 	cp locale/msgs.fr $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR)
+ 	gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR)	\
 @@ -413,9 +417,9 @@
  installde:
  	@echo ""
- 	@echo "Putting German error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)"
--	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
-+	-mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
- 	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)
--	mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
-+	-mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
- 	chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
- 	cp locale/msgs.de $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
- 	gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\
+ 	@echo "Putting German error messages into $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)"
+-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
++	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)
+-	mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
++	-mkdir $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+ 	chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES
+ 	cp locale/msgs.de $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE)
+ 	gencat $(LOUTLIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE)	\
diff --git a/print/lout/pkg-plist b/print/lout/pkg-plist
index 4ec1183ccbe3..c27e32f5233c 100644
--- a/print/lout/pkg-plist
+++ b/print/lout/pkg-plist
@@ -32,7 +32,6 @@ bin/prg2lout
 %%PORTDOCS%%%%DOCSDIR%%/design/s6_2
 %%PORTDOCS%%%%DOCSDIR%%/design/s6_9
 %%PORTDOCS%%%%DOCSDIR%%/design/s7_0
-%%PORTDOCS%%%%DOCSDIR%%/expert/.pre_brea.swp
 %%PORTDOCS%%%%DOCSDIR%%/expert/README
 %%PORTDOCS%%%%DOCSDIR%%/expert/all
 %%PORTDOCS%%%%DOCSDIR%%/expert/det
@@ -63,6 +62,7 @@ bin/prg2lout
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_case
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_colo
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_conc
+%%PORTDOCS%%%%DOCSDIR%%/expert/pre_cont
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_cove
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_cros
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_data
@@ -102,6 +102,7 @@ bin/prg2lout
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_span
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_tagg
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_text
+%%PORTDOCS%%%%DOCSDIR%%/expert/pre_ucol
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_unde
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_verb
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_wide
@@ -145,6 +146,7 @@ bin/prg2lout
 %%PORTDOCS%%%%DOCSDIR%%/user/bas_verb
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_boxs
+%%PORTDOCS%%%%DOCSDIR%%/user/bgr_clip
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_colo
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_incl
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_mirr
@@ -172,6 +174,7 @@ bin/prg2lout
 %%PORTDOCS%%%%DOCSDIR%%/user/equ_defs
 %%PORTDOCS%%%%DOCSDIR%%/user/equ_disp
 %%PORTDOCS%%%%DOCSDIR%%/user/equ_intr
+%%PORTDOCS%%%%DOCSDIR%%/user/equ_math
 %%PORTDOCS%%%%DOCSDIR%%/user/equ_spac
 %%PORTDOCS%%%%DOCSDIR%%/user/equ_summ
 %%PORTDOCS%%%%DOCSDIR%%/user/equ_symb
@@ -532,6 +535,8 @@ bin/prg2lout
 %%DATADIR%%/include/langdefs
 %%DATADIR%%/include/latin2
 %%DATADIR%%/include/lengths
+%%DATADIR%%/include/math
+%%DATADIR%%/include/mathf
 %%DATADIR%%/include/modula
 %%DATADIR%%/include/modulaf
 %%DATADIR%%/include/mydefs
@@ -558,8 +563,7 @@ bin/prg2lout
 %%DATADIR%%/include/rubyf
 %%DATADIR%%/include/russian
 %%DATADIR%%/include/russian.fd
-%%DATADIR%%/include/save_graphf
-%%DATADIR%%/include/save_graphf.lpg
+%%DATADIR%%/include/save_bsf
 %%DATADIR%%/include/slides
 %%DATADIR%%/include/slidesf
 %%DATADIR%%/include/tab
@@ -568,9 +572,6 @@ bin/prg2lout
 %%DATADIR%%/include/tbl
 %%DATADIR%%/include/tblf
 %%DATADIR%%/include/ts
-%%DATADIR%%/include/xind
-%%DATADIR%%/include/xinda
-%%DATADIR%%/include/xindb
 %%DATADIR%%/include/xrgb
 %%DATADIR%%/locale/.place_holder
 %%DATADIR%%/maps/00README