6 files changed, 18 insertions, 18 deletions

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>