Upgrade to Groff 1.19.2.

This commit is contained in:
Ruslan Ermilov 2005-10-20 10:57:53 +00:00
parent ed6ac7236a
commit 54d3fd886a
11 changed files with 95 additions and 36 deletions

View File

@ -57,6 +57,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
@ -102,6 +103,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" \
@ -126,6 +128,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION`
.sh .pl:
@${ECHO} Making ${.TARGET} from ${.IMPSRC}
@sed -e "s|@BINDIR@|${BINDIR}|g" \
-e 's|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME="$${GROFF_BIN_PATH=${BINDIR}}:"|g' \
-e "s;@FONTDIR@;$(fontdir);g" \
-e "s|@SEP@|:|g" \
-e "s|@VERSION@|$(version)$(revision)|" \

View File

@ -28,3 +28,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

View File

@ -2,6 +2,8 @@
DEV= html
FONTS= R I B BI CR CI CB CBI S
GHOSTSCRIPT= /usr/local/bin/gs
DESC_EXT= echo "image_generator ${GHOSTSCRIPT}"
.include "../Makefile.tty"
.include "../Makefile.dev"

View File

@ -1,13 +1,16 @@
# $FreeBSD$
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

View File

@ -1,6 +1,7 @@
# $FreeBSD$
PROG_CXX= grolj4
MAN= grolj4.1 lj4_font.5
SRCS= lj4.cpp
DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
LDADD= ${LIBDRIVER} ${LIBGROFF} -lm

View File

@ -0,0 +1,37 @@
# $FreeBSD$
PROG= gxditview
SRCS= device.c draw.c Dvi.c font.c lex.c page.c parse.c xditview.c
DPADD= ${LIBM}
LDADD= -lm
CLEANFILES= ${MAN}
GENHDRS= GXditview-ad.h
SRCS+= ${GENHDRS}
CFLAGS+= -I.
CLEANFILES+= ${GENHDRS}
GXditview-ad.h: GXditview.ad
${SHELL} ${DIST_DIR}/ad2c ${.ALLSRC} >${.TARGET}
# libxutil
SRCS+= DviChar.c XFontName.c xmalloc.c
# X11 glue
CFLAGS+= -I${X11BASE}/include
LDFLAGS= -L${X11BASE}/lib
DPADD+= ${X11BASE}/lib/libXaw.a
LDADD+= -lXaw
BINDIR= ${X11BASE}/bin
MANDIR= ${X11BASE}/man/man
FILESDIR= ${X11BASE}/lib/X11/app-defaults
FILES= GXditview.ad
FILESNAME= GXditview
uninstall_sub:
-rm -f $(appresdir)/GXditview
.include <bsd.prog.mk>
.PATH: ${GROFF_DIST}/src/libs/libxutil

View File

