Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl2/groff merge our changes and add build glue



details:   https://anonhg.NetBSD.org/src/rev/dcd08cc1928e
branches:  trunk
changeset: 342894:dcd08cc1928e
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 13 19:01:55 2016 +0000

description:
merge our changes and add build glue

diffstat:

 external/gpl2/groff/Makefile                               |     7 +
 external/gpl2/groff/Makefile.inc                           |   158 +
 external/gpl2/groff/bin/Makefile                           |     6 +
 external/gpl2/groff/bin/Makefile.inc                       |     6 +
 external/gpl2/groff/bin/addftinfo/Makefile                 |    13 +
 external/gpl2/groff/bin/afmtodit/Makefile                  |    13 +
 external/gpl2/groff/bin/eqn/Makefile                       |    19 +
 external/gpl2/groff/bin/grn/Makefile                       |    14 +
 external/gpl2/groff/bin/groff/Makefile                     |    13 +
 external/gpl2/groff/bin/grog/Makefile                      |    13 +
 external/gpl2/groff/bin/hpftodit/Makefile                  |    15 +
 external/gpl2/groff/bin/html/Makefile                      |    13 +
 external/gpl2/groff/bin/indxbib/Makefile                   |    28 +
 external/gpl2/groff/bin/lkbib/Makefile                     |    15 +
 external/gpl2/groff/bin/lookbib/Makefile                   |    15 +
 external/gpl2/groff/bin/nroff/Makefile                     |    13 +
 external/gpl2/groff/bin/pfbtops/Makefile                   |    13 +
 external/gpl2/groff/bin/pic/Makefile                       |    16 +
 external/gpl2/groff/bin/refer/Makefile                     |    17 +
 external/gpl2/groff/bin/soelim/Makefile                    |    13 +
 external/gpl2/groff/bin/tbl/Makefile                       |    13 +
 external/gpl2/groff/bin/tfmtodit/Makefile                  |    13 +
 external/gpl2/groff/bin/troff/Makefile                     |    30 +
 external/gpl2/groff/devices/Makefile                       |     7 +
 external/gpl2/groff/devices/Makefile.inc                   |     5 +
 external/gpl2/groff/devices/grodvi/Makefile                |    13 +
 external/gpl2/groff/devices/grohtml/Makefile               |    16 +
 external/gpl2/groff/devices/grolbp/Makefile                |    14 +
 external/gpl2/groff/devices/grolj4/Makefile                |    14 +
 external/gpl2/groff/devices/grops/Makefile                 |    13 +
 external/gpl2/groff/devices/grotty/Makefile                |    13 +
 external/gpl2/groff/dist/Makefile.in                       |    10 +-
 external/gpl2/groff/dist/configure.ac                      |     4 +-
 external/gpl2/groff/dist/contrib/mm/groff_mm.man           |     2 +-
 external/gpl2/groff/dist/contrib/mm/groff_mmse.man         |    44 +-
 external/gpl2/groff/dist/contrib/pdfmark/Makefile.sub      |     2 +
 external/gpl2/groff/dist/doc/Makefile.in                   |     5 +
 external/gpl2/groff/dist/doc/Makefile.sub                  |     7 +-
 external/gpl2/groff/dist/doc/groff-1                       |     2 +-
 external/gpl2/groff/dist/doc/groff.texinfo                 |     2 +-
 external/gpl2/groff/dist/mdate.sh                          |     2 +-
 external/gpl2/groff/dist/src/devices/grohtml/post-html.cpp |     4 +-
 external/gpl2/groff/dist/src/devices/grops/ps.cpp          |     3 +-
 external/gpl2/groff/dist/src/devices/grotty/tty.cpp        |     2 +-
 external/gpl2/groff/dist/src/libs/libdriver/input.cpp      |     4 +-
 external/gpl2/groff/dist/src/libs/libgroff/Makefile.sub    |     2 +-
 external/gpl2/groff/dist/src/preproc/eqn/Makefile.sub      |     3 +
 external/gpl2/groff/dist/src/preproc/pic/Makefile.sub      |     4 +
 external/gpl2/groff/dist/src/preproc/pic/object.cpp        |  2019 ++++++
 external/gpl2/groff/dist/src/preproc/pic/object.h          |   227 +
 external/gpl2/groff/dist/src/preproc/pic/pic.y             |     2 +-
 external/gpl2/groff/dist/src/preproc/refer/label.y         |     2 +-
 external/gpl2/groff/dist/src/roff/troff/input.cpp          |     5 +-
 external/gpl2/groff/dist/src/roff/troff/mtsm.cpp           |    15 +-
 external/gpl2/groff/dist/src/roff/troff/node.cpp           |     7 +-
 external/gpl2/groff/dist/src/utils/hpftodit/hpftodit.cpp   |     4 +-
 external/gpl2/groff/dist/tmac/Makefile.sub                 |     2 +-
 external/gpl2/groff/dist/tmac/ascii.tmac                   |    53 +
 external/gpl2/groff/dist/tmac/doc-common                   |     5 +-
 external/gpl2/groff/dist/tmac/doc-syms                     |     6 +
 external/gpl2/groff/dist/tmac/doc.tmac                     |    65 +-
 external/gpl2/groff/dist/tmac/groff_mdoc.man               |    73 +-
 external/gpl2/groff/dist/tmac/troffrc                      |    55 +
 external/gpl2/groff/dist/tmac/tty.tmac                     |     4 +-
 external/gpl2/groff/doc/Makefile                           |     9 +
 external/gpl2/groff/font/Makefile                          |    14 +
 external/gpl2/groff/font/Makefile.dev                      |    15 +
 external/gpl2/groff/font/Makefile.inc                      |     5 +
 external/gpl2/groff/font/Makefile.tty                      |    37 +
 external/gpl2/groff/font/devX100-12/Makefile               |    12 +
 external/gpl2/groff/font/devX100/Makefile                  |    12 +
 external/gpl2/groff/font/devX75-12/Makefile                |    12 +
 external/gpl2/groff/font/devX75/Makefile                   |    12 +
 external/gpl2/groff/font/devascii/Makefile                 |    10 +
 external/gpl2/groff/font/devcp1047/Makefile                |    10 +
 external/gpl2/groff/font/devdvi/Makefile                   |    35 +
 external/gpl2/groff/font/devhtml/Makefile                  |    11 +
 external/gpl2/groff/font/devkoi8-r/DESC.proto              |     8 +
 external/gpl2/groff/font/devkoi8-r/Makefile                |    10 +
 external/gpl2/groff/font/devkoi8-r/R.proto                 |   332 +
 external/gpl2/groff/font/devlatin1/Makefile                |    10 +
 external/gpl2/groff/font/devlbp/Makefile                   |    26 +
 external/gpl2/groff/font/devlj4/Makefile                   |    37 +
 external/gpl2/groff/font/devps/Makefile                    |    45 +
 external/gpl2/groff/font/devutf8/Makefile                  |    10 +
 external/gpl2/groff/groff2netbsd                           |   144 +
 external/gpl2/groff/include/config.h                       |   218 +
 external/gpl2/groff/include/defs.h                         |    13 +
 external/gpl2/groff/lib/Makefile                           |     7 +
 external/gpl2/groff/lib/Makefile.inc                       |     2 +
 external/gpl2/groff/lib/libbib/Makefile                    |    14 +
 external/gpl2/groff/lib/libdriver/Makefile                 |    12 +
 external/gpl2/groff/lib/libgroff/Makefile                  |    36 +
 external/gpl2/groff/man/Makefile                           |    11 +
 external/gpl2/groff/tmac/Makefile                          |    83 +
 external/gpl2/groff/tmac/Makefile.inc                      |     2 +
 external/gpl2/groff/tmac/fr.ISO8859-1                      |   141 +
 external/gpl2/groff/tmac/hyphen.ru                         |  3893 ++++++++++++
 external/gpl2/groff/tmac/koi8-r.tmac                       |   134 +
 external/gpl2/groff/tmac/man.local                         |     4 +
 external/gpl2/groff/tmac/man/Makefile                      |    22 +
 external/gpl2/groff/tmac/mdoc.local                        |   112 +
 external/gpl2/groff/tmac/mm/Makefile                       |    50 +
 external/gpl2/groff/tmac/mom/Makefile                      |    27 +
 external/gpl2/groff/tmac/mom/Makefile.inc                  |     5 +
 external/gpl2/groff/tmac/mom/examples/Makefile             |    13 +
 external/gpl2/groff/tmac/mom/momdoc/Makefile               |    30 +
 external/gpl2/groff/tmac/ru.KOI8-R                         |   141 +
 108 files changed, 8918 insertions(+), 85 deletions(-)

