Index: head/gnu/usr.bin/groff/Makefile.inc =================================================================== --- head/gnu/usr.bin/groff/Makefile.inc (revision 151503) +++ head/gnu/usr.bin/groff/Makefile.inc (revision 151504) @@ -1,139 +1,142 @@ # $FreeBSD$ BINDIR?= /usr/bin SHELL= /bin/sh # 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=7 # 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 LIBGROFF= ${.OBJDIR}/${TOPREL}/src/libs/libgroff/libgroff.a LIBDRIVER= ${.OBJDIR}/${TOPREL}/src/libs/libdriver/libdriver.a LIBBIB= ${.OBJDIR}/${TOPREL}/src/libs/libbib/libbib.a CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include CXXFLAGS+= -fno-rtti -fno-exceptions .y.o: $(YACC) $(YFLAGS) $(.IMPSRC) mv -f y.tab.c $(.PREFIX).cpp mv -f y.tab.h $(.PREFIX)_tab.h ${CXX} ${CXXFLAGS} -c $(.PREFIX).cpp -o ${.TARGET} .y.cpp: $(YACC) $(YFLAGS) $(.IMPSRC) 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 version=`cat $(GROFF_DIST)/VERSION` revision=`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: @${ECHO} Making $@ from $< @-rm -f $@ @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@;`$(SHELL) ${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: @${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)|" \ -e "s|@g@|$(g)|g" \ ${.IMPSRC} >${.TARGET} TOPREL?= .. GROFF_DIST= ${.CURDIR}/${TOPREL}/../../../contrib/groff DIST_SUBDIR?= ${.CURDIR:T} DIST_DIR= ${GROFF_DIST}/${DIST_SUBDIR} .PATH: ${DIST_DIR} Index: head/gnu/usr.bin/groff/font/Makefile.tty =================================================================== --- head/gnu/usr.bin/groff/font/Makefile.tty (revision 151503) +++ head/gnu/usr.bin/groff/font/Makefile.tty (revision 151504) @@ -1,30 +1,33 @@ # $FreeBSD$ FONTS?=R I B BI S L CW DEVFILES=$(FONTS) DESC CLEANFILES=$(DEVFILES) RES=240 CPI=10 LPI=6 $(FONTS): R.proto @${ECHO} Making ${.TARGET} @(charwidth=`expr $(RES) / $(CPI)` ; \ sed -e "s/^name [A-Z]*$$/name ${.TARGET}/" \ -e "s/^\\([^ ]*\\) [0-9]+ /\\1 $$charwidth /" \ -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \ -e "s/^internalname .*$$/internalname $@/" \ -e "/^internalname/s/BI/3/" \ -e "/^internalname/s/B/2/" \ -e "/^internalname/s/I/1/" \ -e "/^internalname .*[^ 0-9]/d" \ ${.ALLSRC} >$.${.TARGET}) DESC: DESC.proto @${ECHO} Making ${.TARGET} @sed -e "s/^res .*$$/res $(RES)/" \ -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \ -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 Index: head/gnu/usr.bin/groff/font/devhtml/Makefile =================================================================== --- head/gnu/usr.bin/groff/font/devhtml/Makefile (revision 151503) +++ head/gnu/usr.bin/groff/font/devhtml/Makefile (revision 151504) @@ -1,7 +1,9 @@ # $FreeBSD$ 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" Index: head/gnu/usr.bin/groff/font/devlj4/Makefile =================================================================== --- head/gnu/usr.bin/groff/font/devlj4/Makefile (revision 151503) +++ head/gnu/usr.bin/groff/font/devlj4/Makefile (revision 151504) @@ -1,25 +1,28 @@ # $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 DESC: DESC.in echo "res ${LJ4RES}" >${.TARGET} echo "unitwidth `expr 7620000 / ${LJ4RES}`" >>${.TARGET} cat ${.ALLSRC} >>${.TARGET} if test "${PAGE}" = A4; then \ echo "papersize a4" >>${.TARGET}; \ else \ echo "papersize letter" >>${.TARGET}; \ fi test -z '${LJ4PRINT}' || echo print '${LJ4PRINT}' >>${.TARGET} .include "../Makefile.dev" Index: head/gnu/usr.bin/groff/src/devices/grolj4/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/devices/grolj4/Makefile (revision 151503) +++ head/gnu/usr.bin/groff/src/devices/grolj4/Makefile (revision 151504) @@ -1,9 +1,10 @@ # $FreeBSD$ PROG_CXX= grolj4 +MAN= grolj4.1 lj4_font.5 SRCS= lj4.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} .include Index: head/gnu/usr.bin/groff/src/devices/xditview/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/devices/xditview/Makefile (nonexistent) +++ head/gnu/usr.bin/groff/src/devices/xditview/Makefile (revision 151504) @@ -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 + +.PATH: ${GROFF_DIST}/src/libs/libxutil Property changes on: head/gnu/usr.bin/groff/src/devices/xditview/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/gnu/usr.bin/groff/src/include/config.h =================================================================== --- head/gnu/usr.bin/groff/src/include/config.h (revision 151503) +++ head/gnu/usr.bin/groff/src/include/config.h (revision 151504) @@ -1,212 +1,220 @@ /* $FreeBSD$ */ -#include - /* 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++ . */ +#define HAVE_CC_INTTYPES_H 1 + /* 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 a C++ . */ -#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 header file. */ +/* #undef HAVE_DIRECT_H */ + /* Define to 1 if you have the header file. */ #define HAVE_DIRENT_H 1 /* Define to 1 if you have the `fmod' function. */ #define HAVE_FMOD 1 /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 /* Define to 1 if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 /* Define to 1 if you have the 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 `kill' function. */ +#define HAVE_KILL 1 + /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 /* Define to 1 if you have the header file. */ #define HAVE_MATH_H 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 /* Define if you have mkstemp(). */ #define HAVE_MKSTEMP 1 /* Define to 1 if you have a working `mmap' system call. */ #define HAVE_MMAP 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PROCESS_H */ + /* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 /* Define to 1 if you have the `rename' function. */ #define HAVE_RENAME 1 /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 /* Define to 1 if you have the header file. */ -#if __FreeBSD_version >= 500028 #define HAVE_STDINT_H 1 -#else -/* #undef HAVE_STDINT_H */ -#endif /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 /* Define to 1 if you have the header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 /* Define to 1 if you have the `strncasecmp' function. */ #define HAVE_STRNCASECMP 1 /* Define to 1 if you have the `strsep' function. */ #define HAVE_STRSEP 1 /* Define to 1 if you have the `strtol' function. */ #define HAVE_STRTOL 1 /* Define if defines struct exception. */ -#define HAVE_STRUCT_EXCEPTION 1 +/* #undef HAVE_STRUCT_EXCEPTION */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_DIR_H 1 -/* Define if you have sys_errlist in or in . */ +/* Define if you have sys_errlist in , , or . */ #define HAVE_SYS_ERRLIST 1 -/* Define if you have sysnerr in or . */ +/* Define if you have sys_nerr in , , or . */ #define HAVE_SYS_NERR 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the 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 */ /* 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 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 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 "" /* 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 +/* #undef PAGEA4 */ /* 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 to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Define to 1 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 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 */ /* 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. */ -#if __FreeBSD_version >= 500028 /* #undef uintmax_t */ -#else -#define uintmax_t unsigned long long -#endif Index: head/gnu/usr.bin/groff/src/libs/libgroff/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/libs/libgroff/Makefile (revision 151503) +++ head/gnu/usr.bin/groff/src/libs/libgroff/Makefile (revision 151504) @@ -1,21 +1,22 @@ # $FreeBSD$ 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 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`\"\; | \ sed -e 's/\.0\"/\"/' >>$@ Index: head/gnu/usr.bin/groff/src/roff/troff/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/roff/troff/Makefile (revision 151503) +++ head/gnu/usr.bin/groff/src/roff/troff/Makefile (revision 151504) @@ -1,20 +1,19 @@ # $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} .include majorminor.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION @${ECHO} Making $@ @-rm -f $@ @echo const char \*major_version = \ \"`sed -e 's/^\([^.]*\)\..*$$/\1/' ${GROFF_DIST}/VERSION`\"\; >$@ @echo const char \*minor_version = \ \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' ${GROFF_DIST}/VERSION`\"\; >>$@ @echo const char \*revision = \"`cat ${GROFF_DIST}/REVISION`\"\; >>$@ Index: head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile (revision 151503) +++ head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile (revision 151504) @@ -1,9 +1,9 @@ # $FreeBSD$ PROG_CXX= hpftodit -SRCS= hpftodit.cpp +SRCS= hpftodit.cpp hpuni.cpp DPADD= ${LIBGROFF} ${LIBM} LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} .include Index: head/gnu/usr.bin/groff/tmac/Makefile =================================================================== --- head/gnu/usr.bin/groff/tmac/Makefile (revision 151503) +++ head/gnu/usr.bin/groff/tmac/Makefile (revision 151504) @@ -1,81 +1,83 @@ # $FreeBSD$ TMACOWN?= ${BINOWN} TMACGRP?= ${BINGRP} TMACMODE?= ${NOBINMODE} TMACDIR?= ${SHAREDIR}/tmac MDOCDIR?= ${TMACDIR}/mdoc 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 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ me.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 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 \ troffrc troffrc-end \ 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 all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} .for f in ${MDOCFILES} ${STRIPFILES} $f-s: $f sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET} .endfor .for f in ${SPECIALFILES} $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 beforeinstall: cd ${DIST_DIR}; \ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ ${NORMALFILES} ${DESTDIR}${TMACDIR} cd ${.CURDIR}; \ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} .for f in ${STRIPFILES} ${SPECIALFILES} ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${TMACDIR}/$f .endfor .for f in ${MDOCFILES} ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${MDOCDIR}/$f .endfor .if !exists(${DESTDIR}${TMACDIR}/man.local) ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ ${DIST_DIR}/man.local ${DESTDIR}${TMACDIR} .endif .include