Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/groff Merge groff-1.19.2.
details: https://anonhg.NetBSD.org/src/rev/daf6ebde8dfa
branches: trunk
changeset: 588059:daf6ebde8dfa
user: wiz <wiz%NetBSD.org@localhost>
date: Mon Feb 06 18:25:47 2006 +0000
description:
Merge groff-1.19.2.
diffstat:
gnu/dist/groff/Makefile.comm | 16 +-
gnu/dist/groff/Makefile.in | 134 +-
gnu/dist/groff/README.CVS | 6 -
gnu/dist/groff/arch/misc/Makefile.sub | 2 +-
gnu/dist/groff/configure | 4397 ++++++++++++++++----
gnu/dist/groff/contrib/mom/Makefile.sub | 56 +-
gnu/dist/groff/contrib/mom/examples/README.mom | 59 -
gnu/dist/groff/contrib/mom/examples/macros.mom | 672 ---
gnu/dist/groff/contrib/mom/examples/typeset.mom | 542 --
gnu/dist/groff/contrib/mom/examples/typewrite.mom | 235 -
gnu/dist/groff/doc/Makefile.in | 25 +-
gnu/dist/groff/doc/Makefile.sub | 40 +-
gnu/dist/groff/doc/groff-3 | Bin
gnu/dist/groff/src/devices/grotty/tty.cpp | 82 +-
gnu/dist/groff/src/include/groff-getopt.h | 70 -
gnu/dist/groff/src/preproc/eqn/Makefile.sub | 1 +
gnu/dist/groff/src/preproc/pic/pic.y | 32 +-
gnu/dist/groff/src/preproc/refer/label.y | 4 +-
gnu/dist/groff/src/roff/nroff/nroff.sh | 15 +-
gnu/dist/groff/src/utils/hpftodit/hpftodit.cpp | 4 +-
gnu/dist/groff/src/xditview/ChangeLog | 531 --
gnu/dist/groff/src/xditview/DESC | 9 -
gnu/dist/groff/src/xditview/Dvi.c | 590 --
gnu/dist/groff/src/xditview/Dvi.h | 48 -
gnu/dist/groff/src/xditview/DviChar.c | 666 ---
gnu/dist/groff/src/xditview/DviChar.h | 39 -
gnu/dist/groff/src/xditview/DviP.h | 236 -
gnu/dist/groff/src/xditview/FontMap | 17 -
gnu/dist/groff/src/xditview/GXditview-ad.h | 54 -
gnu/dist/groff/src/xditview/GXditview.ad | 57 -
gnu/dist/groff/src/xditview/INSTALL | 20 -
gnu/dist/groff/src/xditview/Imakefile.in | 120 -
gnu/dist/groff/src/xditview/Menu.h | 48 -
gnu/dist/groff/src/xditview/README | 14 -
gnu/dist/groff/src/xditview/TODO | 17 -
gnu/dist/groff/src/xditview/XFontName.c | 259 -
gnu/dist/groff/src/xditview/XFontName.h | 47 -
gnu/dist/groff/src/xditview/ad2c | 62 -
gnu/dist/groff/src/xditview/device.c | 606 --
gnu/dist/groff/src/xditview/device.h | 23 -
gnu/dist/groff/src/xditview/draw.c | 747 ---
gnu/dist/groff/src/xditview/font.c | 483 --
gnu/dist/groff/src/xditview/gray1.bm | 4 -
gnu/dist/groff/src/xditview/gray2.bm | 4 -
gnu/dist/groff/src/xditview/gray3.bm | 4 -
gnu/dist/groff/src/xditview/gray4.bm | 4 -
gnu/dist/groff/src/xditview/gray5.bm | 4 -
gnu/dist/groff/src/xditview/gray6.bm | 4 -
gnu/dist/groff/src/xditview/gray7.bm | 4 -
gnu/dist/groff/src/xditview/gray8.bm | 4 -
gnu/dist/groff/src/xditview/gxditview.man | 249 -
gnu/dist/groff/src/xditview/lex.c | 107 -
gnu/dist/groff/src/xditview/page.c | 95 -
gnu/dist/groff/src/xditview/parse.c | 373 -
gnu/dist/groff/src/xditview/xdit.bm | 14 -
gnu/dist/groff/src/xditview/xdit_mask.bm | 14 -
gnu/dist/groff/src/xditview/xditview.c | 602 --
gnu/dist/groff/src/xditview/xtotroff.c | 323 -
gnu/dist/groff/tmac/doc-common | 12 +-
gnu/dist/groff/tmac/doc-syms | 6 +-
gnu/dist/groff/tmac/doc.tmac | 75 +-
gnu/dist/groff/tmac/groff_mdoc.man | 26 +-
gnu/dist/groff/tmac/s.tmac | 224 +-
63 files changed, 3966 insertions(+), 9271 deletions(-)
diffs (truncated from 15286 to 300 lines):
diff -r d1b23bccd2dc -r daf6ebde8dfa gnu/dist/groff/Makefile.comm
--- a/gnu/dist/groff/Makefile.comm Mon Feb 06 18:10:27 2006 +0000
+++ b/gnu/dist/groff/Makefile.comm Mon Feb 06 18:25:47 2006 +0000
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU General Public License along
# with groff; see the file COPYING. If not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
#
# Makefile.comm
#
@@ -30,6 +30,7 @@
LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.$(LIBEXT)
LIBBIB=$(top_builddir)/src/libs/libbib/libbib.$(LIBEXT)
LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.$(LIBEXT)
+LIBXUTIL=$(top_builddir)/src/libs/libxutil/libxutil.$(LIBEXT)
MLIB=
XLIBS=
YTABH=
@@ -92,22 +93,22 @@
-rm -f $(REALCLEANFILES)
extraclean: distclean
- -rm -f \#* *~ =* core junk grot old temp tmp tem
+ -rm -f \#* *~ =* core junk grot old temp tmp tem *.new *.old *.orig
.SUFFIXES:
.SUFFIXES: .o .obj .cpp .c .y .man .n
.cpp.o:
- $(COMPILE.cpp) $<
+ $(COMPILE.cpp) $(EXTRA_CCFLAGS) $<
.c.o:
- $(COMPILE.c) $<
+ $(COMPILE.c) $(EXTRA_CFLAGS) $<
.cpp.obj:
- $(COMPILE.cpp) $<
+ $(COMPILE.cpp) $(EXTRA_CCFLAGS) $<
.c.obj:
- $(COMPILE.c) $<
+ $(COMPILE.c) $(EXTRA_CFLAGS) $<
.y.cpp:
if test -n "$(YTABH)"; then \
@@ -132,7 +133,7 @@
-test -f y.tab.c && mv y.tab.c y_tab.c
mv y_tab.c $(YTABC)
test -z "$(YTABH)" || mv y_tab.h $(YTABH)
- $(COMPILE.cpp) $(YTABC)
+ $(COMPILE.cpp) $(EXTRA_CCFLAGS) $(YTABC)
.man.n:
@echo Making $@ from $<
@@ -147,6 +148,7 @@
-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 -r d1b23bccd2dc -r daf6ebde8dfa gnu/dist/groff/Makefile.in
--- a/gnu/dist/groff/Makefile.in Mon Feb 06 18:10:27 2006 +0000
+++ b/gnu/dist/groff/Makefile.in Mon Feb 06 18:25:47 2006 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Written by James Clark (jjc%jclark.com@localhost)
#
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU General Public License along
# with groff; see the file COPYING. If not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
SHELL=@SHELL@
@@ -43,6 +43,18 @@
# world).
PAGE=@PAGE@
+# The name of the ghostscript program. Normally, gs, on GNU/Linux
+# but it might be different on MS-DOS/MS-WIN32 systems.
+GHOSTSCRIPT=@GHOSTSCRIPT@
+
+# `ALT_GHOSTSCRIPT_PROGS' specifies a list alternative names,
+# which can be tried if `GHOSTSCRIPT' cannot be found at run time.
+ALT_GHOSTSCRIPT_PROGS=@ALT_GHOSTSCRIPT_PROGS@
+
+# Similarly, `ALT_AWK_PROGS' specifies a list of alternative names,
+# which can be tried at run time, to identify the awk program.
+ALT_AWK_PROGS=@ALT_AWK_PROGS@
+
# 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.
@@ -69,6 +81,15 @@
# `DEVICE' is the default device.
DEVICE=ps
+# `XDEVDIRS' is either `font/devX{75,100}{,-12}' or empty.
+XDEVDIRS=@XDEVDIRS@
+
+# `XPROGDIRS' is either `src/devices/xditview src/utils/xtotroff' or empty.
+XPROGDIRS=@XPROGDIRS@
+
+# `XLIBDIRS' is either `src/libs/libxutil' or empty.
+XLIBDIRS=@XLIBDIRS@
+
# `TTYDEVDIRS' is either `font/devascii font/devlatin1' (for
# ASCII) or `font/devcp1047' (for EBCDIC) plus font/devutf8.
TTYDEVDIRS=@TTYDEVDIRS@ font/devutf8
@@ -122,6 +143,9 @@
# `htmldocdir' says where to install documentation in HTML format.
htmldocdir=$(docdir)/html
+# `pdfdocdir' says where to install documentation in PDF format.
+pdfdocdir=$(docdir)/pdf
+
# `fontdir' says where to install dev*/*.
fontdir=$(datasubdir)/font
@@ -143,6 +167,10 @@
# `localtmacdir' says where local files will be installed.
localtmacdir=$(dataprogramdir)/site-tmac
+# `appresdir' says where to install the application resource file for
+# gxditview.
+appresdir=@appresdir@
+
# `tmacpath' says where to look for macro files.
# The current directory will be prepended in unsafe mode only; the home
# directory will be always added.
@@ -224,6 +252,11 @@
make_html=
make_install_html=
+# The configure script also checks whether all necessary utility programs
+# for pdfroff are available -- only then we can build PDF documentation.
+make_pdfdoc=@make_pdfdoc@
+make_install_pdfdoc=@make_install_pdfdoc@
+
# DEFINES should include the following:
# -DHAVE_MMAP if you have mmap() and <sys/mman.h>
# -DARRAY_DELETE_NEEDS_SIZE if your C++ doesn't understand `delete []'
@@ -238,7 +271,7 @@
# -DHAVE_CC_LIMITS_H if you have a C++ <limits.h>
# -DHAVE_MATH_H if you have <math.h>
# -DHAVE_CC_OSFCN_H if you have a C++ <osfcn.h>
-# -DHAVE_CC_STDINT_H if you have a C++ <stdint.h>
+# -DHAVE_CC_INTTYPES_H if you have a C++ <inttypes.h>
# -DHAVE_STDLIB_H if you have <stdlib.h>
# -DHAVE_STRING_H if you have <string.h>
# -DHAVE_STRINGS_H if you have <strings.h>
@@ -296,7 +329,9 @@
# -DHAVE_STRUCT_EXCEPTION if <math.h> defines struct exception
# -DRETSIGTYPE=int if signal handlers return int not void
# -DIS_EBCDIC_HOST if the host's encoding is EBCDIC
-# -DPAGEA4 if the the printer's page size is A4
+# -DPAGE=A4 if the the printer's page size is A4
+# -DGHOSTSCRIPT=gs the name (and directory if required) of the
+# ghostscript program
DEFINES=@DEFS@
# Include
@@ -316,9 +351,16 @@
# CDEFINES are definitions for C compilations.
CDEFINES=$(DEFINES)
-CCFLAGS=@CPPFLAGS@ @CXXFLAGS@
-CFLAGS=@CPPFLAGS@ @CFLAGS@
+CCFLAGS=@CXXFLAGS@
+CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@
LDFLAGS=@LDFLAGS@
+
+X_CFLAGS=@X_CFLAGS@
+X_LIBS=@X_LIBS@
+X_EXTRA_LIBS=@X_EXTRA_LIBS@
+X_PRE_LIBS=@X_PRE_LIBS@
+
YACC=@YACC@
YACCFLAGS=-v
@@ -359,6 +401,8 @@
# copy of $(MDEFINES) when making individual directories; this could
# cause the argument list to become too long on some systems.
MDEFINES= \
+ "ALT_AWK_PROGS=$(ALT_AWK_PROGS)" \
+ "ALT_GHOSTSCRIPT_PROGS=$(ALT_GHOSTSCRIPT_PROGS)" \
"AR=$(AR)" \
"BROKEN_SPOOLER_FLAGS=$(BROKEN_SPOOLER_FLAGS)" \
"CC=$(CC)" \
@@ -367,6 +411,7 @@
"CCFLAGS=$(CCFLAGS)" \
"CDEFINES=$(CDEFINES)" \
"CFLAGS=$(CFLAGS)" \
+ "CPPFLAGS=$(CPPFLAGS)" \
"DEVICE=$(DEVICE)" \
"DVIPRINT=$(DVIPRINT)" \
"ETAGS=$(ETAGS)" \
@@ -386,6 +431,7 @@
"OBJEXT=$(OBJEXT)" \
"OTHERDEVDIRS=$(OTHERDEVDIRS)" \
"PAGE=$(PAGE)" \
+ "GHOSTSCRIPT=$(GHOSTSCRIPT)" \
"PERLPATH=$(PERLPATH)" \
"PSPRINT=$(PSPRINT)" \
"PURIFY=$(PURIFY)" \
@@ -397,8 +443,16 @@
"SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
"SH_DEPS_SED_SCRIPT=$(SH_DEPS_SED_SCRIPT)" \
"TTYDEVDIRS=$(TTYDEVDIRS)" \
+ "XDEVDIRS=$(XDEVDIRS)" \
+ "XLIBDIRS=$(XLIBDIRS)" \
+ "XPROGDIRS=$(XPROGDIRS)" \
+ "X_CFLAGS=$(X_CFLAGS)" \
+ "X_LIBS=$(X_LIBS)" \
+ "X_EXTRA_LIBS=$(X_EXTRA_LIBS)" \
+ "X_PRE_LIBS=$(X_PRE_LIBS)" \
"YACC=$(YACC)" \
"YACCFLAGS=$(YACCFLAGS)" \
+ "appresdir=$(appresdir)" \
"bindir=$(bindir)" \
"common_words_file=$(common_words_file)" \
"datadir=$(datadir)" \
@@ -411,6 +465,7 @@
"fontpath=$(fontpath)" \
"g=$(g)" \
"htmldocdir=$(htmldocdir)" \
+ "pdfdocdir=$(pdfdocdir)" \
"indexdir=$(indexdir)" \
"indexext=$(indexext)" \
"indexname=$(indexname)" \
@@ -422,6 +477,8 @@
"localtmacdir=$(localtmacdir)" \
"make_html=$(make_html)" \
"make_install_html=$(make_install_html)" \
+ "make_pdfdoc=$(make_pdfdoc)" \
+ "make_install_pdfdoc=$(make_install_pdfdoc)" \
"man1dir=$(man1dir)" \
"man1ext=$(man1ext)" \
"man5dir=$(man5dir)" \
@@ -449,7 +506,8 @@
LIBDIRS=\
src/libs/libgroff \
src/libs/libdriver \
- src/libs/libbib
+ src/libs/libbib \
+ $(XLIBDIRS)
CCPROGDIRS=\
src/roff/groff \
src/roff/troff \
@@ -472,42 +530,42 @@
src/utils/indxbib \
src/utils/lkbib \
src/utils/addftinfo
-CPROGDIRS=src/utils/pfbtops
+CPROGDIRS=\
+ src/utils/pfbtops \
+ $(XPROGDIRS)
PROGDEPDIRS=arch/misc
PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
DEVDIRS=\
font/devps \
font/devdvi \
- font/devX75 \
- font/devX75-12 \
- font/devX100 \
- font/devX100-12 \
font/devhtml
ALLTTYDEVDIRS=\
font/devascii \
font/devlatin1 \
font/devutf8 \
font/devcp1047
+# `doc' must be processed before `contrib/pdfmark'.
OTHERDIRS=\
man \
tmac \
src/utils/afmtodit \
src/roff/grog \
src/roff/nroff \
+ doc \
contrib/mm \
contrib/pic2graph \
contrib/eqn2graph \
contrib/grap2graph \
contrib/groffer \
contrib/mom \
- doc
+ contrib/pdfmark \
+ contrib/gdiffmk
ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
Home |
Main Index |
Thread Index |
Old Index