diffs (truncated from 9946 to 300 lines):

diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/Makefile      Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:55 christos Exp $
+
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile,v 2.11 2003/05/02 00:55:52 ru Exp $
+
+SUBDIR=                lib .WAIT doc font man tmac devices
+
+.include <bsd.subdir.mk>
diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/Makefile.inc  Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,158 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/13 19:01:55 christos Exp $
+
+# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $
+
+BINDIR?=       /usr/bin
+ECHO=          echo
+
+# Define `page' to be letter if your PostScript printer uses 8.5x11
+# paper (USA) and define it to be A4, if it uses A4 paper (rest of the
+# world).
+PAGE=letter
+
+# Normally the Postscript driver, grops, produces output that conforms
+# to version 3.0 of the Adobe Document Structuring Conventions.
+# Unfortunately some spoolers and previewers can't handle such output.
+# The BROKEN_SPOOLER_FLAGS variable tells grops what it should do to
+# make its output acceptable to such programs.  This variable controls
+# only the default behaviour of grops; the behaviour can be changed at
+# runtime by the grops -b option (and so by groff -P-b).
+#
+# Use a value of 0 if your spoolers and previewers are able to handle
+# conforming PostScript correctly.
+#
+# Add 1 if no %%{Begin,End}DocumentSetup comments should be generated;
+# this is needed for early versions of TranScript that get confused by
+# anything between the %%EndProlog line and the first %%Page: comment.
+#
+# Add 2 if lines in included files beginning with %! should be
+# stripped out; this is needed for the OpenWindows 2.0 pageview previewer.
+#
+# Add 4 if %%Page, %%Trailer and %%EndProlog comments should be
+# stripped out of included files; this is needed for spoolers that
+# don't understand the %%{Begin,End}Document comments. I suspect this
+# includes early versions of TranScript.
+#
+# Add 8 if the first line of the PostScript output should be %!PS-Adobe-2.0
+# rather than %!PS-Adobe-3.0; this is needed when using Sun's Newsprint
+# with a printer that requires page reversal.
+#
+BROKEN_SPOOLER_FLAGS=0
+
+# DEVICE is the default device.
+DEVICE=ps
+
+# PSPRINT is the command to use for printing a PostScript file,
+# for example `lpr'.
+PSPRINT=lpr
+
+# DVIPRINT is the command to use for printing a TeX dvi file,
+# for example `lpr -d'.
+DVIPRINT=lpr -d
+########################################################################
+# Don't touch...
+
+g=
+tmac_s_prefix=
+tmac_m_prefix=
+tmac_an_prefix=
+fontdir=/usr/share/groff_font
+localfontdir=$(fontdir)
+legacyfontdir=$(fontdir)
+tmacdir=/usr/share/tmac
+systemtmacdir=/usr/share/tmac
+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
+indexname=Ind
+
+########################################################################
+# Libraries
+.include <bsd.own.mk>
+
+DIST=          ${NETBSDSRCDIR}/external/gpl2/groff
+GROFF_DIST=    ${DIST}/dist
+
+PROGDPLIBS+= bib ${DIST}/lib/libbib
+PROGDPLIBS+= driver ${DIST}/lib/libdriver
+PROGDPLIBS+= groff ${DIST}/lib/libgroff
+
+CPPFLAGS+=     -DHAVE_CONFIG_H
+CPPFLAGS+=     -I${DIST}/include -I${GROFF_DIST}/src/include
+CXXFLAGS+=     -fno-rtti -fno-exceptions
+
+CWARNFLAGS.clang+=     -Wno-unused-value
+
+
+.ifdef GROFFYSRCS
+YFLAGS+=       -d
+SRCS+=         ${GROFFYSRCS:.y=.cpp}
+DPSRCS+=       ${GROFFYSRCS:.y=.cpp}
+CLEANFILES+=   ${GROFFYSRCS:.y=.cpp} ${GROFFYSRCS:.y=_tab.h}
+.endif
+
+.y.cpp:
+       ${_MKTARGET_YACC}
+       ${YACC.y} -o ${.TARGET} ${.IMPSRC}
+       mv -f ${.PREFIX}.h ${.PREFIX}_tab.h
+
+
+.SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8
+
+version != cat $(GROFF_DIST)/VERSION
+revision != ${TOOL_SED} -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION
+
+.man.8 .man.7 .man.6 .man.5 .man.4 .man.3 .man.2 .man.1:
+       ${_MKTARGET_CREATE}
+       rm -f $@
+       ${TOOL_SED} -e "s;@BINDIR@;${BINDIR};g" \
+       -e "s;@FONTDIR@;$(fontdir);g" \
+       -e "s;@LOCALFONTDIR@;$(localfontdir);g" \
+       -e "s;@LEGACYFONTDIR@;$(legacyfontdir);g" \
+       -e "s;@MACRODIR@;$(tmacdir);g" \
+       -e "s;@SYSTEMMACRODIR@;$(systemtmacdir);g" \
+       -e "s;@LOCALMACRODIR@;$(localtmacdir);g" \
+       -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" \
+       -e "s;@INDEX_SUFFIX@;$(indexext);g" \
+       -e "s;@COMMON_WORDS_FILE@;$(common_words_file);g" \
+       -e "s;@MAN1EXT@;1;g" \
+       -e "s;@MAN5EXT@;5;g" \
+       -e "s;@MAN7EXT@;7;g" \
+       -e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
+       -e "s;@TMAC_M_PREFIX@;$(tmac_m_prefix);g" \
+       -e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
+       -e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \
+       -e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \
+       -e "s;@VERSION@;$(version)$(revision);g" \
+       -e "s;@MDATE@;`${HOST_SH} ${GROFF_DIST}/mdate.sh $<`;g" \
+       -e "s;@g@;$(g);g" \
+       -e "s;@G@;`echo $(g) | LC_ALL=C tr [a-z] [A-Z]`;g" \
+       $< >$@
+
+.SUFFIXES: .sh .pl
+
+.sh .pl:
+       ${_MKTARGET_CREATE}
+       rm -f $@
+       ${TOOL_SED} -e "s|@BINDIR@|${BINDIR}|g" \
+            -e "s;@FONTDIR@;$(fontdir);g" \
+            -e 's|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME="$${GROFF_BIN_PATH=/usr/bin}:"|g' \
+            -e "s|@SEP@|:|" \
+            -e "s|@VERSION@|$(version)$(revision)|" \
+            -e "s|@g@|$(g)|g" \
+            ${.IMPSRC} >${.TARGET}
+
+DIST_SUBDIR?=  ${.CURDIR:T}
+DIST_DIR=      ${GROFF_DIST}/${DIST_SUBDIR}
+.PATH: ${DIST_DIR}
diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/bin/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/bin/Makefile  Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:55 christos Exp $
+
+SUBDIR= addftinfo afmtodit eqn grn groff grog hpftodit html indxbib \
+       lkbib lookbib nroff pfbtops pic refer soelim tbl tfmtodit troff
+
+.include <bsd.subdir.mk>
diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/bin/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/bin/Makefile.inc      Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/13 19:01:55 christos Exp $
+
+.include "${.PARSEDIR}/../Makefile.inc"
+
+DPADD+=                ${LIBM}
+LDADD+=                -lm
diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/bin/addftinfo/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/bin/addftinfo/Makefile        Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:55 christos Exp $
+
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
+
+DIST_SUBDIR=   src/utils/addftinfo
+
+.include <bsd.init.mk>
+
+PROG_CXX=      addftinfo
+SRCS=          addftinfo.cpp guess.cpp
+CLEANFILES=    ${MAN}
+
+.include <bsd.prog.mk>
diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/bin/afmtodit/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/bin/afmtodit/Makefile Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+
+# $FreeBSD: src/gnu/usr.bin/groff/src/utils/afmtodit/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $
+
+DIST_SUBDIR=   src/utils/afmtodit
+
+.include <bsd.init.mk>
+
+SCRIPTS=       afmtodit
+MAN=           afmtodit.1
+CLEANFILES=    ${SCRIPTS} ${MAN}
+
+.include <bsd.prog.mk>
diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/bin/eqn/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/bin/eqn/Makefile      Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
+
+DIST_SUBDIR=   src/preproc/eqn
+GROFFYSRCS=    eqn.y
+
+.include <bsd.init.mk>
+
+PROG_CXX=      eqn
+SRCS=          main.cpp lex.cpp eqn.cpp \
+               box.cpp limit.cpp list.cpp over.cpp text.cpp \
+               script.cpp mark.cpp other.cpp delim.cpp sqrt.cpp pile.cpp special.cpp
+CPPFLAGS+=     -I${DIST_DIR} -I.
+SCRIPTS=       neqn
+MAN=           eqn.1 neqn.1
+CLEANFILES=    ${SCRIPTS} ${MAN}
+
+.include <bsd.prog.mk>
diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/bin/grn/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/bin/grn/Makefile      Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+
+# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
+
+DIST_SUBDIR=   src/preproc/grn
+
+.include <bsd.init.mk>
+
+PROG_CXX=      grn
+SRCS=          hdb.cpp hpoint.cpp hgraph.cpp main.cpp
+CLEANFILES=    ${MAN}
+USETBL=
+
+.include <bsd.prog.mk>
diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/bin/groff/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/bin/groff/Makefile    Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.7 2003/05/01 13:22:20 ru Exp $
+
+DIST_SUBDIR=   src/roff/groff
+
+.include <bsd.init.mk>
+
+PROG_CXX=      groff
+SRCS=          groff.cpp pipeline.c
+CLEANFILES=    ${MAN}
+
+.include <bsd.prog.mk>
diff -r cc0e3d487ae4 -r dcd08cc1928e external/gpl2/groff/bin/grog/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/groff/bin/grog/Makefile     Wed Jan 13 19:01:55 2016 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/grog/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $
+
+DIST_SUBDIR=   src/roff/grog
+
+.include <bsd.init.mk>
+
+SCRIPTS=       grog
+MAN=           grog.1
+CLEANFILES=    ${SCRIPTS} ${MAN}



Home | Main Index | Thread Index | Old Index