Update to lout-3.39.
I've tweaked the lout makefile a little bit more (to use BSD_INSTALL_
variables), and also changed the doc/user/README to tell people
they've to run lout in unsafe mode (-U) to format the user guide.
Removed MAINTAINER, as db@ wasn't active for more than 5 years, and
the address forwarded from d...@openbsd.org bounces.
ok?
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/lout/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 20 Nov 2010 09:48:39 -0000 1.7
+++ Makefile 2 Jan 2011 12:27:07 -0000
@@ -3,26 +3,23 @@
COMMENT-main= object oriented type setting language
COMMENT-doc= Lout user and expert documentation
-DISTNAME= lout-3.30
+DISTNAME= lout-3.39
PKGNAME-main= ${DISTNAME}
-REVISION-main = 1
PKGNAME-doc= ${DISTNAME:S/-/-doc-/}
-REVISION-doc = 0
CATEGORIES= print
-HOMEPAGE= http://lout.sourceforge.net/
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lout/}
+HOMEPAGE= http://savannah.nongnu.org/projects/lout/
+MASTER_SITES= ${MASTER_SITE_SAVANNAH:=lout/}
-MAINTAINER= David Berghoff <d...@openbsd.org>
-
-# GPL
+# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MAKE_FILE= makefile
-INSTALL_TARGET= allinstall
+ALL_TARGET= prg2lout lout
+INSTALL_TARGET= install installman installdoc
USE_GROFF = Yes
NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/lout/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 5 Apr 2007 16:20:19 -0000 1.2
+++ distinfo 2 Jan 2011 12:27:07 -0000
@@ -1,5 +1,5 @@
-MD5 (lout-3.30.tar.gz) = dwkw3sBfE2op/weOZuWYgQ==
-RMD160 (lout-3.30.tar.gz) = clib1Y/DRDHFBJ3zAD1Pxvvhs0o=
-SHA1 (lout-3.30.tar.gz) = pq3NiHvsU9VPJYnpmsxi5IYIva8=
-SHA256 (lout-3.30.tar.gz) = pYVx+KK94rti2CCzew8CYL4ww7yoiH2vXu69/QaMBKk=
-SIZE (lout-3.30.tar.gz) = 1961043
+MD5 (lout-3.39.tar.gz) = FR4fumdscFKTbMwbzZZjqQ==
+RMD160 (lout-3.39.tar.gz) = W8b42tQ73wJi+jbE9rOlcLwMPWs=
+SHA1 (lout-3.39.tar.gz) = qyyYLX4jWxMqquBfKK8Xld8tHHE=
+SHA256 (lout-3.39.tar.gz) = eKdVBPolwuVVOezZ9LoT/x5AKh/7MH1wR0pNYDP284k=
+SIZE (lout-3.39.tar.gz) = 2157040
Index: patches/patch-doc_user_README
===================================================================
RCS file: patches/patch-doc_user_README
diff -N patches/patch-doc_user_README
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_user_README 2 Jan 2011 12:27:07 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/user/README.orig Tue Sep 21 04:57:27 2010
++++ doc/user/README Sun Jan 2 12:19:14 2011
+@@ -4,7 +4,7 @@ This directory contains the Lout source files for the
+ to the Lout Document Formatting System. To produce the Guide,
+ type the command
+
+- lout -r6 all > user.ps
++ lout -U -r6 all > user.ps
+
+ in this directory. The -r6 flag causes Lout to run over the
+ document six times. This is needed to completely resolve all
Index: patches/patch-makefile
===================================================================
RCS file: /cvs/ports/print/lout/patches/patch-makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-makefile
--- patches/patch-makefile 14 Jun 2005 15:34:27 -0000 1.1
+++ patches/patch-makefile 2 Jan 2011 12:27:07 -0000
@@ -1,34 +1,30 @@
---- makefile.orig Wed Oct 27 10:59:37 2004
-+++ makefile Fri Jun 10 09:56:15 2005
-@@ -251,18 +251,18 @@ OSMAC = 0
+--- makefile.orig Thu Apr 22 00:52:47 2010
++++ makefile Sun Jan 2 11:10:34 2011
+@@ -261,7 +261,7 @@ OSMAC = 0
DBFIX = 0
USESTAT = 1
-SAFEDFT = 0
+SAFEDFT = 1
--# DEBUGGING = 0
--# TRACING =
-+DEBUGGING = 0
-+TRACING =
-
--DEBUGGING = 1
--TRACING = -g
-+#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}/lib/lout
-+DOCDIR = ${PREFIX}/share/doc/lout
-+MANDIR = ${PREFIX}/man/man1
+ DEBUGGING = 0
+ TRACING =
+@@ -269,11 +269,10 @@ TRACING =
+ # DEBUGGING = 1
+ # TRACING = -g
+
+-PREFIX = /home/jeff
+ BINDIR = $(PREFIX)/bin
+-LOUTLIBDIR = $(PREFIX)/lout.lib
+-LOUTDOCDIR = $(PREFIX)/lout.doc
+-MANDIR = $(PREFIX)/lout.man
++LOUTLIBDIR = $(PREFIX)/lib/lout
++LOUTDOCDIR = $(PREFIX)/share/doc/lout
++MANDIR = $(PREFIX)/man/man1
LIBFONT = font
LIBMAPS = maps
-@@ -274,23 +274,23 @@ LIBLOCA = locale
+@@ -285,23 +284,23 @@ LIBLOCA = locale
CHARIN = 1
CHAROUT = 0
@@ -58,7 +54,7 @@
-DOS_DOS=$(OSDOS) \
-DOS_MAC=$(OSMAC) \
-DDB_FIX=$(DBFIX) \
-@@ -322,7 +322,7 @@ OBJS = z01.o z02.o z03.o z04.o z05.o z06
+@@ -333,7 +332,7 @@ OBJS = z01.o z02.o z03.o z04.o z05.o z06.o z07.o
z08.o
z49.o z50.o z51.o z52.o
lout: $(OBJS)
@@ -67,7 +63,7 @@
chmod a+x lout
$(OBJS): externs.h
-@@ -330,16 +330,14 @@ $(OBJS): externs.h
+@@ -341,7 +340,7 @@ $(OBJS): externs.h
externs.h:
prg2lout: prg2lout.c
@@ -75,6 +71,8 @@
+ $(CC) $(CFLAGS) $(COPTS) -o prg2lout prg2lout.c
chmod a+x prg2lout
+ all: lout prg2lout
+@@ -349,67 +348,48 @@ all: lout prg2lout
install: lout prg2lout
@echo ""
@echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)"
@@ -85,36 +83,83 @@
+ $(BSD_INSTALL_PROGRAM) lout $(BINDIR)/lout
+ $(BSD_INSTALL_PROGRAM) prg2lout $(BINDIR)/prg2lout
@echo ""
- @echo "(b) Installing library files into LIBDIR $(LIBDIR)"
- mkdir $(LIBDIR)
-@@ -372,13 +370,6 @@ install: lout prg2lout
+ @echo "(b) Installing library files into LOUTLIBDIR $(LOUTLIBDIR)"
+- mkdir $(LOUTLIBDIR)
+- chmod 755 $(LOUTLIBDIR)
++ ${BSD_INSTALL_DATA_DIR} $(LOUTLIBDIR)
+ @echo ""
+- mkdir $(LOUTLIBDIR)/$(LIBINCL)
+- chmod 755 $(LOUTLIBDIR)/$(LIBINCL)
+- cp include/* $(LOUTLIBDIR)/$(LIBINCL)
+- chmod 644 $(LOUTLIBDIR)/$(LIBINCL)/*
++ ${BSD_INSTALL_DATA_DIR} $(LOUTLIBDIR)/$(LIBINCL)
++ ${BSD_INSTALL_DATA} include/* $(LOUTLIBDIR)/$(LIBINCL)
+ @echo ""
+- mkdir $(LOUTLIBDIR)/$(LIBDATA)
+- chmod 755 $(LOUTLIBDIR)/$(LIBDATA)
+- cp data/* $(LOUTLIBDIR)/$(LIBDATA)
+- chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
++ ${BSD_INSTALL_DATA_DIR} $(LOUTLIBDIR)/$(LIBDATA)
++ ${BSD_INSTALL_DATA} data/* $(LOUTLIBDIR)/$(LIBDATA)
+ @echo ""
+- mkdir $(LOUTLIBDIR)/$(LIBHYPH)
+- chmod 755 $(LOUTLIBDIR)/$(LIBHYPH)
+- cp hyph/* $(LOUTLIBDIR)/$(LIBHYPH)
+- chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
++ ${BSD_INSTALL_DATA_DIR} $(LOUTLIBDIR)/$(LIBHYPH)
++ ${BSD_INSTALL_DATA} hyph/* $(LOUTLIBDIR)/$(LIBHYPH)
+ @echo ""
+- mkdir $(LOUTLIBDIR)/$(LIBFONT)
+- chmod 755 $(LOUTLIBDIR)/$(LIBFONT)
+- cp font/* $(LOUTLIBDIR)/$(LIBFONT)
+- chmod 644 $(LOUTLIBDIR)/$(LIBFONT)/*
++ ${BSD_INSTALL_DATA_DIR} $(LOUTLIBDIR)/$(LIBFONT)
++ ${BSD_INSTALL_DATA} font/* $(LOUTLIBDIR)/$(LIBFONT)
+ @echo ""
+- mkdir $(LOUTLIBDIR)/$(LIBMAPS)
+- chmod 755 $(LOUTLIBDIR)/$(LIBMAPS)
+- cp maps/* $(LOUTLIBDIR)/$(LIBMAPS)
+- chmod 644 $(LOUTLIBDIR)/$(LIBMAPS)/*
++ ${BSD_INSTALL_DATA_DIR} $(LOUTLIBDIR)/$(LIBMAPS)
++ ${BSD_INSTALL_DATA} maps/* $(LOUTLIBDIR)/$(LIBMAPS)
+ @echo ""
+- mkdir $(LOUTLIBDIR)/$(LIBLOCA)
+- chmod 755 $(LOUTLIBDIR)/$(LIBLOCA)
++ ${BSD_INSTALL_DATA_DIR} $(LOUTLIBDIR)/$(LIBLOCA)
@echo ""
- mkdir $(LIBDIR)/$(LIBLOCA)
- chmod 755 $(LIBDIR)/$(LIBLOCA)
-- @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
- @echo ""
- @echo "(d) Changing mode of files just created by initializing run"
-- chmod 644 $(LIBDIR)/$(LIBDATA)/*
-- chmod 644 $(LIBDIR)/$(LIBHYPH)/*
+- chmod 644 $(LOUTLIBDIR)/$(LIBDATA)/*
+- chmod 644 $(LOUTLIBDIR)/$(LIBHYPH)/*
installman:
@echo ""
-@@ -393,7 +384,8 @@ installman:
+ @echo "Installing manual entries into MANDIR $(MANDIR)"
+ sed -e "s@<BINDIR>@$(BINDIR)@" -e "s@<LIBDIR>@$(LOUTLIBDIR)@" \
+ -e "s@<LOUTDOCDIR>@$(LOUTDOCDIR)@" -e "s@<MANDIR>@$(MANDIR)@"
\
+- man/lout.1 > $(MANDIR)/lout.1
+- chmod 644 $(MANDIR)/lout.1
+- cp man/prg2lout.1 $(MANDIR)/prg2lout.1
+- chmod 644 $(MANDIR)/prg2lout.1
++ man/lout.1 > man/lout.1.new
++ ${BSD_INSTALL_MAN} man/lout.1.new $(MANDIR)/lout.1
++ ${BSD_INSTALL_MAN} man/prg2lout.1 $(MANDIR)/prg2lout.1
+
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)/*/*
-@@ -432,3 +424,6 @@ clean:
- -rm -f lout prg2lout *.o
-
- restart: clean uninstall
-+
-+all: prg2lout lout
-+allinstall: install installman installdoc
+ @echo "Creating LOUTDOCDIR $(LOUTDOCDIR) and copying documentation into
it"
+- $(RCOPY) doc/* $(LOUTDOCDIR)
+- chmod 755 $(LOUTDOCDIR)
+- chmod 755 $(LOUTDOCDIR)/*
+- chmod 644 $(LOUTDOCDIR)/*/*
++ ${BSD_INSTALL_DATA_DIR} $(LOUTDOCDIR)
++ $(BSD_INSTALL_DATA) doc/README $(LOUTDOCDIR)
++.for d in design expert slides user
++ ${BSD_INSTALL_DATA_DIR} ${LOUTDOCDIR}/$d
++ ${BSD_INSTALL_DATA} doc/$d/* ${LOUTDOCDIR}/$d
++.endfor
+
+ allinstall: install installman installdoc
+
Index: pkg/PLIST-doc
===================================================================
RCS file: /cvs/ports/print/lout/pkg/PLIST-doc,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-doc
--- pkg/PLIST-doc 3 Apr 2006 16:27:57 -0000 1.2
+++ pkg/PLIST-doc 2 Jan 2011 12:27:07 -0000
@@ -64,6 +64,7 @@ share/doc/lout/expert/pre_brea
share/doc/lout/expert/pre_case
share/doc/lout/expert/pre_colo
share/doc/lout/expert/pre_conc
+share/doc/lout/expert/pre_cont
share/doc/lout/expert/pre_cove
share/doc/lout/expert/pre_cros
share/doc/lout/expert/pre_data
@@ -103,6 +104,7 @@ share/doc/lout/expert/pre_spac
share/doc/lout/expert/pre_span
share/doc/lout/expert/pre_tagg
share/doc/lout/expert/pre_text
+share/doc/lout/expert/pre_ucol
share/doc/lout/expert/pre_unde
share/doc/lout/expert/pre_verb
share/doc/lout/expert/pre_wide
@@ -137,6 +139,7 @@ share/doc/lout/user/bas_head
share/doc/lout/user/bas_hyph
share/doc/lout/user/bas_lang
share/doc/lout/user/bas_line
+share/doc/lout/user/bas_marg
share/doc/lout/user/bas_objs
share/doc/lout/user/bas_par1
share/doc/lout/user/bas_par2
@@ -147,10 +150,12 @@ share/doc/lout/user/bas_unde
share/doc/lout/user/bas_verb
share/doc/lout/user/bgr
share/doc/lout/user/bgr_boxs
+share/doc/lout/user/bgr_clip
share/doc/lout/user/bgr_colo
share/doc/lout/user/bgr_incl
share/doc/lout/user/bgr_mirr
share/doc/lout/user/bgr_outl
+share/doc/lout/user/bgr_prec
share/doc/lout/user/bgr_rota
share/doc/lout/user/bgr_scal
share/doc/lout/user/bgr_text
@@ -173,12 +178,15 @@ share/doc/lout/user/equ
share/doc/lout/user/equ_defs
share/doc/lout/user/equ_disp
share/doc/lout/user/equ_intr
+share/doc/lout/user/equ_math
share/doc/lout/user/equ_spac
share/doc/lout/user/equ_summ
share/doc/lout/user/equ_symb
share/doc/lout/user/equ_tequ
share/doc/lout/user/equ_vert
share/doc/lout/user/fmt
+share/doc/lout/user/fmt1.awk
+share/doc/lout/user/fmt2.awk
share/doc/lout/user/fmt_head
share/doc/lout/user/fmt_marg
share/doc/lout/user/fmt_setu
@@ -197,6 +205,14 @@ share/doc/lout/user/gra_tick
share/doc/lout/user/johnson
share/doc/lout/user/johnson.out
share/doc/lout/user/letterbook
+share/doc/lout/user/mat
+share/doc/lout/user/mat_comm
+share/doc/lout/user/mat_defs
+share/doc/lout/user/mat_disp
+share/doc/lout/user/mat_intr
+share/doc/lout/user/mat_matr
+share/doc/lout/user/mat_summ
+share/doc/lout/user/mybook
share/doc/lout/user/mydefs
share/doc/lout/user/pascal
share/doc/lout/user/pie
@@ -272,6 +288,7 @@ share/doc/lout/user/vdia
share/doc/lout/user/vequ
share/doc/lout/user/vfmt
share/doc/lout/user/vgra
+share/doc/lout/user/vmat
share/doc/lout/user/vpie
share/doc/lout/user/vprg
share/doc/lout/user/vref
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/lout/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- pkg/PLIST-main 24 Nov 2006 22:20:29 -0000 1.1
+++ pkg/PLIST-main 2 Jan 2011 12:27:07 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 22:20:29 kili Exp $
@pkgpath print/lout
-bin/lout
-bin/prg2lout
+...@bin bin/lout
+...@bin bin/prg2lout
lib/lout/
lib/lout/data/
lib/lout/data/README
@@ -183,6 +183,7 @@ lib/lout/hyph/danish.lh
lib/lout/hyph/dutch.lh
lib/lout/hyph/english.lh
lib/lout/hyph/engluk.lh
+lib/lout/hyph/esperanto.lh
lib/lout/hyph/finnish.lh
lib/lout/hyph/french.lh
lib/lout/hyph/german.lh
@@ -191,6 +192,7 @@ lib/lout/hyph/magyar.lh
lib/lout/hyph/norweg.lh
lib/lout/hyph/polish.lh
lib/lout/hyph/portugal.lh
+lib/lout/hyph/programming.lh
lib/lout/hyph/russian.lh
lib/lout/hyph/slovak.lh
lib/lout/hyph/slovenia.lh
@@ -234,6 +236,8 @@ lib/lout/include/javaf
lib/lout/include/langdefs
lib/lout/include/latin2
lib/lout/include/lengths
+lib/lout/include/math
+lib/lout/include/mathf
lib/lout/include/modula
lib/lout/include/modulaf
lib/lout/include/mydefs
@@ -260,8 +264,6 @@ lib/lout/include/ruby
lib/lout/include/rubyf
lib/lout/include/russian
lib/lout/include/russian.fd
-lib/lout/include/save_graphf
-lib/lout/include/save_graphf.lpg
lib/lout/include/slides
lib/lout/include/slidesf
lib/lout/include/tab
@@ -270,9 +272,6 @@ lib/lout/include/tabf.lpg
lib/lout/include/tbl
lib/lout/include/tblf
lib/lout/include/ts
-lib/lout/include/xind
-lib/lout/include/xinda
-lib/lout/include/xindb
lib/lout/include/xrgb
lib/lout/locale/
lib/lout/maps/
@@ -283,6 +282,7 @@ lib/lout/maps/Latin1.LCM
lib/lout/maps/LtKOI8.LCM
lib/lout/maps/LtLatin1.LCM
lib/lout/maps/LtLatin2.LCM
+lib/lout/maps/LtLatin3.LCM
lib/lout/maps/Std.LCM
lib/lout/maps/Symb.LCM
lib/lout/maps/koi8r.LCM
