diff --git a/gnu/usr.bin/gperf/Makefile b/gnu/usr.bin/gperf/Makefile
index 158d85d3a9b9..62432edff35e 100644
--- a/gnu/usr.bin/gperf/Makefile
+++ b/gnu/usr.bin/gperf/Makefile
@@ -6,7 +6,7 @@ GPROFDIR=	${.CURDIR}/../../../contrib/gperf
 
 SUBDIR=	doc
 
-PROG=	gperf
+PROG_GCC=	gperf
 SRCS=	bool-array.cc gen-perf.cc hash-table.cc iterator.cc key-list.cc \
 	list-node.cc main.cc new.cc options.cc read-line.cc trace.cc \
 	vectors.cc version.cc
@@ -14,7 +14,4 @@ SRCS+=	hash.cc getopt.c getopt1.c
 
 CXXFLAGS+=	-I${GPROFDIR}/lib -I${.CURDIR}
 
-DPADD+=	${LIBSTDCPLUSPLUS}
-LDADD+=	-lstdc++
-
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index a44334e02249..9912a028abcb 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		grodvi
+PROG_CXX=	grodvi
 SRCS=		dvi.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
+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 411a229c2de4..01b1aa18cf5f 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		post-grohtml
+PROG_CXX=	post-grohtml
 SRCS=		post-html.cc html-text.cc output.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
+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 376305a8e7ac..64bcbad5d480 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		grolbp
+PROG_CXX=	grolbp
 SRCS=		lbp.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
+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 1d923a312980..13027f0e8da8 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		grolj4
+PROG_CXX=	grolj4
 SRCS=		lj4.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
+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 23707b765ca0..479898e4c6c5 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		grops
+PROG_CXX=	grops
 SRCS=		ps.cc psrm.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
+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 f46c64f26e7f..15728bbee1ee 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		grotty
+PROG_CXX=	grotty
 SRCS=		tty.cc
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm -lstdc++
+DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
 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 e2895ab4490c..fdae39f93eef 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-PROG=		eqn
+PROG_CXX=	eqn
 SRCS=		eqn.cc eqn_tab.h main.cc lex.cc \
 		box.cc limit.cc list.cc over.cc text.cc \
 		script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
 CFLAGS+=	-I${DIST_DIR} -I.
-DPADD=		${LIBGROFF} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBGROFF} -lstdc++
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
 SCRIPTS=	neqn
 MAN=		eqn.1 neqn.1
 CLEANFILES=	eqn.cc 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 6bd1577bde37..2360254a92ea 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		grn
+PROG_CXX=	grn
 SRCS=		hdb.cc hpoint.cc hgraph.cc main.cc
-DPADD=	 	${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=	 	${LIBGROFF} -lm -lstdc++
+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 828a8d515659..266740529d8f 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		pre-grohtml
+PROG_CXX=	pre-grohtml
 SRCS=		pre-html.cc pushbackbuffer.cc
-DPADD=		${LIBGROFF} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBGROFF} -lstdc++
+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 3d420dd46c36..389016c9ed09 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-PROG=		pic
+PROG_CXX=	pic
 SRCS=		lex.cc main.cc object.cc pic.cc pic_tab.h \
 		common.cc troff.cc tex.cc
 CFLAGS+=	-I${DIST_DIR} -I.
-DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBGROFF} -lm -lstdc++
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
 CLEANFILES=	${MAN} pic.cc pic_tab.h y.tab.c y.tab.h
 
 pic_tab.h: pic.cc
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index 2c64462ba54e..0fc9f30580da 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PROG=		refer
+PROG_CXX=	refer
 SRCS=		command.cc label.cc ref.cc refer.cc token.cc
 CFLAGS+=	-I${DIST_DIR}
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm -lstdc++
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm
 CLEANFILES=	label.cc label_tab.h ${MAN} y.tab.c y.tab.h
 
 .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 35d725dd6a78..bc29521c4566 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		tbl
+PROG_CXX=	tbl
 SRCS=		main.cc table.cc
-DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBGROFF} -lm -lstdc++
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
 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 58fa439c06bc..d057d50382be 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		groff
+PROG_CXX=	groff
 SRCS=		groff.cc pipeline.c
-DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBGROFF} -lm -lstdc++
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
 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 37cd4b150120..7b31e7d35f1c 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PROG=		troff
+PROG_CXX=	troff
 SRCS=		env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
 		number.cc majorminor.cc
-DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBGROFF} -lm -lstdc++
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
 CLEANFILES=	majorminor.cc ${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 1debf3faffd3..164c7b3d94a1 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		addftinfo
+PROG_CXX=	addftinfo
 SRCS=		addftinfo.cc guess.cc
-DPADD=		${LIBGROFF} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBGROFF} -lstdc++
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
 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 2b7d9ac2363c..f45bd17ebb00 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		hpftodit
+PROG_CXX=	hpftodit
 SRCS=		hpftodit.cc
-DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBGROFF} -lm -lstdc++
+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 ba0fd18c0823..eae694a2f755 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		indxbib
+PROG_CXX=	indxbib
 SRCS=		indxbib.cc signal.c
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm -lstdc++
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm
 CLEANFILES=	${MAN}
 
 beforeinstall:
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index 18be042c835a..d588dfa27676 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		lkbib
+PROG_CXX=	lkbib
 SRCS=		lkbib.cc
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm -lstdc++
+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 7b010c56e79e..525a66e692dc 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		lookbib
+PROG_CXX=	lookbib
 SRCS=		lookbib.cc
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm -lstdc++
+DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
+LDADD=		${LIBBIB} ${LIBGROFF} -lm
 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 b242378b89a7..cc8333d0f6a2 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-PROG=		tfmtodit
+PROG_CXX=	tfmtodit
 SRCS=		tfmtodit.cc
-DPADD=		${LIBGROFF} ${LIBM} ${LIBSTDCPLUSPLUS}
-LDADD=		${LIBGROFF} -lm -lstdc++
+DPADD=		${LIBGROFF} ${LIBM}
+LDADD=		${LIBGROFF} -lm
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>