21 files changed, 21 insertions, 22 deletions

diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index 771bc1e85427..9912a028abcb 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		grodvi
+PROG_CXX=	grodvi
 SRCS=		dvi.cc
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
index 6b67f9811266..01b1aa18cf5f 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		post-grohtml
+PROG_CXX=	post-grohtml
 SRCS=		post-html.cc html-text.cc output.cc
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
index 304e3adfe4dc..64bcbad5d480 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		grolbp
+PROG_CXX=	grolbp
 SRCS=		lbp.cc
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
index 52a43f87b319..13027f0e8da8 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		grolj4
+PROG_CXX=	grolj4
 SRCS=		lj4.cc
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile
index 3e8c2557956a..479898e4c6c5 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		grops
+PROG_CXX=	grops
 SRCS=		ps.cc psrm.cc
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile
index 1c4fd81b1269..15728bbee1ee 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		grotty
+PROG_CXX=	grotty
 SRCS=		tty.cc
 DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
index 217c3056b18f..fdae39f93eef 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile
@@ -1,6 +1,6 @@
 # $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
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index 8192e8df7af8..2360254a92ea 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		grn
+PROG_CXX=	grn
 SRCS=		hdb.cc hpoint.cc hgraph.cc main.cc
 DPADD=	 	${LIBGROFF} ${LIBM}
 LDADD=	 	${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile
index 0cf0783556b5..266740529d8f 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		pre-grohtml
+PROG_CXX=	pre-grohtml
 SRCS=		pre-html.cc pushbackbuffer.cc
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile
index 36a3b7e06ac5..389016c9ed09 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -1,6 +1,6 @@
 # $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.
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index ac3799bcbc3b..0fc9f30580da 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -1,6 +1,6 @@
 # $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}
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
index 662a67887880..443d066a4ac7 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
-PROG=		soelim
-SRCS=		soelim.cc
+PROG_CXX=	soelim
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
 CLEANFILES=	${MAN}
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
index d625af58466c..bc29521c4566 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		tbl
+PROG_CXX=	tbl
 SRCS=		main.cc table.cc
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index 97eb90413dcd..d057d50382be 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		groff
+PROG_CXX=	groff
 SRCS=		groff.cc pipeline.c
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 6ce2b9712e16..7b31e7d35f1c 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,6 +1,6 @@
 # $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}
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
index 44d2b62a89ac..164c7b3d94a1 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		addftinfo
+PROG_CXX=	addftinfo
 SRCS=		addftinfo.cc guess.cc
 DPADD=		${LIBGROFF}
 LDADD=		${LIBGROFF}
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
index 7d50e48153a1..f45bd17ebb00 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		hpftodit
+PROG_CXX=	hpftodit
 SRCS=		hpftodit.cc
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index 403bc142cfe2..3a5c786c3364 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		indxbib
+PROG_CXX=	indxbib
 SRCS=		indxbib.cc signal.c
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index 7d59bf0e1f83..d588dfa27676 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		lkbib
+PROG_CXX=	lkbib
 SRCS=		lkbib.cc
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
index 50fb79687cd7..525a66e692dc 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		lookbib
+PROG_CXX=	lookbib
 SRCS=		lookbib.cc
 DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
 LDADD=		${LIBBIB} ${LIBGROFF} -lm
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
index 34788714e89f..cc8333d0f6a2 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		tfmtodit
+PROG_CXX=	tfmtodit
 SRCS=		tfmtodit.cc
 DPADD=		${LIBGROFF} ${LIBM}
 LDADD=		${LIBGROFF} -lm