4 files changed, 41 insertions, 24 deletions

diff --git a/print/lout/Makefile b/print/lout/Makefile
index b67cdaa3abc3..1579ab85d533 100644
--- a/print/lout/Makefile
+++ b/print/lout/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lout
-PORTVERSION=	3.29
-PORTREVISION=	1
+PORTVERSION=	3.30
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.it.usyd.edu.au/jeff/lout/
@@ -19,12 +18,13 @@ COMMENT=	LaTeX like document creation system with PostScript/PDF output
 USE_GMAKE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	lout prg2lout
-INSTALL_TARGET=	install installman
 
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET+=installdoc
-.endif
+MAN1=		lout.1 prg2lout.1
 
-MAN1=		prg2lout.1 lout.1
+.if defined(NOPORTDOCS)
+INSTALL_TARGET=	install installman
+.else
+INSTALL_TARGET=	install installman installdoc
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/lout/distinfo b/print/lout/distinfo
index 41cf269a85c7..ab18884cca98 100644
--- a/print/lout/distinfo
+++ b/print/lout/distinfo
@@ -1,2 +1,2 @@
-MD5 (lout-3.29.tar.gz) = cff3a2c009b928e794a9a57b208df788
-SIZE (lout-3.29.tar.gz) = 1948258
+MD5 (lout-3.30.tar.gz) = 770930dec05f136a29ff078e66e59881
+SIZE (lout-3.30.tar.gz) = 1961043
diff --git a/print/lout/files/patch-01 b/print/lout/files/patch-01
index 826d3c078fe4..17fb163dc334 100644
--- a/print/lout/files/patch-01
+++ b/print/lout/files/patch-01
@@ -1,8 +1,18 @@
---- makefile.orig	Fri Dec 20 00:12:05 2002
-+++ makefile	Fri May  2 14:18:44 2003
-@@ -281,10 +281,10 @@
- # DEBUGGING = 1
- # TRACING = -g
+--- makefile.orig	Wed Oct 27 17:59:37 2004
++++ makefile	Tue Nov  2 23:17:17 2004
+@@ -253,16 +253,16 @@
+ USESTAT = 1
+ SAFEDFT = 0
+ 
+-# DEBUGGING = 0
+-# TRACING =
++DEBUGGING = 0
++TRACING =
+ 
+-DEBUGGING = 1
+-TRACING = -g
++#DEBUGGING = 1
++#TRACING = -g
  
 -BINDIR	= /home/jeff/bin
 -LIBDIR	= /home/jeff/lout.lib
@@ -15,7 +25,7 @@
  
  LIBFONT = font
  LIBMAPS = maps
-@@ -296,23 +296,23 @@
+@@ -274,23 +274,23 @@
  CHARIN	= 1
  CHAROUT	= 0
  
@@ -45,7 +55,7 @@
  	  -DOS_DOS=$(OSDOS)					\
  	  -DOS_MAC=$(OSMAC)					\
  	  -DDB_FIX=$(DBFIX)					\
-@@ -358,42 +358,41 @@
+@@ -336,42 +336,41 @@
  install: lout prg2lout
  	@echo ""
  	@echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)"
@@ -98,7 +108,7 @@
  	@echo ""
  	@echo "(c) Initializing run (should be silent, no errors expected)"
  	$(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init
-@@ -401,6 +400,7 @@
+@@ -379,6 +378,7 @@
  	@echo "(d) Changing mode of files just created by initializing run"
  	chmod 644 $(LIBDIR)/$(LIBDATA)/*
  	chmod 644 $(LIBDIR)/$(LIBHYPH)/*
@@ -106,7 +116,7 @@
  
  installman:
  	@echo ""
-@@ -409,23 +409,27 @@
+@@ -387,23 +387,27 @@
  	    -e "s@<DOCDIR>@$(DOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"	\
  	man/lout.1 > $(MANDIR)/lout.1
  	chmod 644 $(MANDIR)/lout.1
@@ -137,7 +147,7 @@
  	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)	\
-@@ -435,9 +439,9 @@
+@@ -413,9 +417,9 @@
  installde:
  	@echo ""
  	@echo "Putting German error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)"
diff --git a/print/lout/pkg-plist b/print/lout/pkg-plist
index 523f2bf1009c..364a48c56042 100644
--- a/print/lout/pkg-plist
+++ b/print/lout/pkg-plist
@@ -1,5 +1,5 @@
-bin/prg2lout
 bin/lout
+bin/prg2lout
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/design/README
 %%PORTDOCS%%%%DOCSDIR%%/design/all
@@ -73,6 +73,7 @@ bin/lout
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_head
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_hexp
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_hlim
+%%PORTDOCS%%%%DOCSDIR%%/expert/pre_hmir
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_hsca
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_hshi
 %%PORTDOCS%%%%DOCSDIR%%/expert/pre_incg
@@ -144,6 +145,7 @@ bin/lout
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_boxs
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_colo
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_incl
+%%PORTDOCS%%%%DOCSDIR%%/user/bgr_mirr
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_outl
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_rota
 %%PORTDOCS%%%%DOCSDIR%%/user/bgr_scal
@@ -449,10 +451,10 @@ bin/lout
 %%DATADIR%%/font/ZC-Rm+
 %%DATADIR%%/font/ZD
 %%DATADIR%%/hyph/README
-%%DATADIR%%/hyph/czech.lh
-%%DATADIR%%/hyph/czech.lp
 %%DATADIR%%/hyph/croatian.lh
 %%DATADIR%%/hyph/croatian.lp
+%%DATADIR%%/hyph/czech.lh
+%%DATADIR%%/hyph/czech.lp
 %%DATADIR%%/hyph/danish.lh
 %%DATADIR%%/hyph/danish.lp
 %%DATADIR%%/hyph/dutch.lh
@@ -551,6 +553,8 @@ bin/lout
 %%DATADIR%%/include/rubyf
 %%DATADIR%%/include/russian
 %%DATADIR%%/include/russian.fd
+%%DATADIR%%/include/save_graphf
+%%DATADIR%%/include/save_graphf.lpg
 %%DATADIR%%/include/slides
 %%DATADIR%%/include/slidesf
 %%DATADIR%%/include/tab
@@ -559,18 +563,21 @@ bin/lout
 %%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
 %%DATADIR%%/maps/Ding.LCM
+%%DATADIR%%/maps/KOI8-R.LCM
 %%DATADIR%%/maps/Latin1.LCM
+%%DATADIR%%/maps/LtKOI8.LCM
 %%DATADIR%%/maps/LtLatin1.LCM
 %%DATADIR%%/maps/LtLatin2.LCM
-%%DATADIR%%/maps/LtKOI8.LCM
 %%DATADIR%%/maps/Std.LCM
 %%DATADIR%%/maps/Symb.LCM
 %%DATADIR%%/maps/koi8r.LCM
-%%DATADIR%%/maps/KOI8-R.LCM
 %%DATADIR%%/maps/null.LCM
 @dirrm %%DATADIR%%/maps
 @dirrm %%DATADIR%%/locale