From b48d7a100ebdda56575779ae1149877a153de1ab Mon Sep 17 00:00:00 2001 From: ru Date: Fri, 11 Oct 2002 08:58:14 +0000 Subject: Upgrade to Groff 1.18.1. --- gnu/usr.bin/groff/Makefile.inc | 43 ++----- gnu/usr.bin/groff/contrib/groffer/Makefile | 7 ++ gnu/usr.bin/groff/contrib/mm/Makefile | 4 +- gnu/usr.bin/groff/font/devdvi/Makefile | 15 ++- gnu/usr.bin/groff/font/devhtml/Makefile | 2 +- gnu/usr.bin/groff/font/devlbp/Makefile | 3 +- gnu/usr.bin/groff/font/devps/Makefile | 4 +- gnu/usr.bin/groff/man/Makefile | 5 +- gnu/usr.bin/groff/src/devices/grohtml/Makefile | 2 +- gnu/usr.bin/groff/src/include/config.h | 153 +++++++++++++++++++++++++ gnu/usr.bin/groff/src/libs/libgroff/Makefile | 10 +- gnu/usr.bin/groff/src/preproc/html/Makefile | 2 +- gnu/usr.bin/groff/tmac/Makefile | 14 ++- 13 files changed, 206 insertions(+), 58 deletions(-) create mode 100644 gnu/usr.bin/groff/contrib/groffer/Makefile create mode 100644 gnu/usr.bin/groff/src/include/config.h (limited to 'gnu') diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc index d5cd9fb..7744e60 100644 --- a/gnu/usr.bin/groff/Makefile.inc +++ b/gnu/usr.bin/groff/Makefile.inc @@ -49,11 +49,14 @@ tmac_s_prefix= tmac_m_prefix= tmac_an_prefix= fontdir=/usr/share/groff_font -fontpath=$(fontdir) +localfontdir=$(fontdir) +legacyfontdir=$(fontdir) tmacdir=/usr/share/tmac systemtmacdir=/usr/share/tmac localtmacdir=/usr/share/tmac -tmacpath=$(tmacdir) +docdir=/usr/src/contrib/groff/doc +exampledir=XXX +htmldocdir=XXX indexext=.i common_words_file=/usr/share/dict/eign indexdir=/usr/share/dict/papers @@ -73,34 +76,7 @@ LIBDRIVER= ${.CURDIR}/${TOPREL}/src/libs/libdriver/libdriver.a LIBBIB= ${.CURDIR}/${TOPREL}/src/libs/libbib/libbib.a .endif -CFLAGS+= -DHAVE_STDLIB_H=1\ - -DHAVE_UNISTD_H=1\ - -DHAVE_DIRENT_H=1\ - -DHAVE_LIMITS_H=1\ - -DHAVE_STRING_H=1\ - -DHAVE_STRINGS_H=1\ - -DHAVE_MATH_H=1\ - -DRET_TYPE_SRAND_IS_VOID=1\ - -DHAVE_SYS_NERR=1\ - -DHAVE_SYS_ERRLIST=1\ - -DHAVE_CC_LIMITS_H=1\ - -DRETSIGTYPE=void\ - -DHAVE_STRUCT_EXCEPTION=1\ - -DHAVE_GETPAGESIZE=1\ - -DHAVE_MMAP=1\ - -DHAVE_FMOD=1\ - -DHAVE_STRTOL=1\ - -DHAVE_GETCWD=1\ - -DHAVE_STRERROR=1\ - -DHAVE_PUTENV=1\ - -DHAVE_RENAME=1\ - -DHAVE_MKSTEMP=1\ - -DHAVE_STRCASECMP=1\ - -DHAVE_STRNCASECMP=1\ - -DHAVE_STRSEP=1\ - -DHAVE_STRDUP=1\ - -DSYS_SIGLIST_DECLARED=1 - +CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include CXXFLAGS+= -fno-rtti -fno-exceptions @@ -125,11 +101,14 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION` @-rm -f $@ @sed -e "s;@BINDIR@;${BINDIR};g" \ -e "s;@FONTDIR@;$(fontdir);g" \ - -e "s;@FONTPATH@;$(fontpath);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;@MACROPATH@;$(tmacpath);g" \ + -e "s;@DOCDIR@;$(docdir);g" \ + -e "s;@EXAMPLEDIR@;$(exampledir);g" \ + -e "s;@HTMLDOCDIR@;$(htmldocdir);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/contrib/groffer/Makefile b/gnu/usr.bin/groff/contrib/groffer/Makefile new file mode 100644 index 0000000..2b07a88 --- /dev/null +++ b/gnu/usr.bin/groff/contrib/groffer/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +SCRIPTS= groffer +MAN= groffer.1 +CLEANFILES= ${SCRIPTS} ${MAN} + +.include diff --git a/gnu/usr.bin/groff/contrib/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile index 63911be..763386b 100644 --- a/gnu/usr.bin/groff/contrib/mm/Makefile +++ b/gnu/usr.bin/groff/contrib/mm/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ SCRIPTS= mmroff.pl -MAN= mmroff.7 +MAN= mmroff.1 TMACDIR?= ${SHAREDIR}/tmac -FILES= m.tmac mse.tmac +FILES= m.tmac mm.tmac mse.tmac mmse.tmac FILESDIR_m.tmac=${TMACDIR} FILESDIR_mse.tmac=${TMACDIR} FILES+= 0.MT 5.MT 4.MT ms.cov se_ms.cov diff --git a/gnu/usr.bin/groff/font/devdvi/Makefile b/gnu/usr.bin/groff/font/devdvi/Makefile index cb747a5..4e34807 100644 --- a/gnu/usr.bin/groff/font/devdvi/Makefile +++ b/gnu/usr.bin/groff/font/devdvi/Makefile @@ -1,11 +1,16 @@ # $FreeBSD$ DEV= dvi -DEVFILES= DESC R I B BI CW CWI MI S EX H HI HB SA SB \ - generate/CompileFonts generate/Makefile generate/msam.map\ - generate/msbm.map generate/texb.map generate/texex.map \ - generate/texi.map generate/texmi.map generate/texr.map \ - generate/texsy.map generate/textt.map +DEVFILES= DESC \ + TR TI TB TBI CW CWI HR HI HB HBI \ + TREC TIEC TBEC TBIEC CWEC CWIEC HREC HIEC HBEC HBIEC \ + TRTC TITC TBTC TBITC CWTC CWITC HRTC HITC HBTC HBITC \ + MI S EX SA SB \ + generate/CompileFonts generate/Makefile \ + generate/msam.map generate/msbm.map \ + generate/texb.map generate/texex.map generate/texi.map \ + generate/texmi.map generate/texr.map generate/texsy.map \ + generate/textt.map generate/ec.map generate/tc.map CLEANFILES+= DESC diff --git a/gnu/usr.bin/groff/font/devhtml/Makefile b/gnu/usr.bin/groff/font/devhtml/Makefile index f44b144..e210eed 100644 --- a/gnu/usr.bin/groff/font/devhtml/Makefile +++ b/gnu/usr.bin/groff/font/devhtml/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ DEV= html -FONTS= R I B BI CR S +FONTS= R I B BI CR CI CB CBI S .include "../Makefile.tty" .include "../Makefile.dev" diff --git a/gnu/usr.bin/groff/font/devlbp/Makefile b/gnu/usr.bin/groff/font/devlbp/Makefile index 4ea437e..1372c8f 100644 --- a/gnu/usr.bin/groff/font/devlbp/Makefile +++ b/gnu/usr.bin/groff/font/devlbp/Makefile @@ -2,7 +2,8 @@ DEV= lbp LBPPRINT= ${PSPRINT} -DEVFILES= DESC HB HBI HI HR TB TBI TI TR +DEVFILES= DESC HB HBI HI HR HNB HNBI HNI HNR \ + TB TBI TI TR CR CB CI ER EB EI CLEANFILES+= DESC diff --git a/gnu/usr.bin/groff/font/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile index 0383d01..79a9819 100644 --- a/gnu/usr.bin/groff/font/devps/Makefile +++ b/gnu/usr.bin/groff/font/devps/Makefile @@ -18,9 +18,9 @@ DESC: DESC.in cat ${DIST_DIR}/DESC.in >DESC echo broken ${BROKEN_SPOOLER_FLAGS} >>DESC if test "${PAGE}" = A4; then \ - echo "paperlength 841890" >>DESC; \ + echo "papersize a4" >>DESC; \ else \ - echo "paperlength 792000" >>DESC; \ + echo "papersize letter" >>DESC; \ fi test -z '${PSPRINT}' || echo print '${PSPRINT}' >>DESC diff --git a/gnu/usr.bin/groff/man/Makefile b/gnu/usr.bin/groff/man/Makefile index 9937f57..b22c4c4 100644 --- a/gnu/usr.bin/groff/man/Makefile +++ b/gnu/usr.bin/groff/man/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ -MAN= groff_font.5 groff_out.5 -MAN+= groff.7 groff_char.7 roff.7 +MAN= groff_font.5 groff_out.5 groff_tmac.5 +MLINKS= groff_tmac.5 tmac.5 +MAN+= ditroff.7 groff.7 groff_char.7 groff_diff.7 roff.7 CLEANFILES= ${MAN} .include diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile index 01b1aa1..a2e09a1 100644 --- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile +++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= post-grohtml -SRCS= post-html.cc html-text.cc output.cc +SRCS= post-html.cc html-table.cc html-text.cc output.cc DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm NOMAN= YES diff --git a/gnu/usr.bin/groff/src/include/config.h b/gnu/usr.bin/groff/src/include/config.h new file mode 100644 index 0000000..1d74fc8 --- /dev/null +++ b/gnu/usr.bin/groff/src/include/config.h @@ -0,0 +1,153 @@ +/* $FreeBSD$ */ + +/* src/include/config.h. Generated by configure. */ +/* src/include/config.hin. Generated automatically from configure.ac by autoheader. */ + +/* Define if your C++ doesn't understand `delete []'. */ +/* #undef ARRAY_DELETE_NEEDS_SIZE */ + +/* Define if you have a C++ . */ +#define HAVE_CC_LIMITS_H 1 + +/* Define if you have a C++ . */ +/* #undef HAVE_CC_OSFCN_H */ + +/* Define if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define if you have the `fmod' function. */ +#define HAVE_FMOD 1 + +/* Define if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define if you have the header file. */ +#define HAVE_MATH_H 1 + +/* Define if you have mkstemp(). */ +#define HAVE_MKSTEMP 1 + +/* Define if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define if you have the `putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define if you have the `rename' function. */ +#define HAVE_RENAME 1 + +/* Define if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define if you have the `strncasecmp' function. */ +#define HAVE_STRNCASECMP 1 + +/* Define if you have the `strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define if defines struct exception. */ +#define HAVE_STRUCT_EXCEPTION 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_DIR_H 1 + +/* Define if you have sys_errlist in or in . */ +#define HAVE_SYS_ERRLIST 1 + +/* Define if you have sysnerr in or . */ +#define HAVE_SYS_NERR 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define if the host's encoding is EBCDIC. */ +/* #undef IS_EBCDIC_HOST */ + +/* Define if localtime() takes a long * not a time_t *. */ +/* #undef LONG_FOR_TIME_T */ + +/* Define if your C++ doesn't declare gettimeofday(). */ +/* #undef NEED_DECLARATION_GETTIMEOFDAY */ + +/* Define if your C++ doesn't declare hypot(). */ +/* #undef NEED_DECLARATION_HYPOT */ + +/* Define if your C++ doesn't declare pclose(). */ +/* #undef NEED_DECLARATION_PCLOSE */ + +/* Define if your C++ doesn't declare popen(). */ +/* #undef NEED_DECLARATION_POPEN */ + +/* Define if your C++ doesn't declare putenv(). */ +/* #undef NEED_DECLARATION_PUTENV */ + +/* Define if your C++ doesn't declare strcasecmp(). */ +/* #undef NEED_DECLARATION_STRCASECMP */ + +/* Define if your C++ doesn't declare strncasecmp(). */ +/* #undef NEED_DECLARATION_STRNCASECMP */ + +/* Define if the printer's page size is A4. */ +#define PAGEA4 1 + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Define if srand() returns void not int. */ +#define RET_TYPE_SRAND_IS_VOID 1 + +/* Define if `sys_siglist' is declared by or . */ +#define SYS_SIGLIST_DECLARED 1 + +/* Define if your C++ compiler uses a traditional (Reiser) preprocessor. */ +/* #undef TRADITIONAL_CPP */ + +/* Define if the 0200 bit of the status returned by wait() indicates whether a + core image was produced for a process that was terminated by a signal. */ +/* #undef WCOREFLAG */ + +/* Define if -D_POSIX_SOURCE is necessary. */ +/* #undef _POSIX_SOURCE */ + +/* Define if you have ISC 3.x or 4.x. */ +/* #undef _SYSV3 */ + +/* Define uintmax_t to `unsigned long' or `unsigned long long' if + does not exist. */ +/* #undef uintmax_t */ diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile index d309f19..1ace75b 100644 --- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile +++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile @@ -2,12 +2,12 @@ LIB= groff INTERNALLIB= YES -SRCS= assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\ - error.cc fatal.cc filename.cc font.cc fontfile.cc\ - htmlindicate.cc lf.cc lineno.cc macropath.cc\ - maxfilename.cc nametoindex.cc new.cc prime.cc\ +SRCS= assert.cc change_lf.cc cmap.cc color.cc cset.cc device.cc errarg.cc\ + error.cc fatal.cc filename.cc font.cc fontfile.cc geometry.cc\ + htmlhint.cc invalid.cc lf.cc lineno.cc macropath.cc\ + maxfilename.cc mksdir.cc nametoindex.cc new.cc paper.cc prime.cc\ progname.cc ptable.cc searchpath.cc string.cc strsave.cc\ - tmpfile.cc illegal.cc version.cc + tmpfile.cc tmpname.cc version.cc SRCS+= getopt.c getopt1.c iftoa.c itoa.c matherr.c CLEANFILES= version.cc diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile index 2667405..da32411 100644 --- a/gnu/usr.bin/groff/src/preproc/html/Makefile +++ b/gnu/usr.bin/groff/src/preproc/html/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= pre-grohtml -SRCS= pre-html.cc pushbackbuffer.cc +SRCS= pre-html.cc pushback.cc DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} NOMAN= YES diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index 38725c0a..85aba4d 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -6,10 +6,9 @@ TMACMODE?= ${NOBINMODE} TMACDIR?= ${SHAREDIR}/tmac MDOCDIR?= ${TMACDIR}/mdoc -MAN= groff_tmac.5 -MLINKS+= groff_tmac.5 tmac.5 -MAN+= groff_ms.7 groff_man.7 groff_me.7 groff_mdoc.7 groff_mwww.7 -MLINKS+= groff_ms.7 ms.7 +MAN= groff_ms.7 groff_man.7 groff_me.7 groff_mdoc.7 +MAN+= groff_trace.7 groff_www.7 +MLINKS= groff_ms.7 ms.7 MLINKS+= groff_man.7 man.7 MLINKS+= groff_me.7 me.7 MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 @@ -22,14 +21,17 @@ NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ mdoc.tmac \ pic.tmac \ a4.tmac \ + ec.tmac \ safer.tmac \ trace.tmac \ ps.tmac psold.tmac pspic.tmac psatk.tmac \ dvi.tmac \ - tty.tmac tty-char.tmac latin1.tmac \ + tty.tmac tty-char.tmac \ + latin1.tmac cp1047.tmac \ X.tmac Xps.tmac \ lj4.tmac \ - html.tmac mwww.tmac www.tmac \ + lbp.tmac \ + html.tmac www.tmac \ eqnrc \ troffrc troffrc-end \ hyphen.us -- cgit v1.1