summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/groff/src
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2006-10-09 08:32:53 +0000
committermrg <mrg@NetBSD.org>2006-10-09 08:32:53 +0000
commitd32c431bcc8b510c8dcfb03f080c1c948249ac2d (patch)
treeead017e94ba81773b882a1555665fa67960dae88 /gnu/usr.bin/groff/src
parentb55240a47344cf7f521e7aa6581d665e8b73da81 (diff)
- use PROG not PROG_CXX
- link with -lm -lsupc++ as discussed in the audit-trail for PR#26714, now fixed.
Diffstat (limited to 'gnu/usr.bin/groff/src')
-rw-r--r--gnu/usr.bin/groff/src/devices/grodvi/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/devices/grohtml/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/devices/grolbp/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/devices/grolj4/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/devices/grops/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/devices/grotty/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/preproc/eqn/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/preproc/grn/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/preproc/html/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/preproc/pic/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/preproc/refer/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/preproc/soelim/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/preproc/tbl/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/roff/groff/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/roff/troff/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/utils/addftinfo/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/utils/hpftodit/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/utils/indxbib/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/utils/lkbib/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/utils/lookbib/Makefile8
-rw-r--r--gnu/usr.bin/groff/src/utils/tfmtodit/Makefile8
21 files changed, 84 insertions, 84 deletions
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index 75ced4339b5..ae34229e765 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:53 mrg Exp $
# $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
+PROG= grodvi
SRCS= dvi.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
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 d71d8269113..92a4a4474c4 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2003/11/03 17:05:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/09 08:32:53 mrg Exp $
# $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
+PROG= post-grohtml
MAN= grohtml.1
SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.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 c3d4a8711e8..df0d4ec0ee0 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= grolbp
SRCS= lbp.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
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 504b96a996d..bba929eae61 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 15:04:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= grolj4
SRCS= lj4.cpp
MAN= grolj4.1 lj4_font.5
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
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 c901cf1e51d..36ed923febf 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= grops
SRCS= ps.cpp psrm.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
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 4c814ee005e..f9ea1869297 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= grotty
SRCS= tty.cpp
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
index 8aeb82eed81..fff1f2cbea2 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.7 2003/10/20 00:54:37 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= eqn
SRCS= 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
GROFFYSRCS= eqn.y
CFLAGS+= -I${DIST_DIR} -I.
-DPADD+= ${LIBGROFF}
-LDADD+= ${LIBGROFF}
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
SCRIPTS= neqn
MAN= eqn.1 neqn.1
CLEANFILES= ${SCRIPTS} ${MAN}
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index d2bb4386822..f070f56886c 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:51 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= grn
SRCS= hdb.cpp hpoint.cpp hgraph.cpp main.cpp
-DPADD+= ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBGROFF} -lm
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
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 6211fb25ea8..a9495effb2f 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:51 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= pre-grohtml
SRCS= pre-html.cpp pushback.cpp
-DPADD+= ${LIBGROFF}
-LDADD+= ${LIBGROFF}
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
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 6ffdf712e9d..aabff3bb485 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2003/10/20 00:54:37 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= pic
SRCS= lex.cpp main.cpp object.cpp \
common.cpp troff.cpp tex.cpp
GROFFYSRCS= pic.y
CFLAGS+= -I${DIST_DIR} -I.
-DPADD+= ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBGROFF} -lm
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index b3f87c70a39..74650293ab6 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2003/10/20 00:54:37 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= refer
SRCS= command.cpp ref.cpp refer.cpp token.cpp
GROFFYSRCS= label.y
CFLAGS+= -I${DIST_DIR}
-DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBBIB} ${LIBGROFF} -lm
+DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBBIB} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.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 c17a46f8534..3f8ce7da73e 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= soelim
SRCS= soelim.cpp
-DPADD+= ${LIBGROFF}
-LDADD+= ${LIBGROFF}
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
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 fa5b576fa95..f61febf8506 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= tbl
SRCS= main.cpp table.cpp
-DPADD+= ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBGROFF} -lm
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index 94081045663..34d97daba21 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= groff
SRCS= groff.cpp pipeline.c
-DPADD+= ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBGROFF} -lm
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 6e256b7a6fe..34403dfb185 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2006/02/06 18:29:48 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= troff
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
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= majorminor.cpp ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
index ddb8058433a..279d1d1472c 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= addftinfo
SRCS= addftinfo.cpp guess.cpp
-DPADD+= ${LIBGROFF}
-LDADD+= ${LIBGROFF}
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
index 74aca9eb55b..1491e612e84 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 15:04:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= hpftodit
SRCS= hpftodit.cpp hpuni.cpp
-DPADD+= ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBGROFF} -lm
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
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 25a90c82a9a..396fdc0271e 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= indxbib
SRCS= indxbib.cpp signal.c
-DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBBIB} ${LIBGROFF} -lm
+DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBBIB} ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
COMMON_WORDS_FILE!=awk -F\" '/COMMON_WORDS_FILE/ { print $$2 }' ${.CURDIR}/../../include/defs.h
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index 204b76dce5e..1804c8c4609 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:54 mrg Exp $
# $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
+PROG= lkbib
SRCS= lkbib.cpp
-DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBBIB} ${LIBGROFF} -lm
+DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBBIB} ${LIBGROFF} -lm -lsupc++
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 fe196453e6c..b15fd3b41ef 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:55 mrg Exp $
# $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
+PROG= lookbib
SRCS= lookbib.cpp
-DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBBIB} ${LIBGROFF} -lm
+DPADD+= ${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBBIB} ${LIBGROFF} -lm -lsupc++
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 05000e3a17f..bffd2b969a2 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/06/30 18:47:57 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/09 08:32:55 mrg Exp $
# $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
+PROG= tfmtodit
SRCS= tfmtodit.cpp
-DPADD+= ${LIBGROFF} ${LIBM}
-LDADD+= ${LIBGROFF} -lm
+DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
+LDADD+= ${LIBGROFF} -lm -lsupc++
CLEANFILES= ${MAN}
.include <bsd.prog.mk>