summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2003-06-30 18:40:50 +0000
committerwiz <wiz@NetBSD.org>2003-06-30 18:40:50 +0000
commitbf7bd150bbfa358634a702be2293a7244d6459a3 (patch)
treeb088816c60913f9f00024d65d26d9beddef45b4a /gnu/usr.bin
parent97a4aa1713e7d35aa2bd636515f58e295d2c2b17 (diff)
Make groff-1.19 build on NetBSD.
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/groff/Makefile.inc25
-rw-r--r--gnu/usr.bin/groff/contrib/Makefile.inc3
-rw-r--r--gnu/usr.bin/groff/contrib/mm/Makefile19
-rw-r--r--gnu/usr.bin/groff/font/Makefile.dev3
-rw-r--r--gnu/usr.bin/groff/font/Makefile.inc3
-rw-r--r--gnu/usr.bin/groff/font/Makefile.tty2
-rw-r--r--gnu/usr.bin/groff/font/devX100-12/Makefile3
-rw-r--r--gnu/usr.bin/groff/font/devX100/Makefile3
-rw-r--r--gnu/usr.bin/groff/font/devX75-12/Makefile3
-rw-r--r--gnu/usr.bin/groff/font/devX75/Makefile3
-rw-r--r--gnu/usr.bin/groff/font/devascii/Makefile2
-rw-r--r--gnu/usr.bin/groff/font/devcp1047/Makefile2
-rw-r--r--gnu/usr.bin/groff/font/devdvi/Makefile2
-rw-r--r--gnu/usr.bin/groff/font/devhtml/Makefile2
-rw-r--r--gnu/usr.bin/groff/font/devkoi8-r/Makefile2
-rw-r--r--gnu/usr.bin/groff/font/devlatin1/Makefile2
-rw-r--r--gnu/usr.bin/groff/font/devlbp/Makefile2
-rw-r--r--gnu/usr.bin/groff/font/devlj4/Makefile2
-rw-r--r--gnu/usr.bin/groff/font/devps/Makefile2
-rw-r--r--gnu/usr.bin/groff/font/devutf8/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/devices/Makefile.inc3
-rw-r--r--gnu/usr.bin/groff/src/devices/grodvi/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/devices/grohtml/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/devices/grolbp/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/devices/grolj4/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/devices/grops/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/devices/grotty/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/include/config.h16
-rw-r--r--gnu/usr.bin/groff/src/libs/Makefile.inc3
-rw-r--r--gnu/usr.bin/groff/src/libs/libbib/Makefile10
-rw-r--r--gnu/usr.bin/groff/src/libs/libdriver/Makefile10
-rw-r--r--gnu/usr.bin/groff/src/libs/libgroff/Makefile10
-rw-r--r--gnu/usr.bin/groff/src/preproc/Makefile.inc3
-rw-r--r--gnu/usr.bin/groff/src/preproc/eqn/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/preproc/grn/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/preproc/html/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/preproc/pic/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/preproc/refer/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/preproc/soelim/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/preproc/tbl/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/roff/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/roff/Makefile.inc3
-rw-r--r--gnu/usr.bin/groff/src/roff/groff/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/roff/grog/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/roff/nroff/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/roff/psroff/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/roff/troff/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/utils/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/Makefile.inc3
-rw-r--r--gnu/usr.bin/groff/src/utils/addftinfo/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/utils/afmtodit/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/utils/hpftodit/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/utils/indxbib/Makefile18
-rw-r--r--gnu/usr.bin/groff/src/utils/lkbib/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/utils/lookbib/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/utils/pfbtops/Makefile6
-rw-r--r--gnu/usr.bin/groff/src/utils/tfmtodit/Makefile6
-rw-r--r--gnu/usr.bin/groff/tmac/Makefile46
-rw-r--r--gnu/usr.bin/groff/tmac/mdoc.local195
59 files changed, 376 insertions, 173 deletions
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index 073b3311f15..490286142bf 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -2,6 +2,7 @@
BINDIR?= /usr/bin
SHELL= /bin/sh
+ECHO= echo
# 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
@@ -65,19 +66,20 @@ indexname=Ind
########################################################################
# Libraries
-# Bad assumption, if one exists they all exist
-.if exists(${.OBJDIR}/${TOPREL}/src/libs/libgroff)
-LIBGROFF= ${.OBJDIR}/${TOPREL}/src/libs/libgroff/libgroff.a
-LIBDRIVER= ${.OBJDIR}/${TOPREL}/src/libs/libdriver/libdriver.a
-LIBBIB= ${.OBJDIR}/${TOPREL}/src/libs/libbib/libbib.a
-.else
-LIBGROFF= ${.CURDIR}/${TOPREL}/src/libs/libgroff/libgroff.a
-LIBDRIVER= ${.CURDIR}/${TOPREL}/src/libs/libdriver/libdriver.a
-LIBBIB= ${.CURDIR}/${TOPREL}/src/libs/libbib/libbib.a
+.include <bsd.own.mk>
+
+.ifndef LIBGROFF
+LIBGROFFDIR!=cd ${NETBSDSRCDIR}/gnu/usr.bin/groff/src/libs/libgroff && ${PRINTOBJDIR}
+LIBDRIVERDIR!=cd ${NETBSDSRCDIR}/gnu/usr.bin/groff/src/libs/libdriver && ${PRINTOBJDIR}
+LIBBIBDIR!=cd ${NETBSDSRCDIR}/gnu/usr.bin/groff/src/libs/libbib && ${PRINTOBJDIR}
+
+LIBGROFF= ${LIBGROFFDIR}/libgroff.a
+LIBDRIVER= ${LIBDRIVERDIR}/libdriver.a
+LIBBIB= ${LIBBIBDIR}/libbib.a
.endif
CFLAGS+= -DHAVE_CONFIG_H
-CFLAGS+= -I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include
+CFLAGS+= -I${GROFF_DIST}/src/include -I${NETBSDSRCDIR}/gnu/usr.bin/groff/src/include
CXXFLAGS+= -fno-rtti -fno-exceptions
.y.o:
@@ -139,8 +141,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION`
-e "s|@g@|$(g)|g" \
${.IMPSRC} >${.TARGET}
-TOPREL?= ..
-GROFF_DIST= ${.CURDIR}/${TOPREL}/../../../contrib/groff
+GROFF_DIST= ${NETBSDSRCDIR}/gnu/dist/groff
DIST_SUBDIR?= ${.CURDIR:T}
DIST_DIR= ${GROFF_DIST}/${DIST_SUBDIR}
.PATH: ${DIST_DIR}
diff --git a/gnu/usr.bin/groff/contrib/Makefile.inc b/gnu/usr.bin/groff/contrib/Makefile.inc
index 3c30d5c661a..fe0b535b936 100644
--- a/gnu/usr.bin/groff/contrib/Makefile.inc
+++ b/gnu/usr.bin/groff/contrib/Makefile.inc
@@ -1,6 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/groff/contrib/Makefile.inc,v 1.1 2001/04/17 12:36:32 ru Exp $
-DIST_SUBDIR= contrib/${.CURDIR:T}
-TOPREL= ../..
+#DIST_SUBDIR= contrib
.include "../Makefile.inc"
diff --git a/gnu/usr.bin/groff/contrib/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile
index 428e18d2f0d..c411e560c22 100644
--- a/gnu/usr.bin/groff/contrib/mm/Makefile
+++ b/gnu/usr.bin/groff/contrib/mm/Makefile
@@ -1,13 +1,20 @@
# $FreeBSD: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.6 2002/10/11 08:58:13 ru Exp $
-SCRIPTS= mmroff.pl
-MAN= mmroff.1
+DIST_SUBDIR= contrib/mm
-TMACDIR?= ${SHAREDIR}/tmac
+# Perl script
+#SCRIPTS= mmroff.pl
+#MAN= mmroff.1
+
+#TMACDIR?= ${SHAREDIR}/tmac
+# sync with ../../src/include/config.h
+TMACDIR?= /usr/share/tmac
FILES= m.tmac mm.tmac mse.tmac mmse.tmac
-FILESDIR_m.tmac=${TMACDIR}
-FILESDIR_mse.tmac=${TMACDIR}
+FILESNAME_m.tmac=../m.tmac
+FILESNAME_mse.tmac=../mse.tmac
+FILESNAME_mm.tmac=../mm.tmac
+FILESNAME_mmse.tmac=../mmse.tmac
FILES+= 0.MT 5.MT 4.MT ms.cov se_ms.cov
FILESDIR= ${TMACDIR}/mm
LOCALE= locale se_locale
@@ -15,7 +22,7 @@ LOCALE= locale se_locale
MAN+= groff_mm.7 groff_mmse.7
MLINKS= groff_mm.7 mm.7 groff_mmse.7 mmse.7
-CLEANFILES+= ${MAN}
+#CLEANFILES+= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index a62a4091ff7..0ad90ae6621 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -8,4 +8,7 @@ SCRIPTSDIR?= ${fontdir}/dev${DEV}
SCRIPTSNAME_${script:T}= ${script:T}
.endfor
+all: $(DEVFILES) $(DEVSCRIPTS)
+install: $(DEVFILES) $(DEVSCRIPTS)
+
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.inc b/gnu/usr.bin/groff/font/Makefile.inc
index c917736c937..837f97bb2e4 100644
--- a/gnu/usr.bin/groff/font/Makefile.inc
+++ b/gnu/usr.bin/groff/font/Makefile.inc
@@ -1,6 +1,3 @@
# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.inc,v 2.1 2001/04/17 12:36:42 ru Exp $
-DIST_SUBDIR= font/${.CURDIR:T}
-TOPREL= ../..
-
.include "../Makefile.inc"
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
index b73da83dc86..69765bf6bc5 100644
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -1,5 +1,7 @@
# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.7 2001/04/17 12:36:42 ru Exp $
+all: ${FONTS}
+
FONTS?=R I B BI S L CW
DEVFILES=$(FONTS) DESC
CLEANFILES=$(DEVFILES)
diff --git a/gnu/usr.bin/groff/font/devX100-12/Makefile b/gnu/usr.bin/groff/font/devX100-12/Makefile
index 682c3320f11..fc95cdb408d 100644
--- a/gnu/usr.bin/groff/font/devX100-12/Makefile
+++ b/gnu/usr.bin/groff/font/devX100-12/Makefile
@@ -3,5 +3,8 @@
NOOBJ=
.include "../Makefile.inc"
+
+DIST_SUBDIR= font/devX100-12
+
.include "${DIST_DIR}/Makefile.sub"
.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devX100/Makefile b/gnu/usr.bin/groff/font/devX100/Makefile
index 36c44099efe..1bc845b561b 100644
--- a/gnu/usr.bin/groff/font/devX100/Makefile
+++ b/gnu/usr.bin/groff/font/devX100/Makefile
@@ -3,5 +3,8 @@
NOOBJ=
.include "../Makefile.inc"
+
+DIST_SUBDIR= font/devX100
+
.include "${DIST_DIR}/Makefile.sub"
.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devX75-12/Makefile b/gnu/usr.bin/groff/font/devX75-12/Makefile
index 66013e55b13..3ffbe8c8076 100644
--- a/gnu/usr.bin/groff/font/devX75-12/Makefile
+++ b/gnu/usr.bin/groff/font/devX75-12/Makefile
@@ -3,5 +3,8 @@
NOOBJ=
.include "../Makefile.inc"
+
+DIST_SUBDIR= font/devX75-12
+
.include "${DIST_DIR}/Makefile.sub"
.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devX75/Makefile b/gnu/usr.bin/groff/font/devX75/Makefile
index 947474f8061..be4ef445a67 100644
--- a/gnu/usr.bin/groff/font/devX75/Makefile
+++ b/gnu/usr.bin/groff/font/devX75/Makefile
@@ -3,5 +3,8 @@
NOOBJ=
.include "../Makefile.inc"
+
+DIST_SUBDIR= font/devX75
+
.include "${DIST_DIR}/Makefile.sub"
.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devascii/Makefile b/gnu/usr.bin/groff/font/devascii/Makefile
index 462f2d03aed..4331d533888 100644
--- a/gnu/usr.bin/groff/font/devascii/Makefile
+++ b/gnu/usr.bin/groff/font/devascii/Makefile
@@ -2,5 +2,7 @@
DEV= ascii
+DIST_SUBDIR= font/devascii
+
.include "../Makefile.tty"
.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devcp1047/Makefile b/gnu/usr.bin/groff/font/devcp1047/Makefile
index a3eaa06396d..ba292abf9dc 100644
--- a/gnu/usr.bin/groff/font/devcp1047/Makefile
+++ b/gnu/usr.bin/groff/font/devcp1047/Makefile
@@ -2,5 +2,7 @@
DEV= cp1047
+DIST_SUBDIR= font/devcp1047
+
.include "../Makefile.tty"
.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devdvi/Makefile b/gnu/usr.bin/groff/font/devdvi/Makefile
index 8d276e55e74..9e9b60a0443 100644
--- a/gnu/usr.bin/groff/font/devdvi/Makefile
+++ b/gnu/usr.bin/groff/font/devdvi/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD: src/gnu/usr.bin/groff/font/devdvi/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $
+DIST_SUBDIR= font/devdvi
+
DEV= dvi
DEVFILES= DESC \
TR TI TB TBI CW CWI HR HI HB HBI \
diff --git a/gnu/usr.bin/groff/font/devhtml/Makefile b/gnu/usr.bin/groff/font/devhtml/Makefile
index 8659c9982ad..28094560cfb 100644
--- a/gnu/usr.bin/groff/font/devhtml/Makefile
+++ b/gnu/usr.bin/groff/font/devhtml/Makefile
@@ -3,5 +3,7 @@
DEV= html
FONTS= R I B BI CR CI CB CBI S
+DIST_SUBDIR= font/devhtml
+
.include "../Makefile.tty"
.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devkoi8-r/Makefile b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
index 24605ddc537..07c3881fb87 100644
--- a/gnu/usr.bin/groff/font/devkoi8-r/Makefile
+++ b/gnu/usr.bin/groff/font/devkoi8-r/Makefile
@@ -2,5 +2,7 @@
DEV= koi8-r
+DIST_SUBDIR= font/devkoi8-r
+
.include "../Makefile.tty"
.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/font/devlatin1/Makefile b/gnu/usr.bin/groff/font/devlatin1/Makefile
index f33a41b1919..a3586cf6ca8 100644
--- a/gnu/usr.bin/groff/font/devlatin1/Makefile
+++ b/gnu/usr.bin/groff/font/devlatin1/Makefile
@@ -2,5 +2,7 @@
DEV= latin1
+DIST_SUBDIR= font/devlatin1
+
.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 07d6a1e0522..001abd71fc8 100644
--- a/gnu/usr.bin/groff/font/devlbp/Makefile
+++ b/gnu/usr.bin/groff/font/devlbp/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD: src/gnu/usr.bin/groff/font/devlbp/Makefile,v 1.2 2002/10/11 08:58:13 ru Exp $
+DIST_SUBDIR= font/devlbp
+
DEV= lbp
LBPPRINT= ${PSPRINT}
DEVFILES= DESC HB HBI HI HR HNB HNBI HNI HNR \
diff --git a/gnu/usr.bin/groff/font/devlj4/Makefile b/gnu/usr.bin/groff/font/devlj4/Makefile
index 3691034f5c6..68f260c1938 100644
--- a/gnu/usr.bin/groff/font/devlj4/Makefile
+++ b/gnu/usr.bin/groff/font/devlj4/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD: src/gnu/usr.bin/groff/font/devlj4/Makefile,v 1.1 2001/04/17 12:36:48 ru Exp $
+DIST_SUBDIR= font/devlj4
+
DEV= lj4
LJ4RES= 600
LJ4PRINT= ${PSPRINT}
diff --git a/gnu/usr.bin/groff/font/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile
index f69a1629e7b..56d1fdcb305 100644
--- a/gnu/usr.bin/groff/font/devps/Makefile
+++ b/gnu/usr.bin/groff/font/devps/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD: src/gnu/usr.bin/groff/font/devps/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $
+DIST_SUBDIR= font/devps
+
DEV= ps
DISTFILES= text.enc download \
S ZD ZDR SS AB ABI AI AR BMB BMBI BMI BMR \
diff --git a/gnu/usr.bin/groff/font/devutf8/Makefile b/gnu/usr.bin/groff/font/devutf8/Makefile
index a6699b8cf5f..872dd0bb8af 100644
--- a/gnu/usr.bin/groff/font/devutf8/Makefile
+++ b/gnu/usr.bin/groff/font/devutf8/Makefile
@@ -2,5 +2,7 @@
DEV= utf8
+DIST_SUBDIR= font/devutf8
+
.include "../Makefile.tty"
.include "../Makefile.dev"
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>
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 917d946ac30..fb44b185333 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -3,7 +3,8 @@
TMACOWN?= ${BINOWN}
TMACGRP?= ${BINGRP}
TMACMODE?= ${NOBINMODE}
-TMACDIR?= ${SHAREDIR}/tmac
+# XXX: next depends on ../src/include/defs.h
+TMACDIR?= /usr/share/tmac
MDOCDIR?= ${TMACDIR}/mdoc
MAN= groff_ms.7 groff_man.7 groff_me.7 groff_mdoc.7
@@ -15,6 +16,7 @@ MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7
CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
+# XXX: hyphen.ru
NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \
me.tmac \
mdoc.tmac \
@@ -38,44 +40,56 @@ NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \
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
+STRIPFILES= e.tmac doc.tmac man.local 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/}
+.include <bsd.own.mk>
-.for f in ${MDOCFILES} ${STRIPFILES}
+.if ${MKSHARE} != "no"
+FILESDIR= ${TMACDIR}
+dependall: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
+install: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
+
+.for f in ${MDOCFILES}
+FILES+= $f-s
+FILESNAME_$f-s=mdoc/$f
+$f-s: $f
+ sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
+.endfor
+
+.for f in ${STRIPFILES}
+FILES+= $f-s
+FILESNAME_$f-s=$f
$f-s: $f
sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
.endfor
.for f in ${SPECIALFILES}
+FILES+= $f-s
+FILESNAME_$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" \
+ -e "s;@PNMTOPS_NOSETPAGE@;pnmtops -nosetpage;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} \
- hyphen.ru ${DESTDIR}${TMACDIR}
- cd ${.OBJDIR}
+FILES+= ${NORMALFILES}
+
+donotbeforeinstall:
.for f in ${STRIPFILES} ${SPECIALFILES}
- ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+ ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
$f-s ${DESTDIR}${TMACDIR}/$f
.endfor
.for f in ${MDOCFILES}
- ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+ ${INSTALL} -c -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} \
+ ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
${DIST_DIR}/man.local ${DESTDIR}${TMACDIR}
.endif
+.endif
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index 65dd505e71b..0c9a716469c 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -1,6 +1,11 @@
-.\" Copyright (c) 2001 Ruslan Ermilov <ru@FreeBSD.org>.
+.\" $NetBSD: mdoc.local,v 1.2 2003/06/30 18:41:05 wiz Exp $
+.\"
+.\" Copyright (c) 2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Thomas Klausner.
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -9,62 +14,150 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by the NetBSD
+.\" Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
+.\" contributors may be used to endorse or promote products derived
+.\" from this software without specific prior written permission.
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.27 2003/06/09 10:40:17 ru Exp $
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.\" %beginstrip%
.
-.eo
+.\" NetBSD
+.ds volume-operating-system NetBSD
+.\" NetBSD section names
+.ds volume-ds-1 Reference Manual
+.ds volume-ds-2 System Calls Manual
+.ds volume-ds-3 Library Functions Manual
+.ds volume-ds-4 Kernel Interfaces Manual
+.ds volume-ds-5 File Formats Manual
+.ds volume-ds-6 Games Manual
+.ds volume-ds-7 Miscellaneous Information Manual
+.ds volume-ds-8 System Manager's Manual
+.ds volume-ds-9 Kernel Developer's Manual
.
+.\" NetBSD .Lb values
+.\".ds str-Lb-libarm32 ARM32 Architecture Library (libarm32, \-larm32)
+.ds str-Lb-libarm ARM Architecture Library (libarm, \-larm)
+.\".ds str-Lb-libc Standard C\~Library (libc, \-lc)
+.ds str-Lb-libcdk Curses Development Kit Library (libcdk, \-lcdk)
+.\".ds str-Lb-libcompat Compatibility Library (libcompat, \-lcompat)
+.\".ds str-Lb-libcrypt Crypt Library (libcrypt, \-lcrypt)
+.\".ds str-Lb-libcurses Curses Library (libcurses, \-lcurses)
+.\".ds str-Lb-libedit Command Line Editor Library (libedit, \-ledit)
+.ds str-Lb-libform Curses Form Library (libform, \-lform)
+.\".ds str-Lb-libi386 i386 Architecture Library (libi386, \-li386)
+.ds str-Lb-libintl Internationalized Message Handling Library (libintl, \-lintl)
+.\".ds str-Lb-libipsec IPsec Policy Control Library (libipsec, \-lipsec)
+.\".ds str-Lb-libkvm Kernel Data Access Library (libkvm, \-lkvm)
+.\".ds str-Lb-libm Math Library (libm, \-lm)
+.ds str-Lb-libm68k m68k Architecture Library (libm68k, \-lm68k)
+.ds str-Lb-libmagic Magic Number Recognition Library (libmagic, \-lmagic)
+.\".ds str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu)
+.\".ds str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio)
+.ds str-Lb-libpcap Packet Capture Library (libpcap, \-lpcap)
+.ds str-Lb-libpci PCI Bus Access Library (libpci, \-lpci)
+.ds str-Lb-libpmc Performance Counters Library (libpmc, \-lpmc)
+.\".ds str-Lb-libposix POSIX Compatibility Library (libposix, \-lposix)
+.ds str-Lb-libpthread POSIX Thread Library (libpthread, \-lpthread)
+.\".ds str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv)
+.ds str-Lb-librt POSIX Real-time Library (librt, \-lrt)
+.\".ds str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap)
+.ds str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid)
+.\".ds str-Lb-libutil System Utilities Library (libutil, \-lutil)
+.ds str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64)
+.\".ds str-Lb-libz Compression Library (libz, \-lz)
.
-.ds doc-volume-operating-system FreeBSD
+.\" architecture names where case diverges from groff
+.ds volume-as-alpha alpha
+.ds volume-as-amiga amiga
+.ds volume-as-arc arc
+.\" next two are dead...
+.\".ds volume-as-arm26 arm26
+.\".ds volume-as-arm32 arm32
+.ds volume-as-atari atari
+.ds volume-as-bebox bebox
+.ds volume-as-cobalt cobalt
+.ds volume-as-evbsh3 evbsh3
+.ds volume-as-hp300 hp300
+.ds volume-as-hpcmips hpcmips
+.ds volume-as-mips mips
+.ds volume-as-sparc sparc
+.ds volume-as-vax vax
+.\" not in groff
+.ds volume-as-acorn26 acorn26
+.ds volume-as-acorn32 acorn32
+.ds volume-as-algor algor
+.ds volume-as-amd64 amd64
+.ds volume-as-cats cats
+.ds volume-as-cesfic cesfic
+.ds volume-as-dreamcast dreamcast
+.ds volume-as-evbarm evbarm
+.ds volume-as-evbmips evbmips
+.ds volume-as-evbppc evbppc
+.ds volume-as-hp700 hp700
+.ds volume-as-hpcarm hpcarm
+.ds volume-as-hpcsh hpcsh
+.ds volume-as-mipsco mipsco
+.ds volume-as-mvmeppc mvmeppc
+.ds volume-as-netwinder netwinder
+.ds volume-as-playstation2 playstation2
+.ds volume-as-pmppc pmppc
+.ds volume-as-sandpoint sandpoint
+.ds volume-as-sbmips sbmips
+.ds volume-as-shark shark
+.ds volume-as-sun2 sun2
+.ds volume-as-x86_64 x86_64
.
-.\" FreeBSD .Lb values
-.ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r)
-.ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar)
-.ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam)
-.ds doc-str-Lb-libcipher FreeSec Crypt Library (libcipher, \-lcipher)
-.ds doc-str-Lb-libdevinfo Device and Resource Information Utility Library (libdevinfo, \-ldevinfo)
-.ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat)
-.ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk)
-.ds doc-str-Lb-libedit Line Editor and History Library (libedit, \-ledit)
-.ds doc-str-Lb-libfetch File Transfer Library (libfetch, \-lfetch)
-.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom)
-.ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx)
-.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd)
-.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph)
-.ds doc-str-Lb-libpam PAM Library (libpam, \-lpam)
-.ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc)
-.ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw)
-.ds doc-str-Lb-libusbhid USB HID access routines library (libusbhid, \-lusbhid)
-.ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl)
+.\" standards names diverging from groff
+.ds doc-str-St--isoC \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1990
+.as doc-str-St--isoC " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St]\*[Rq])
+.ds str-St--xcurses4.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Curses Issue\~4, Version\~2
+.as str-St--xcurses4.2 " (\*[Lq]\*[doc-Tn-font-size]XCURSES\*[doc-str-St]\^4.2\*[Rq])
+.ds str-St--xpg4.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4, Version\~2
+.as str-St--xpg4.2 " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4.2\*[Rq])
.
-.\" Default .Os value
-.ds doc-operating-system FreeBSD\~5.1
+.\" standards names not in groff
+.als str-St--isoC-90 str-St--isoC
+.ds str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995
+.as str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq])
+.ds str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994
+.as str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq])
+.ds str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995
+.as str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq])
+.ds str-St--xns5.2d2.0 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Networking Services Issue\~5.2 Draft\~2.0
+.as str-St--xns5.2d2.0 " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5.2D2.0\*[Rq])
+.ds str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994
+.as str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
+.\" for a short time only -- use -isoC-90 or -isoC
+.als str-St--isoC90 str-St--isoC
+.\" for a short time only -- use -isoC-99
+.als str-St--isoC99 str-St--isoC-99
.
-.\" FreeBSD releases not found in doc-common
-.ds doc-operating-system-FreeBSD-4.9 4.9
-.ds doc-operating-system-FreeBSD-5.1 5.1
-.ds doc-operating-system-FreeBSD-5.2 5.2
-.
-.ec
-.
-.\" Locale support
-.if d doc-locale \{\
-. ie "\*[doc-locale]"ru.KOI8-R" \
-. mso mdoc/ru.KOI8-R
-. el \{ .if "\*[doc-locale]"fr.ISO8859-1" \
-. mso mdoc/fr.ISO8859-1
-.\}\}
+.\" Default .Os value
+.ds operating-system NetBSD\~1.6
+.\" Other known versions, not yet in groff distribution
+.ds operating-system-NetBSD-1.4.2 1.4.2
+.ds operating-system-NetBSD-1.4.3 1.4.3
+.ds operating-system-NetBSD-1.5.1 1.5.1
+.ds operating-system-NetBSD-1.5.2 1.5.2
+.ds operating-system-NetBSD-1.5.3 1.5.3
+.ds operating-system-NetBSD-1.6.1 1.6.1
+.ds operating-system-NetBSD-2.0 2.0
+.ds str-At-V.3 \*[Tn-font-size]AT&T\*[str-At] System\~V.3
+.as str-At-V.3 " \*[Tn-font-size]UNIX\*[str-At]
+.\" For easier converting
+.nr hyphen-flags 1