diff options
author | ru <ru@FreeBSD.org> | 2003-05-01 13:22:21 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2003-05-01 13:22:21 +0000 |
commit | 979c0d656829fd523be93f7a75f8481f3dc6a89f (patch) | |
tree | 45514362ad95aa167d66c4e62b194f9781f118e2 /gnu | |
parent | 7d401b64e847aef2b48a0005276b004e23f75f74 (diff) | |
download | FreeBSD-src-979c0d656829fd523be93f7a75f8481f3dc6a89f.zip FreeBSD-src-979c0d656829fd523be93f7a75f8481f3dc6a89f.tar.gz |
Upgrade to Groff 1.19.
Diffstat (limited to 'gnu')
31 files changed, 155 insertions, 86 deletions
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile index 7c61f71..abefd2b 100644 --- a/gnu/usr.bin/groff/Makefile +++ b/gnu/usr.bin/groff/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ SUBDIR= contrib doc font man src tmac +SUBDIR:= ${SUBDIR:Ndoc} # pending texinfo 4.3 import .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc index 7744e60..091c4c1 100644 --- a/gnu/usr.bin/groff/Makefile.inc +++ b/gnu/usr.bin/groff/Makefile.inc @@ -82,13 +82,13 @@ CXXFLAGS+= -fno-rtti -fno-exceptions .y.o: $(YACC) $(YFLAGS) $(.IMPSRC) - mv -f y.tab.c $(.PREFIX).cc + mv -f y.tab.c $(.PREFIX).cpp mv -f y.tab.h $(.PREFIX)_tab.h - ${CXX} ${CXXFLAGS} -c $(.PREFIX).cc -o ${.TARGET} + ${CXX} ${CXXFLAGS} -c $(.PREFIX).cpp -o ${.TARGET} -.y.cc: +.y.cpp: $(YACC) $(YFLAGS) $(.IMPSRC) - mv -f y.tab.c $(.PREFIX).cc + mv -f y.tab.c $(.PREFIX).cpp mv -f y.tab.h $(.PREFIX)_tab.h .SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8 @@ -133,6 +133,8 @@ 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;@FONTDIR@;$(fontdir);g" \ + -e "s|@SEP@|:|g" \ -e "s|@VERSION@|$(version)$(revision)|" \ -e "s|@g@|$(g)|g" \ ${.IMPSRC} >${.TARGET} diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev index 6516cd4..c4a74c6 100644 --- a/gnu/usr.bin/groff/font/Makefile.dev +++ b/gnu/usr.bin/groff/font/Makefile.dev @@ -2,5 +2,10 @@ FILES= ${DEVFILES} FILESDIR?= ${fontdir}/dev${DEV} +SCRIPTS= ${DEVSCRIPTS} +SCRIPTSDIR?= ${fontdir}/dev${DEV} +.for script in ${SCRIPTS} +SCRIPTSNAME_${script:T}= ${script:T} +.endfor .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/font/devdvi/Makefile b/gnu/usr.bin/groff/font/devdvi/Makefile index 4e34807..9497e2d 100644 --- a/gnu/usr.bin/groff/font/devdvi/Makefile +++ b/gnu/usr.bin/groff/font/devdvi/Makefile @@ -5,17 +5,24 @@ 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 \ + MI S EX SA SB SC \ + 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 + generate/textt.map generate/textex.map generate/ec.map \ + generate/tc.map +DEVSCRIPTS= generate/CompileFonts CLEANFILES+= DESC DESC: DESC.in - cat ${DIST_DIR}/DESC.in >DESC - test -z '${DVIPRINT}' || echo print '${DVIPRINT}' >>DESC + cat ${DIST_DIR}/DESC.in >${.TARGET} + if test "${PAGE}" = A4; then \ + echo "papersize a4" >>${.TARGET}; \ + else \ + echo "papersize letter" >>${.TARGET}; \ + fi + test -z '${DVIPRINT}' || echo print '${DVIPRINT}' >>${.TARGET} .include "../Makefile.dev" diff --git a/gnu/usr.bin/groff/font/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile index 79a9819..d45d442 100644 --- a/gnu/usr.bin/groff/font/devps/Makefile +++ b/gnu/usr.bin/groff/font/devps/Makefile @@ -4,12 +4,15 @@ DEV= ps DISTFILES= text.enc download \ S ZD ZDR SS AB ABI AI AR BMB BMBI BMI BMR \ CB CBI CI CR HB HBI HI HR HNB HNBI HNI HNR \ - NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI + NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI \ + EURO freeeuro.pfa PSFILES= prologue symbolsl.pfa zapfdr.pfa -DEVGENFILES= generate/Makefile generate/afmname generate/dingbats.map \ - generate/dingbats.rmap generate/lgreekmap generate/symbol.sed \ +DEVGENFILES= generate/Makefile generate/dingbats.map \ + generate/dingbats.rmap generate/lgreekmap \ generate/symbolchars generate/symbolsl.afm generate/textmap +DEVGENSCRIPTS= generate/afmname generate/symbol.sed DEVFILES= DESC ${PSFILES} ${DISTFILES} ${DEVGENFILES} +DEVSCRIPTS= ${DEVGENSCRIPTS} CLEANFILES+= DESC ${PSFILES} diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile index 9912a02..3745440 100644 --- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile +++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= grodvi -SRCS= dvi.cc +SRCS= dvi.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile index a2e09a1..db7099e 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-table.cc html-text.cc output.cc +SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm NOMAN= YES diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile index 64bcbad..85a41c1 100644 --- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile +++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= grolbp -SRCS= lbp.cc +SRCS= lbp.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile index 13027f0..270910a 100644 --- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile +++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= grolj4 -SRCS= lj4.cc +SRCS= lj4.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile index 479898e..4511f69 100644 --- a/gnu/usr.bin/groff/src/devices/grops/Makefile +++ b/gnu/usr.bin/groff/src/devices/grops/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= grops -SRCS= ps.cc psrm.cc +SRCS= ps.cpp psrm.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile index 15728bb..d15ee8b 100644 --- a/gnu/usr.bin/groff/src/devices/grotty/Makefile +++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= grotty -SRCS= tty.cc +SRCS= tty.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/include/config.h b/gnu/usr.bin/groff/src/include/config.h index 1546f4f..90c2383 100644 --- a/gnu/usr.bin/groff/src/include/config.h +++ b/gnu/usr.bin/groff/src/include/config.h @@ -3,7 +3,7 @@ #include <osreldate.h> /* src/include/config.h. Generated by configure. */ -/* src/include/config.hin. Generated automatically from configure.ac by autoheader. */ +/* src/include/config.hin. Generated from configure.ac by autoheader. */ /* Define if your C++ doesn't understand `delete []'. */ /* #undef ARRAY_DELETE_NEEDS_SIZE */ @@ -14,80 +14,92 @@ /* Define if you have a C++ <osfcn.h>. */ /* #undef HAVE_CC_OSFCN_H */ -/* Define if you have the <dirent.h> header file. */ +/* Define if you have a C++ <stdint.h>. */ +#define HAVE_CC_STDINT_H 1 + +/* Define to 1 if you have the <dirent.h> header file. */ #define HAVE_DIRENT_H 1 -/* Define if you have the `fmod' function. */ +/* Define to 1 if you have the `fmod' function. */ #define HAVE_FMOD 1 -/* Define if you have the `getcwd' function. */ +/* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 -/* Define if you have the `getpagesize' function. */ +/* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 -/* Define if you have the `gettimeofday' function. */ +/* Define to 1 if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 -/* Define if you have the <limits.h> header file. */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isatty' function. */ +#define HAVE_ISATTY 1 + +/* Define to 1 if you have the <limits.h> header file. */ #define HAVE_LIMITS_H 1 -/* Define if you have the <math.h> header file. */ +/* Define to 1 if you have the <math.h> header file. */ #define HAVE_MATH_H 1 +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + /* Define if you have mkstemp(). */ #define HAVE_MKSTEMP 1 -/* Define if you have a working `mmap' system call. */ +/* Define to 1 if you have a working `mmap' system call. */ #define HAVE_MMAP 1 -/* Define if you have the `putenv' function. */ +/* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 -/* Define if you have the `rename' function. */ +/* Define to 1 if you have the `rename' function. */ #define HAVE_RENAME 1 -/* Define if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 -/* Define if you have the `isatty' function. */ -#define HAVE_ISATTY 1 +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 -/* Define if you have the <stdint.h> header file. */ +/* 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 if you have the <stdlib.h> header file. */ +/* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 -/* Define if you have the `strcasecmp' function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 -/* Define if you have the `strerror' function. */ +/* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 -/* Define if you have the <strings.h> header file. */ +/* Define to 1 if you have the <strings.h> header file. */ #define HAVE_STRINGS_H 1 -/* Define if you have the <string.h> header file. */ +/* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -/* Define if you have the `strncasecmp' function. */ +/* Define to 1 if you have the `strncasecmp' function. */ #define HAVE_STRNCASECMP 1 -/* Define if you have the `strsep' function. */ +/* Define to 1 if you have the `strsep' function. */ #define HAVE_STRSEP 1 -/* Define if you have the `strtol' function. */ +/* Define to 1 if you have the `strtol' function. */ #define HAVE_STRTOL 1 /* Define if <math.h> defines struct exception. */ #define HAVE_STRUCT_EXCEPTION 1 -/* Define if you have the <sys/dir.h> header file. */ +/* 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>. */ @@ -96,10 +108,16 @@ /* Define if you have sysnerr in <errno.h> or <stdio.h>. */ #define HAVE_SYS_NERR 1 -/* Define if you have the <sys/time.h> header file. */ +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/time.h> header file. */ #define HAVE_SYS_TIME_H 1 -/* Define if you have the <unistd.h> header file. */ +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 /* Define if the host's encoding is EBCDIC. */ @@ -123,12 +141,36 @@ /* Define if your C++ doesn't declare putenv(). */ /* #undef NEED_DECLARATION_PUTENV */ +/* Define if your C++ doesn't declare rand(). */ +/* #undef NEED_DECLARATION_RAND */ + +/* Define if your C++ doesn't declare snprintf(). */ +/* #undef NEED_DECLARATION_SNPRINTF */ + +/* Define if your C++ doesn't declare srand(). */ +/* #undef NEED_DECLARATION_SRAND */ + /* 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 to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + /* Define if the printer's page size is A4. */ #define PAGEA4 1 @@ -138,7 +180,10 @@ /* Define if srand() returns void not int. */ #define RET_TYPE_SRAND_IS_VOID 1 -/* Define if `sys_siglist' is declared by <signal.h> or <unistd.h>. */ +/* 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. */ diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile index a4d3f23..c66b8a9 100644 --- a/gnu/usr.bin/groff/src/libs/libbib/Makefile +++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile @@ -2,6 +2,6 @@ LIB= bib INTERNALLIB= YES -SRCS= common.cc index.cc linear.cc search.cc map.c +SRCS= common.cpp index.cpp linear.cpp search.cpp map.c .include <bsd.lib.mk> diff --git a/gnu/usr.bin/groff/src/libs/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile index 6eab241..deb3e3b 100644 --- a/gnu/usr.bin/groff/src/libs/libdriver/Makefile +++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile @@ -2,6 +2,6 @@ LIB= driver INTERNALLIB= YES -SRCS= input.cc printer.cc +SRCS= input.cpp printer.cpp .include <bsd.lib.mk> diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile index 1ace75b..876131c 100644 --- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile +++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile @@ -2,19 +2,19 @@ LIB= groff INTERNALLIB= YES -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 tmpname.cc version.cc +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\ + 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+= getopt.c getopt1.c iftoa.c itoa.c matherr.c -CLEANFILES= version.cc +CLEANFILES= version.cpp .include <bsd.lib.mk> -version.cc: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION - @${ECHO} Making version.cc +version.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION + @${ECHO} Making version.cpp @echo const char \*version_string = \"`cat ${GROFF_DIST}/VERSION`\"\; >$@ @echo const char \*revision_string = \"`cat ${GROFF_DIST}/REVISION`\"\; >>$@ @echo extern \"C\" const char \*Version_string = \"`cat ${GROFF_DIST}/VERSION`.`cat ${GROFF_DIST}/REVISION`\"\; | \ diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile index fdae39f..80871fe 100644 --- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile +++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile @@ -1,16 +1,16 @@ # $FreeBSD$ PROG_CXX= eqn -SRCS= eqn.cc eqn_tab.h main.cc lex.cc \ - box.cc limit.cc list.cc over.cc text.cc \ - script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc +SRCS= eqn.cpp eqn_tab.h main.cpp lex.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 CFLAGS+= -I${DIST_DIR} -I. DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} SCRIPTS= neqn MAN= eqn.1 neqn.1 -CLEANFILES= eqn.cc eqn_tab.h ${SCRIPTS} ${MAN} y.tab.c y.tab.h +CLEANFILES= eqn.cpp eqn_tab.h ${SCRIPTS} ${MAN} y.tab.c y.tab.h -eqn_tab.h: eqn.cc +eqn_tab.h: eqn.cpp .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile index 2360254..58309d2 100644 --- a/gnu/usr.bin/groff/src/preproc/grn/Makefile +++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= grn -SRCS= hdb.cc hpoint.cc hgraph.cc main.cc +SRCS= hdb.cpp hpoint.cpp hgraph.cpp main.cpp DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile index da32411..65839d2 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 pushback.cc +SRCS= pre-html.cpp pushback.cpp DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} NOMAN= YES diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile index 389016c..3b5939c 100644 --- a/gnu/usr.bin/groff/src/preproc/pic/Makefile +++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile @@ -1,13 +1,13 @@ # $FreeBSD$ PROG_CXX= pic -SRCS= lex.cc main.cc object.cc pic.cc pic_tab.h \ - common.cc troff.cc tex.cc +SRCS= lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \ + common.cpp troff.cpp tex.cpp CFLAGS+= -I${DIST_DIR} -I. DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm -CLEANFILES= ${MAN} pic.cc pic_tab.h y.tab.c y.tab.h +CLEANFILES= ${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h -pic_tab.h: pic.cc +pic_tab.h: pic.cpp .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile index 0fc9f30..8a18f6f 100644 --- a/gnu/usr.bin/groff/src/preproc/refer/Makefile +++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PROG_CXX= refer -SRCS= command.cc label.cc ref.cc refer.cc token.cc +SRCS= command.cpp label.cpp ref.cpp refer.cpp token.cpp CFLAGS+= -I${DIST_DIR} DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} LDADD= ${LIBBIB} ${LIBGROFF} -lm -CLEANFILES= label.cc label_tab.h ${MAN} y.tab.c y.tab.h +CLEANFILES= label.cpp label_tab.h ${MAN} y.tab.c y.tab.h .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile index 443d066..2c68b80 100644 --- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile +++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PROG_CXX= soelim +SRCS= soelim.cpp DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile index bc29521..29e7ac2 100644 --- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile +++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= tbl -SRCS= main.cc table.cc +SRCS= main.cpp table.cpp DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile index d057d50..2ae541b 100644 --- a/gnu/usr.bin/groff/src/roff/groff/Makefile +++ b/gnu/usr.bin/groff/src/roff/groff/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= groff -SRCS= groff.cc pipeline.c +SRCS= groff.cpp pipeline.c DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile index 7b31e7d..4f62293 100644 --- a/gnu/usr.bin/groff/src/roff/troff/Makefile +++ b/gnu/usr.bin/groff/src/roff/troff/Makefile @@ -1,15 +1,16 @@ # $FreeBSD$ PROG_CXX= troff -SRCS= env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \ - number.cc majorminor.cc +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 DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm -CLEANFILES= majorminor.cc ${MAN} +CLEANFILES= majorminor.cpp ${MAN} .include <bsd.prog.mk> -majorminor.cc: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION +majorminor.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION @${ECHO} Making $@ @-rm -f $@ @echo const char \*major_version = \ diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile index 164c7b3..26fbb57 100644 --- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile +++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= addftinfo -SRCS= addftinfo.cc guess.cc +SRCS= addftinfo.cpp guess.cpp DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile index f45bd17..50e51c9 100644 --- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= hpftodit -SRCS= hpftodit.cc +SRCS= hpftodit.cpp DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile index 67970af..b2c59a2 100644 --- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= indxbib -SRCS= indxbib.cc signal.c +SRCS= indxbib.cpp signal.c DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} LDADD= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile index d588dfa2..f30dc56 100644 --- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= lkbib -SRCS= lkbib.cc +SRCS= lkbib.cpp DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} LDADD= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile index 525a66e..18834a7 100644 --- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= lookbib -SRCS= lookbib.cc +SRCS= lookbib.cpp DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} LDADD= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile index cc8333d..ba3bbc5 100644 --- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG_CXX= tfmtodit -SRCS= tfmtodit.cc +SRCS= tfmtodit.cpp DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index d32f620..6591a85 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -20,21 +20,24 @@ NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ mdoc.tmac \ pic.tmac \ a4.tmac \ + papersize.tmac \ ec.tmac \ safer.tmac \ trace.tmac \ ps.tmac psold.tmac pspic.tmac psatk.tmac \ dvi.tmac \ tty.tmac tty-char.tmac \ - latin1.tmac cp1047.tmac \ + latin1.tmac latin2.tmac latin9.tmac cp1047.tmac \ X.tmac Xps.tmac \ lj4.tmac \ lbp.tmac \ - html.tmac www.tmac \ + html.tmac html-end.tmac \ + europs.tmac \ + composite.tmac \ eqnrc \ troffrc troffrc-end \ - hyphen.us -SPECIALFILES= an.tmac man.tmac s.tmac ms.tmac + hyphen.us hyphenex.us +SPECIALFILES= an.tmac man.tmac s.tmac ms.tmac www.tmac STRIPFILES= e.tmac doc.tmac mdoc.local MDOCFILES= doc-common doc-ditroff doc-nroff doc-syms \ fr.ISO8859-1 ru.KOI8-R @@ -50,6 +53,7 @@ $f-s: $f $f-s: $f sed -e "s;@TMAC_AN_PREFIX@;${tmac_an_prefix};g" \ -e "s;@TMAC_S_PREFIX@;${tmac_s_prefix};g" \ + -e "s;@PNMTOPS_NOSETPAGE@;pnmtops;g" \ ${.ALLSRC} > ${.TARGET} .endfor |