From c8ac5d2416c73e9e1d6df838abd68469c2b95636 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 2 Mar 2008 23:02:01 +0000 Subject: [PATCH] Bring in some changes from FreeBSD: * Add missing @PDFDOCDIR@ substitution. * Make 'groff -Thtml ...' work by adding an image_generator keyword to the HTML DESC file. * Update lj4 resolution and add some font files. * Install lj4_font(5) manual page. And while I'm doing this, install the grohtml(1) manual page as well. --- gnu/usr.bin/groff/Makefile.inc | 6 ++++-- gnu/usr.bin/groff/font/Makefile.tty | 7 +++++-- gnu/usr.bin/groff/font/devhtml/Makefile | 6 ++++-- gnu/usr.bin/groff/font/devlj4/Makefile | 13 ++++++++----- gnu/usr.bin/groff/src/devices/grohtml/Makefile | 5 +++-- gnu/usr.bin/groff/src/devices/grolj4/Makefile | 5 +++-- 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc index 03915c03e8..f122ce93af 100644 --- a/gnu/usr.bin/groff/Makefile.inc +++ b/gnu/usr.bin/groff/Makefile.inc @@ -1,5 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.11 2005/06/10 07:06:07 ru Exp $ -# $DragonFly: src/gnu/usr.bin/groff/Makefile.inc,v 1.5 2007/03/22 23:31:22 swildner Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.12 2005/10/20 10:57:52 ru Exp $ +# $DragonFly: src/gnu/usr.bin/groff/Makefile.inc,v 1.6 2008/03/02 23:02:01 swildner Exp $ BINDIR?= /usr/bin SHELL= /bin/sh @@ -62,6 +62,7 @@ localtmacdir=/usr/share/tmac docdir=/usr/src/contrib/groff/doc exampledir=XXX htmldocdir=XXX +pdfdocdir=XXX indexext=.i common_words_file=/usr/share/dict/eign indexdir=/usr/share/dict/papers @@ -107,6 +108,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION` -e "s;@DOCDIR@;$(docdir);g" \ -e "s;@EXAMPLEDIR@;$(exampledir);g" \ -e "s;@HTMLDOCDIR@;$(htmldocdir);g" \ + -e "s;@PDFDOCDIR@;$(pdfdocdir);g" \ -e "s;@DEVICE@;$(DEVICE);g" \ -e "s;@DEFAULT_INDEX@;$(indexdir)/$(indexname);g" \ -e "s;@DEFAULT_INDEX_NAME@;$(indexname);g" \ diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty index 9e77d366f6..63e00fc672 100644 --- a/gnu/usr.bin/groff/font/Makefile.tty +++ b/gnu/usr.bin/groff/font/Makefile.tty @@ -1,5 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.7 2001/04/17 12:36:42 ru Exp $ -# $DragonFly: src/gnu/usr.bin/groff/font/Makefile.tty,v 1.3 2005/09/01 20:47:12 asmodai Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.8 2005/10/20 10:57:52 ru Exp $ +# $DragonFly: src/gnu/usr.bin/groff/font/Makefile.tty,v 1.4 2008/03/02 23:02:01 swildner Exp $ FONTS?=R I B BI S L CW DEVFILES=$(FONTS) DESC @@ -29,3 +29,6 @@ DESC: DESC.proto -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \ -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \ ${.ALLSRC} >${.TARGET} +.if defined(DESC_EXT) + @${DESC_EXT} >>${.TARGET} +.endif diff --git a/gnu/usr.bin/groff/font/devhtml/Makefile b/gnu/usr.bin/groff/font/devhtml/Makefile index 7755797fe4..3e56267bdc 100644 --- a/gnu/usr.bin/groff/font/devhtml/Makefile +++ b/gnu/usr.bin/groff/font/devhtml/Makefile @@ -1,8 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.2 2002/10/11 08:58:13 ru Exp $ -# $DragonFly: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.3 2005/10/20 10:57:52 ru Exp $ +# $DragonFly: src/gnu/usr.bin/groff/font/devhtml/Makefile,v 1.4 2008/03/02 23:02:01 swildner Exp $ DEV= html FONTS= R I B BI CR CI CB CBI S +GHOSTSCRIPT= /usr/pkg/bin/gs +DESC_EXT= echo "image_generator ${GHOSTSCRIPT}" .include "../Makefile.tty" .include "../Makefile.dev" diff --git a/gnu/usr.bin/groff/font/devlj4/Makefile b/gnu/usr.bin/groff/font/devlj4/Makefile index 81141e7fd2..d67f18a9a4 100644 --- a/gnu/usr.bin/groff/font/devlj4/Makefile +++ b/gnu/usr.bin/groff/font/devlj4/Makefile @@ -1,14 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.1 2001/04/17 12:36:48 ru Exp $ -# $DragonFly: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.3 2005/09/01 20:47:12 asmodai Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.2 2005/10/20 10:57:52 ru Exp $ +# $DragonFly: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.4 2008/03/02 23:02:01 swildner Exp $ DEV= lj4 -LJ4RES= 600 +LJ4RES= 1200 LJ4PRINT= ${PSPRINT} DEVFILES= DESC \ + AB ABI AI AR \ ALBB ALBR AOB AOI AOR CB CBI CI CR GB GBI GI GR \ - LGB LGI LGR OB OBI OI OR TB TBI TI TR UB UBI UI UR \ + LGB LGI LGR OB OBI OI OR TB TBI TI TR \ + TNRB TNRBI TNRI TNRR \ + UB UBI UI UR \ UCB UCBI UCI UCR CLARENDON CORONET MARIGOLD S \ - generate/Makefile generate/text.map generate/special.map + SYMBOL WINGDINGS CLEANFILES+= DESC diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile index 4df8f8a8ad..cdaa6124e8 100644 --- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile +++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile @@ -1,10 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.7 2004/12/21 08:47:00 ru Exp $ -# $DragonFly: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $ +# $DragonFly: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.4 2008/03/02 23:02:01 swildner Exp $ PROG_CXX= post-grohtml SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm -NOMAN= YES +MAN= grohtml.1 +CLEANFILES= ${MAN} .include diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile index c821a0e51d..aa98fc3332 100644 --- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile +++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile @@ -1,7 +1,8 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $ -# $DragonFly: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.3 2005/09/01 20:47:13 asmodai Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.5 2005/10/20 10:57:52 ru Exp $ +# $DragonFly: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.4 2008/03/02 23:02:01 swildner Exp $ PROG_CXX= grolj4 +MAN= grolj4.1 lj4_font.5 SRCS= lj4.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm -- 2.41.0