summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2012-08-10 12:12:18 +0000
committerjoerg <joerg@NetBSD.org>2012-08-10 12:12:18 +0000
commitd8db460c8ba24772ebc0283260a31bfc3e78d2cd (patch)
tree7a7592276961c6a890133fe1b569f6d1ff077a7e /gnu
parentb9fb049c8f708eb3c5e6377c28eb5358dd097fa2 (diff)
Don't link explicitly against libsupc++, just use the normal C++
linkage.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/groff/Makefile.inc5
-rw-r--r--gnu/usr.bin/groff/src/devices/Makefile.inc6
-rw-r--r--gnu/usr.bin/groff/src/devices/grodvi/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grohtml/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grolbp/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grolj4/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grops/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/devices/grotty/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/Makefile.inc6
-rw-r--r--gnu/usr.bin/groff/src/preproc/eqn/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/grn/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/html/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/pic/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/refer/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/soelim/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/preproc/tbl/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/roff/Makefile.inc6
-rw-r--r--gnu/usr.bin/groff/src/roff/groff/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/roff/troff/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/Makefile.inc6
-rw-r--r--gnu/usr.bin/groff/src/utils/addftinfo/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/hpftodit/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/indxbib/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/lkbib/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/lookbib/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/utils/tfmtodit/Makefile4
26 files changed, 55 insertions, 58 deletions
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index cb155df78ce..8ecd2503325 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2011/05/26 12:56:29 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.21 2012/08/10 12:12:18 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $
@@ -90,9 +90,6 @@ CFLAGS+= -DHAVE_CONFIG_H
CFLAGS+= -I${GROFF_DIST}/src/include -I${NETBSDSRCDIR}/gnu/usr.bin/groff/src/include
CXXFLAGS+= -fno-rtti -fno-exceptions
-# We only need -lsupc++
-USE_LIBSTDCXX= no
-
CWARNFLAGS.clang+= -Wno-unused-value
diff --git a/gnu/usr.bin/groff/src/devices/Makefile.inc b/gnu/usr.bin/groff/src/devices/Makefile.inc
index ba57bfcd442..714e2618e03 100644
--- a/gnu/usr.bin/groff/src/devices/Makefile.inc
+++ b/gnu/usr.bin/groff/src/devices/Makefile.inc
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:18 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2012/08/10 12:12:18 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/devices/Makefile.inc,v 1.1 2001/04/17 12:37:02 ru Exp $
-DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm -lsupc++
+DPADD+= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
+LDADD+= ${LIBDRIVER} ${LIBGROFF} -lm
.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index b99f29ff7a9..ce7466431a2 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:18 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:19 joerg 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= grodvi
+PROG_CXX= grodvi
SRCS= dvi.cpp
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
index 873622686a6..887a2f8b006 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2011/05/26 12:56:29 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2012/08/10 12:12:19 joerg 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= post-grohtml
+PROG_CXX= post-grohtml
MAN= grohtml.1
SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
index 16fda4d1d59..5341852ab1c 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2010/12/16 22:54:19 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2012/08/10 12:12:19 joerg 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= grolbp
+PROG_CXX= grolbp
SRCS= lbp.cpp
CLEANFILES= ${MAN}
USETBL=
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
index c62fe6d456c..57e78d243fe 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2010/12/16 22:54:19 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2012/08/10 12:12:19 joerg 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= grolj4
+PROG_CXX= grolj4
SRCS= lj4.cpp
MAN= grolj4.1 lj4_font.5
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile
index 795ec32e306..7ef9d883059 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:19 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:19 joerg 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= grops
+PROG_CXX= grops
SRCS= ps.cpp psrm.cpp
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile
index 973b605d1b8..b6952f3958b 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:19 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:19 joerg 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= grotty
+PROG_CXX= grotty
SRCS= tty.cpp
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile.inc b/gnu/usr.bin/groff/src/preproc/Makefile.inc
index e7c1a4c8651..8dccd9edaeb 100644
--- a/gnu/usr.bin/groff/src/preproc/Makefile.inc
+++ b/gnu/usr.bin/groff/src/preproc/Makefile.inc
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:20 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2012/08/10 12:12:19 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/Makefile.inc,v 1.1 2001/04/17 12:37:09 ru Exp $
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
+DPADD+= ${LIBGROFF} ${LIBM}
+LDADD+= ${LIBGROFF} -lm
.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
index 00882e6d38f..aec6c7e5a24 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2010/12/16 22:54:20 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2012/08/10 12:12:19 joerg 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= eqn
+PROG_CXX= 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
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index 579a1f2c398..2e9a16078cc 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2010/12/16 22:54:20 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2012/08/10 12:12:20 joerg 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= grn
+PROG_CXX= grn
SRCS= hdb.cpp hpoint.cpp hgraph.cpp main.cpp
CLEANFILES= ${MAN}
USETBL=
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile
index 2e15caa2292..be76c782674 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:20 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:20 joerg 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= pre-grohtml
+PROG_CXX= pre-grohtml
SRCS= pre-html.cpp pushback.cpp
NOMAN= YES
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile
index 8b762396033..d2c2a554ed3 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2010/12/16 22:54:20 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2012/08/10 12:12:20 joerg 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= pic
+PROG_CXX= pic
SRCS= lex.cpp main.cpp object.cpp \
common.cpp troff.cpp tex.cpp
GROFFYSRCS= pic.y
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index b8aa746ae0f..b2e76d46c5a 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2010/12/16 22:54:21 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2012/08/10 12:12:20 joerg 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= refer
+PROG_CXX= refer
SRCS= command.cpp ref.cpp refer.cpp token.cpp
GROFFYSRCS= label.y
CFLAGS+= -I${DIST_DIR}
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
index 229a6f185fb..abdb6c0db88 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:21 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:20 joerg 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= soelim
+PROG_CXX= soelim
SRCS= soelim.cpp
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
index 4a5b4a1a549..529b267a6ad 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:21 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:20 joerg 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= tbl
+PROG_CXX= tbl
SRCS= main.cpp table.cpp
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/roff/Makefile.inc b/gnu/usr.bin/groff/src/roff/Makefile.inc
index 4f05773d2b3..d19b12f57ea 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile.inc
+++ b/gnu/usr.bin/groff/src/roff/Makefile.inc
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:21 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2012/08/10 12:12:21 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/Makefile.inc,v 1.1 2001/04/17 12:37:12 ru Exp $
-DPADD+= ${LIBGROFF} ${LIBM} ${LIBSUPCXX}
-LDADD+= ${LIBGROFF} -lm -lsupc++
+DPADD+= ${LIBGROFF} ${LIBM}
+LDADD+= ${LIBGROFF} -lm
.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index dc59b3002b4..e03cdb8f6b5 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:21 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:21 joerg 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= groff
+PROG_CXX= groff
SRCS= groff.cpp pipeline.c
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 7f6a088de85..b460e6fc8fa 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2011/05/26 12:56:29 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2012/08/10 12:12:21 joerg 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= troff
+PROG_CXX= troff
SRCS= dictionary.cpp div.cpp env.cpp input.cpp \
majorminor.cpp mtsm.cpp node.cpp number.cpp reg.cpp
CLEANFILES= majorminor.cpp ${MAN}
diff --git a/gnu/usr.bin/groff/src/utils/Makefile.inc b/gnu/usr.bin/groff/src/utils/Makefile.inc
index 2482afad4ee..27025cf0a16 100644
--- a/gnu/usr.bin/groff/src/utils/Makefile.inc
+++ b/gnu/usr.bin/groff/src/utils/Makefile.inc
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:22 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2012/08/10 12:12:21 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/utils/Makefile.inc,v 1.1 2001/04/17 12:37:15 ru Exp $
DPADD+= ${LIBGROFF}
LDADD+= ${LIBGROFF}
.if ${LIBGROFF_ONLY:Uno} != "yes"
-DPADD+= ${LIBM} ${LIBSUPCXX}
-LDADD+= -lm -lsupc++
+DPADD+= ${LIBM}
+LDADD+= -lm
.endif
.include "../../Makefile.inc"
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
index b13928595d4..07c2c249746 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:22 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:21 joerg 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= addftinfo
+PROG_CXX= addftinfo
SRCS= addftinfo.cpp guess.cpp
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
index 9a2746475a5..2d6401f10b9 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2011/05/26 12:56:29 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2012/08/10 12:12:21 joerg 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= hpftodit
+PROG_CXX= hpftodit
SRCS= hpftodit.cpp hpuni.cpp
CLEANFILES= ${MAN}
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index 81a74aeceaf..41331e349e7 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2010/12/16 22:54:22 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2012/08/10 12:12:22 joerg 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= indxbib
+PROG_CXX= indxbib
SRCS= indxbib.cpp signal.c
DPADD+= ${LIBBIB}
LDADD+= ${LIBBIB}
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index cbfbf8491d1..a4602a6783e 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:22 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:22 joerg 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= lkbib
+PROG_CXX= lkbib
SRCS= lkbib.cpp
DPADD+= ${LIBBIB}
LDADD+= ${LIBBIB}
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
index d0176ca8c7e..4562d4c1c6c 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:23 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:22 joerg 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= lookbib
+PROG_CXX= lookbib
SRCS= lookbib.cpp
DPADD+= ${LIBBIB}
LDADD+= ${LIBBIB}
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
index e8c30bfe341..a59bdd3777f 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/12/16 22:54:23 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/10 12:12:22 joerg 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= tfmtodit
+PROG_CXX= tfmtodit
SRCS= tfmtodit.cpp
CLEANFILES= ${MAN}