@ -1,25 +1,26 @@
/* $FreeBSD$ */
#include <osreldate.h>
/* src/include/config.h. Generated by configure. */
/* src/include/config.hin. Generated from configure.ac by autoheader. */
/* Define if your C++ doesn't understand `delete []'. */
/* #undef ARRAY_DELETE_NEEDS_SIZE */
/* Define if you have a C++ <inttypes.h>. */
#define HAVE_CC_INTTYPES_H 1
/* Define if you have a C++ <limits.h>. */
#define HAVE_CC_LIMITS_H 1
/* Define if you have a C++ <osfcn.h>. */
/* #undef HAVE_CC_OSFCN_H */
/* Define if you have a C++ <stdint.h>. */
#if __FreeBSD_version >= 500028
#define HAVE_CC_STDINT_H 1
#else
/* #undef HAVE_CC_STDINT_H */
#endif
/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
don't. */
#define HAVE_DECL_SYS_SIGLIST 0
/* Define to 1 if you have the <direct.h> header file. */
/* #undef HAVE_DIRECT_H */
/* Define to 1 if you have the <dirent.h> header file. */
#define HAVE_DIRENT_H 1
@ -42,6 +43,9 @@
/* Define to 1 if you have the `isatty' function. */
#define HAVE_ISATTY 1
/* Define to 1 if you have the `kill' function. */
#define HAVE_KILL 1
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
@ -57,6 +61,9 @@
/* Define to 1 if you have a working `mmap' system call. */
#define HAVE_MMAP 1
/* Define to 1 if you have the <process.h> header file. */
/* #undef HAVE_PROCESS_H */
/* Define to 1 if you have the `putenv' function. */
#define HAVE_PUTENV 1
@ -70,11 +77,7 @@
#define HAVE_SNPRINTF 1
/* Define to 1 if you have the <stdint.h> header file. */
#if __FreeBSD_version >= 500028
#define HAVE_STDINT_H 1
#else
/* #undef HAVE_STDINT_H */
#endif
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
@ -101,15 +104,15 @@
#define HAVE_STRTOL 1
/* Define if <math.h> defines struct exception. */
#define HAVE_STRUCT_EXCEPTION 1
/* #undef HAVE_STRUCT_EXCEPTION */
/* Define to 1 if you have the <sys/dir.h> header file. */
#define HAVE_SYS_DIR_H 1
/* Define if you have sys_errlist in <errno.h> or in <stdio.h>. */
/* Define if you have sys_errlist in <errno.h>, <stdio.h>, or <stdlib.h>. */
#define HAVE_SYS_ERRLIST 1
/* Define if you have sysnerr in <errno.h> or <stdio.h>. */
/* Define if you have sys_nerr in <errno.h>, <stdio.h>, or <stdio.h>. */
#define HAVE_SYS_NERR 1
/* Define to 1 if you have the <sys/stat.h> header file. */
@ -124,6 +127,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to 1 if you have the `vsnprintf' function. */
#define HAVE_VSNPRINTF 1
/* Define if the host's encoding is EBCDIC. */
/* #undef IS_EBCDIC_HOST */
@ -160,6 +166,12 @@
/* Define if your C++ doesn't declare strncasecmp(). */
/* #undef NEED_DECLARATION_STRNCASECMP */
/* Define if your C++ doesn't declare vfprintf(). */
/* #undef NEED_DECLARATION_VFPRINTF */
/* Define if your C++ doesn't declare vsnprintf(). */
/* #undef NEED_DECLARATION_VSNPRINTF */
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
@ -176,7 +188,7 @@
#define PACKAGE_VERSION ""
/* Define if the printer's page size is A4. */
#define PAGEA4 1
/* #undef PAGEA4 */
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
@ -187,9 +199,6 @@
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Define to 1 if `sys_siglist' is declared by <signal.h> or <unistd.h>. */
#define SYS_SIGLIST_DECLARED 1
/* Define if your C++ compiler uses a traditional (Reiser) preprocessor. */
/* #undef TRADITIONAL_CPP */
@ -197,6 +206,9 @@
core image was produced for a process that was terminated by a signal. */
/* #undef WCOREFLAG */
/* Define to 1 if the X Window System is missing or not being used. */
/* #undef X_DISPLAY_MISSING */
/* Define if -D_POSIX_SOURCE is necessary. */
/* #undef _POSIX_SOURCE */
@ -205,8 +217,4 @@
/* Define uintmax_t to `unsigned long' or `unsigned long long' if <inttypes.h>
does not exist. */
#if __FreeBSD_version >= 500028
/* #undef uintmax_t */
#else
#define uintmax_t unsigned long long
#endif

View File

@ -2,13 +2,14 @@
LIB= groff
INTERNALLIB=
SRCS= assert.cpp change_lf.cpp cmap.cpp color.cpp cset.cpp device.cpp errarg.cpp\
error.cpp fatal.cpp filename.cpp font.cpp fontfile.cpp geometry.cpp\
htmlhint.cpp invalid.cpp lf.cpp lineno.cpp macropath.cpp\
SRCS= assert.cpp change_lf.cpp cmap.cpp color.cpp cset.cpp\
device.cpp errarg.cpp error.cpp fatal.cpp filename.cpp\
font.cpp fontfile.cpp geometry.cpp glyphuni.cpp htmlhint.cpp\
hypot.cpp invalid.cpp lf.cpp lineno.cpp macropath.cpp\
maxfilename.cpp mksdir.cpp nametoindex.cpp new.cpp paper.cpp prime.cpp\
progname.cpp ptable.cpp searchpath.cpp string.cpp strsave.cpp\
tmpfile.cpp tmpname.cpp version.cpp
SRCS+= iftoa.c itoa.c matherr.c
ptable.cpp searchpath.cpp string.cpp strsave.cpp symbol.cpp\
tmpfile.cpp tmpname.cpp unicode.cpp uniglyph.cpp uniuni.cpp version.cpp
SRCS+= iftoa.c itoa.c matherr.c progname.c
CLEANFILES= version.cpp
.include <bsd.lib.mk>

View File

@ -1,9 +1,8 @@
# $FreeBSD$
PROG_CXX= troff
SRCS= dictionary.cpp div.cpp env.cpp glyphuni.cpp input.cpp \
majorminor.cpp node.cpp number.cpp reg.cpp symbol.cpp \
unicode.cpp uniglyph.cpp uniuni.cpp
SRCS= dictionary.cpp div.cpp env.cpp input.cpp \
majorminor.cpp mtsm.cpp node.cpp number.cpp reg.cpp
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
CLEANFILES= majorminor.cpp ${MAN}

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PROG_CXX= hpftodit
SRCS= hpftodit.cpp
SRCS= hpftodit.cpp hpuni.cpp
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
CLEANFILES= ${MAN}

View File

@ -28,10 +28,12 @@ NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \
dvi.tmac \
tty.tmac tty-char.tmac \
latin1.tmac latin2.tmac latin9.tmac cp1047.tmac \
unicode.tmac \
X.tmac Xps.tmac \
lj4.tmac \
lbp.tmac \
html.tmac html-end.tmac \
devtag.tmac \
europs.tmac \
composite.tmac \
eqnrc \