diff options
| author | wiz <wiz@NetBSD.org> | 2003-06-30 18:40:50 +0000 |
|---|---|---|
| committer | wiz <wiz@NetBSD.org> | 2003-06-30 18:40:50 +0000 |
| commit | bf7bd150bbfa358634a702be2293a7244d6459a3 (patch) | |
| tree | b088816c60913f9f00024d65d26d9beddef45b4a /gnu/usr.bin/groff/src | |
| parent | 97a4aa1713e7d35aa2bd636515f58e295d2c2b17 (diff) | |
Make groff-1.19 build on NetBSD.
Diffstat (limited to 'gnu/usr.bin/groff/src')
37 files changed, 138 insertions, 83 deletions
diff --git a/gnu/usr.bin/groff/src/devices/Makefile.inc b/gnu/usr.bin/groff/src/devices/Makefile.inc index b0e19d9db15..e757343f5b6 100644 --- a/gnu/usr.bin/groff/src/devices/Makefile.inc +++ b/gnu/usr.bin/groff/src/devices/Makefile.inc @@ -1,6 +1,3 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.1 2001/04/17 12:37:02 ru Exp $ -TOPREL= ../../.. -DIST_SUBDIR= src/devices/${.CURDIR:T} - .include "../../Makefile.inc" diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile index 01beb68df07..794a27fdd79 100644 --- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile +++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $ +DIST_SUBDIR= src/devices/grodvi + PROG_CXX= grodvi SRCS= dvi.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile index 08f39f38132..235e97cb189 100644 --- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile +++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile,v 1.5 2003/05/01 13:22:18 ru Exp $ +DIST_SUBDIR= src/devices/grohtml + PROG_CXX= post-grohtml SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm NOMAN= YES .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile index 1eed35e9763..2102499251f 100644 --- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile +++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $ +DIST_SUBDIR= src/devices/grolbp + PROG_CXX= grolbp SRCS= lbp.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile index 5ead05928b7..1aabc663bc2 100644 --- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile +++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile,v 1.4 2003/05/01 13:22:18 ru Exp $ +DIST_SUBDIR= src/devices/grolj4 + PROG_CXX= grolj4 SRCS= lj4.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile index 0626ed4a2f7..25649669544 100644 --- a/gnu/usr.bin/groff/src/devices/grops/Makefile +++ b/gnu/usr.bin/groff/src/devices/grops/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/devices/grops/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $ +DIST_SUBDIR= src/devices/grops + PROG_CXX= grops SRCS= ps.cpp psrm.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile index 539538415a0..7c4a2e2a180 100644 --- a/gnu/usr.bin/groff/src/devices/grotty/Makefile +++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/devices/grotty/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $ +DIST_SUBDIR= src/devices/grotty + PROG_CXX= grotty SRCS= tty.cpp -DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} -LDADD= ${LIBDRIVER} ${LIBGROFF} -lm +DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/include/config.h b/gnu/usr.bin/groff/src/include/config.h index 2de2cb74a99..aa5a839c895 100644 --- a/gnu/usr.bin/groff/src/include/config.h +++ b/gnu/usr.bin/groff/src/include/config.h @@ -1,7 +1,3 @@ -/* $FreeBSD: src/gnu/usr.bin/groff/src/include/config.h,v 1.4 2003/05/02 11:56:43 ru Exp $ */ - -#include <osreldate.h> - /* src/include/config.h. Generated by configure. */ /* src/include/config.hin. Generated from configure.ac by autoheader. */ @@ -15,11 +11,7 @@ /* #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 <dirent.h> header file. */ #define HAVE_DIRENT_H 1 @@ -70,11 +62,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 @@ -205,8 +193,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 diff --git a/gnu/usr.bin/groff/src/libs/Makefile.inc b/gnu/usr.bin/groff/src/libs/Makefile.inc index 3f786b71de5..3f98e072aa9 100644 --- a/gnu/usr.bin/groff/src/libs/Makefile.inc +++ b/gnu/usr.bin/groff/src/libs/Makefile.inc @@ -1,6 +1,3 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/libs/Makefile.inc,v 1.1 2001/04/17 12:37:08 ru Exp $ -TOPREL= ../../.. -DIST_SUBDIR= src/libs/${.CURDIR:T} - .include "../../Makefile.inc" diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile index b3ec0402238..349dbe926a5 100644 --- a/gnu/usr.bin/groff/src/libs/libbib/Makefile +++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile @@ -1,7 +1,15 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/libs/libbib/Makefile,v 1.3 2003/05/01 13:22:19 ru Exp $ +DIST_SUBDIR= src/libs/libbib + +NOMAN= # defined +NOPROFILE= # defined +NOPIC= # defined + LIB= bib -INTERNALLIB= YES SRCS= common.cpp index.cpp linear.cpp search.cpp map.c +# only needed during build +libinstall:: + .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 c310dea9108..f02bddda001 100644 --- a/gnu/usr.bin/groff/src/libs/libdriver/Makefile +++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile @@ -1,7 +1,15 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/libs/libdriver/Makefile,v 1.3 2003/05/01 13:22:19 ru Exp $ +DIST_SUBDIR= src/libs/libdriver + +NOMAN= # defined +NOPROFILE= # defined +NOPIC= # defined + LIB= driver -INTERNALLIB= YES SRCS= input.cpp printer.cpp +# only needed during build +libinstall:: + .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 161befff8b2..e15b50e52cd 100644 --- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile +++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile @@ -1,7 +1,12 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.5 2003/05/01 13:22:19 ru Exp $ +DIST_SUBDIR= src/libs/libgroff + +NOMAN= # defined +NOPROFILE= # defined +NOPIC= # defined + LIB= groff -INTERNALLIB= YES 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\ @@ -11,6 +16,9 @@ SRCS= assert.cpp change_lf.cpp cmap.cpp color.cpp cset.cpp device.cpp errarg.cp SRCS+= getopt.c getopt1.c iftoa.c itoa.c matherr.c CLEANFILES= version.cpp +# only needed during build +libinstall:: + .include <bsd.lib.mk> version.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION diff --git a/gnu/usr.bin/groff/src/preproc/Makefile.inc b/gnu/usr.bin/groff/src/preproc/Makefile.inc index 20129800b27..d77fd94a8a0 100644 --- a/gnu/usr.bin/groff/src/preproc/Makefile.inc +++ b/gnu/usr.bin/groff/src/preproc/Makefile.inc @@ -1,6 +1,3 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile.inc,v 1.1 2001/04/17 12:37:09 ru Exp $ -TOPREL= ../../.. -DIST_SUBDIR= src/preproc/${.CURDIR:T} - .include "../../Makefile.inc" diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile index b7049443fb4..a3cb9b10a07 100644 --- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile +++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile @@ -1,12 +1,14 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $ +DIST_SUBDIR= src/preproc/eqn + PROG_CXX= eqn 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} +DPADD+= ${LIBGROFF} +LDADD+= ${LIBGROFF} SCRIPTS= neqn MAN= eqn.1 neqn.1 CLEANFILES= eqn.cpp eqn_tab.h ${SCRIPTS} ${MAN} y.tab.c y.tab.h diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile index 3bec3ddbb0c..5c33c4552da 100644 --- a/gnu/usr.bin/groff/src/preproc/grn/Makefile +++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $ +DIST_SUBDIR= src/preproc/grn + PROG_CXX= grn SRCS= hdb.cpp hpoint.cpp hgraph.cpp main.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD+= ${LIBGROFF} ${LIBM} +LDADD+= ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile index 5950e4cda1d..2e31ba6b9de 100644 --- a/gnu/usr.bin/groff/src/preproc/html/Makefile +++ b/gnu/usr.bin/groff/src/preproc/html/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/html/Makefile,v 1.5 2003/05/01 13:22:20 ru Exp $ +DIST_SUBDIR= src/preproc/html + PROG_CXX= pre-grohtml SRCS= pre-html.cpp pushback.cpp -DPADD= ${LIBGROFF} -LDADD= ${LIBGROFF} +DPADD+= ${LIBGROFF} +LDADD+= ${LIBGROFF} NOMAN= YES .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile index d100f7490bf..50fea9cf411 100644 --- a/gnu/usr.bin/groff/src/preproc/pic/Makefile +++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile @@ -1,11 +1,13 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $ +DIST_SUBDIR= src/preproc/pic + PROG_CXX= pic 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 +DPADD+= ${LIBGROFF} ${LIBM} +LDADD+= ${LIBGROFF} -lm CLEANFILES= ${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h pic_tab.h: pic.cpp diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile index 5e76656ebfc..a0942b7dacc 100644 --- a/gnu/usr.bin/groff/src/preproc/refer/Makefile +++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile @@ -1,10 +1,12 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $ +DIST_SUBDIR= src/preproc/refer + PROG_CXX= refer SRCS= command.cpp label.cpp ref.cpp refer.cpp token.cpp CFLAGS+= -I${DIST_DIR} -DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} -LDADD= ${LIBBIB} ${LIBGROFF} -lm +DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBBIB} ${LIBGROFF} -lm 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 04999bc75a2..43cc3c41bbd 100644 --- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile +++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile,v 1.3 2003/05/01 13:22:20 ru Exp $ +DIST_SUBDIR= src/preproc/soelim + PROG_CXX= soelim SRCS= soelim.cpp -DPADD= ${LIBGROFF} -LDADD= ${LIBGROFF} +DPADD+= ${LIBGROFF} +LDADD+= ${LIBGROFF} CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile index bf25418acb1..03f1cedc0a5 100644 --- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile +++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $ +DIST_SUBDIR= src/preproc/tbl + PROG_CXX= tbl SRCS= main.cpp table.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD+= ${LIBGROFF} ${LIBM} +LDADD+= ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/roff/Makefile b/gnu/usr.bin/groff/src/roff/Makefile index e0ab68576eb..cc739ce0534 100644 --- a/gnu/usr.bin/groff/src/roff/Makefile +++ b/gnu/usr.bin/groff/src/roff/Makefile @@ -1,5 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $ -SUBDIR= groff grog nroff psroff troff +SUBDIR= groff grog nroff troff +# obsoleted in NetBSD: +#SUBDIR+= psroff .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/groff/src/roff/Makefile.inc b/gnu/usr.bin/groff/src/roff/Makefile.inc index a910a7134dc..c7643ca5094 100644 --- a/gnu/usr.bin/groff/src/roff/Makefile.inc +++ b/gnu/usr.bin/groff/src/roff/Makefile.inc @@ -1,6 +1,3 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.1 2001/04/17 12:37:12 ru Exp $ -TOPREL= ../../.. -DIST_SUBDIR= src/roff/${.CURDIR:T} - .include "../../Makefile.inc" diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile index f963934a934..dfbf37d91d8 100644 --- a/gnu/usr.bin/groff/src/roff/groff/Makefile +++ b/gnu/usr.bin/groff/src/roff/groff/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.7 2003/05/01 13:22:20 ru Exp $ +DIST_SUBDIR= src/roff/groff + PROG_CXX= groff SRCS= groff.cpp pipeline.c -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD+= ${LIBGROFF} ${LIBM} +LDADD+= ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/roff/grog/Makefile b/gnu/usr.bin/groff/src/roff/grog/Makefile index 09b3b90dcb3..b280b0409be 100644 --- a/gnu/usr.bin/groff/src/roff/grog/Makefile +++ b/gnu/usr.bin/groff/src/roff/grog/Makefile @@ -1,5 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/roff/grog/Makefile,v 1.1 2001/04/17 12:37:12 ru Exp $ +DIST_SUBDIR= src/roff/grog + SCRIPTS= grog MAN= grog.1 CLEANFILES= ${SCRIPTS} ${MAN} diff --git a/gnu/usr.bin/groff/src/roff/nroff/Makefile b/gnu/usr.bin/groff/src/roff/nroff/Makefile index be4631f42da..c8d1882382d 100644 --- a/gnu/usr.bin/groff/src/roff/nroff/Makefile +++ b/gnu/usr.bin/groff/src/roff/nroff/Makefile @@ -1,5 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/roff/nroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $ +DIST_SUBDIR= src/roff/nroff + SCRIPTS= nroff MAN= nroff.1 CLEANFILES= ${SCRIPTS} ${MAN} diff --git a/gnu/usr.bin/groff/src/roff/psroff/Makefile b/gnu/usr.bin/groff/src/roff/psroff/Makefile index 508f69c27ed..83487673713 100644 --- a/gnu/usr.bin/groff/src/roff/psroff/Makefile +++ b/gnu/usr.bin/groff/src/roff/psroff/Makefile @@ -1,5 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/roff/psroff/Makefile,v 1.1 2001/04/17 12:37:13 ru Exp $ +DIST_SUBDIR= src/roff/psroff + SCRIPTS= psroff.sh MAN= psroff.1 diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile index 74a38c7522d..ebc9e943af3 100644 --- a/gnu/usr.bin/groff/src/roff/troff/Makefile +++ b/gnu/usr.bin/groff/src/roff/troff/Makefile @@ -1,11 +1,13 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $ +DIST_SUBDIR= src/roff/troff + 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 -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD+= ${LIBGROFF} ${LIBM} +LDADD+= ${LIBGROFF} -lm CLEANFILES= majorminor.cpp ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/Makefile b/gnu/usr.bin/groff/src/utils/Makefile index 816a8025a52..fc3e393f0ef 100644 --- a/gnu/usr.bin/groff/src/utils/Makefile +++ b/gnu/usr.bin/groff/src/utils/Makefile @@ -1,5 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $ -SUBDIR= addftinfo afmtodit hpftodit indxbib lkbib lookbib pfbtops tfmtodit +SUBDIR= addftinfo hpftodit indxbib lkbib lookbib pfbtops tfmtodit +# Perl script +# SUBDIR+= afmtodit .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/groff/src/utils/Makefile.inc b/gnu/usr.bin/groff/src/utils/Makefile.inc index e11ee470423..71c84a267cf 100644 --- a/gnu/usr.bin/groff/src/utils/Makefile.inc +++ b/gnu/usr.bin/groff/src/utils/Makefile.inc @@ -1,6 +1,3 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile.inc,v 1.1 2001/04/17 12:37:15 ru Exp $ -TOPREL= ../../.. -DIST_SUBDIR= src/utils/${.CURDIR:T} - .include "../../Makefile.inc" diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile index 20476a39615..6033c836d16 100644 --- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile +++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $ +DIST_SUBDIR= src/utils/addftinfo + PROG_CXX= addftinfo SRCS= addftinfo.cpp guess.cpp -DPADD= ${LIBGROFF} -LDADD= ${LIBGROFF} +DPADD+= ${LIBGROFF} +LDADD+= ${LIBGROFF} CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile index ecc4c7b665d..8c4c6677569 100644 --- a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile @@ -1,5 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/afmtodit/Makefile,v 1.1 2001/04/17 12:37:15 ru Exp $ +DIST_SUBDIR= src/utils/afmtodit + SCRIPTS= afmtodit MAN= afmtodit.1 CLEANFILES= ${SCRIPTS} ${MAN} diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile index 28835bf75a2..1d39febd443 100644 --- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $ +DIST_SUBDIR= src/utils/hpftodit + PROG_CXX= hpftodit SRCS= hpftodit.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD+= ${LIBGROFF} ${LIBM} +LDADD+= ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile index 9cd0fb5a732..91612ce376e 100644 --- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile @@ -1,13 +1,21 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.7 2003/05/01 13:22:21 ru Exp $ +DIST_SUBDIR= src/utils/indxbib + PROG_CXX= indxbib SRCS= indxbib.cpp signal.c -DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} -LDADD= ${LIBBIB} ${LIBGROFF} -lm +DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} -beforeinstall: - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict/ +COMMON_WORDS_FILE!=awk -F\" '/COMMON_WORDS_FILE/ { print $$2 }' ${.CURDIR}/../../include/defs.h + +.include <bsd.own.mk> + +.if ${MKSHARE} != "no" +FILES=eign +FILESNAME=${COMMON_WORDS_FILE:T} +FILESDIR=${COMMON_WORDS_FILE:H} +.endif .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile index 3168aca0fc5..c02eb86817e 100644 --- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $ +DIST_SUBDIR= src/utils/lkbib + PROG_CXX= lkbib SRCS= lkbib.cpp -DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} -LDADD= ${LIBBIB} ${LIBGROFF} -lm +DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile index c7d50112fc4..ab2b9d1f3ed 100644 --- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $ +DIST_SUBDIR= src/utils/lookbib + PROG_CXX= lookbib SRCS= lookbib.cpp -DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM} -LDADD= ${LIBBIB} ${LIBGROFF} -lm +DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} +LDADD+= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile index c03a11eaff7..5fa905f0658 100644 --- a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile +++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile @@ -1,8 +1,10 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/pfbtops/Makefile,v 1.1 2001/04/17 12:37:17 ru Exp $ +DIST_SUBDIR= src/utils/pfbtops + PROG= pfbtops -DPADD= ${LIBGROFF} -LDADD= ${LIBGROFF} +DPADD+= ${LIBGROFF} +LDADD+= ${LIBGROFF} CLEANFILES= ${MAN} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile index d9cfdf26746..aff33287279 100644 --- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile +++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile @@ -1,9 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile,v 1.4 2003/05/01 13:22:21 ru Exp $ +DIST_SUBDIR= src/utils/tfmtodit + PROG_CXX= tfmtodit SRCS= tfmtodit.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD+= ${LIBGROFF} ${LIBM} +LDADD+= ${LIBGROFF} -lm CLEANFILES= ${MAN} .include <bsd.prog.mk> |
