Module Name: src
Committed By: joerg
Date: Fri Aug 10 12:12:22 UTC 2012
Modified Files:
src/gnu/usr.bin/groff: Makefile.inc
src/gnu/usr.bin/groff/src/devices: Makefile.inc
src/gnu/usr.bin/groff/src/devices/grodvi: Makefile
src/gnu/usr.bin/groff/src/devices/grohtml: Makefile
src/gnu/usr.bin/groff/src/devices/grolbp: Makefile
src/gnu/usr.bin/groff/src/devices/grolj4: Makefile
src/gnu/usr.bin/groff/src/devices/grops: Makefile
src/gnu/usr.bin/groff/src/devices/grotty: Makefile
src/gnu/usr.bin/groff/src/preproc: Makefile.inc
src/gnu/usr.bin/groff/src/preproc/eqn: Makefile
src/gnu/usr.bin/groff/src/preproc/grn: Makefile
src/gnu/usr.bin/groff/src/preproc/html: Makefile
src/gnu/usr.bin/groff/src/preproc/pic: Makefile
src/gnu/usr.bin/groff/src/preproc/refer: Makefile
src/gnu/usr.bin/groff/src/preproc/soelim: Makefile
src/gnu/usr.bin/groff/src/preproc/tbl: Makefile
src/gnu/usr.bin/groff/src/roff: Makefile.inc
src/gnu/usr.bin/groff/src/roff/groff: Makefile
src/gnu/usr.bin/groff/src/roff/troff: Makefile
src/gnu/usr.bin/groff/src/utils: Makefile.inc
src/gnu/usr.bin/groff/src/utils/addftinfo: Makefile
src/gnu/usr.bin/groff/src/utils/hpftodit: Makefile
src/gnu/usr.bin/groff/src/utils/indxbib: Makefile
src/gnu/usr.bin/groff/src/utils/lkbib: Makefile
src/gnu/usr.bin/groff/src/utils/lookbib: Makefile
src/gnu/usr.bin/groff/src/utils/tfmtodit: Makefile
Log Message:
Don't link explicitly against libsupc++, just use the normal C++
linkage.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/gnu/usr.bin/groff/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/devices/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grodvi/Makefile
cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/groff/src/devices/grohtml/Makefile
cvs rdiff -u -r1.6 -r1.7 src/gnu/usr.bin/groff/src/devices/grolbp/Makefile
cvs rdiff -u -r1.6 -r1.7 src/gnu/usr.bin/groff/src/devices/grolj4/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grops/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grotty/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/preproc/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/gnu/usr.bin/groff/src/preproc/eqn/Makefile
cvs rdiff -u -r1.6 -r1.7 src/gnu/usr.bin/groff/src/preproc/grn/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/preproc/html/Makefile
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/groff/src/preproc/pic/Makefile
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/groff/src/preproc/refer/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/preproc/soelim/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/preproc/tbl/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/roff/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/roff/groff/Makefile
cvs rdiff -u -r1.12 -r1.13 src/gnu/usr.bin/groff/src/roff/troff/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/groff/src/utils/indxbib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/lkbib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/lookbib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/groff/Makefile.inc
diff -u src/gnu/usr.bin/groff/Makefile.inc:1.20 src/gnu/usr.bin/groff/Makefile.inc:1.21
--- src/gnu/usr.bin/groff/Makefile.inc:1.20 Thu May 26 12:56:29 2011
+++ src/gnu/usr.bin/groff/Makefile.inc Fri Aug 10 12:12:18 2012
@@ -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
Index: src/gnu/usr.bin/groff/src/devices/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.4 src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.5
--- src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.4 Thu Dec 16 22:54:18 2010
+++ src/gnu/usr.bin/groff/src/devices/Makefile.inc Fri Aug 10 12:12:18 2012
@@ -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"
Index: src/gnu/usr.bin/groff/src/devices/grodvi/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grodvi/Makefile:1.5 src/gnu/usr.bin/groff/src/devices/grodvi/Makefile:1.6
--- src/gnu/usr.bin/groff/src/devices/grodvi/Makefile:1.5 Thu Dec 16 22:54:18 2010
+++ src/gnu/usr.bin/groff/src/devices/grodvi/Makefile Fri Aug 10 12:12:19 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/devices/grohtml/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grohtml/Makefile:1.7 src/gnu/usr.bin/groff/src/devices/grohtml/Makefile:1.8
--- src/gnu/usr.bin/groff/src/devices/grohtml/Makefile:1.7 Thu May 26 12:56:29 2011
+++ src/gnu/usr.bin/groff/src/devices/grohtml/Makefile Fri Aug 10 12:12:19 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/devices/grolbp/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grolbp/Makefile:1.6 src/gnu/usr.bin/groff/src/devices/grolbp/Makefile:1.7
--- src/gnu/usr.bin/groff/src/devices/grolbp/Makefile:1.6 Thu Dec 16 22:54:19 2010
+++ src/gnu/usr.bin/groff/src/devices/grolbp/Makefile Fri Aug 10 12:12:19 2012
@@ -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=
Index: src/gnu/usr.bin/groff/src/devices/grolj4/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grolj4/Makefile:1.6 src/gnu/usr.bin/groff/src/devices/grolj4/Makefile:1.7
--- src/gnu/usr.bin/groff/src/devices/grolj4/Makefile:1.6 Thu Dec 16 22:54:19 2010
+++ src/gnu/usr.bin/groff/src/devices/grolj4/Makefile Fri Aug 10 12:12:19 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/devices/grops/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grops/Makefile:1.5 src/gnu/usr.bin/groff/src/devices/grops/Makefile:1.6
--- src/gnu/usr.bin/groff/src/devices/grops/Makefile:1.5 Thu Dec 16 22:54:19 2010
+++ src/gnu/usr.bin/groff/src/devices/grops/Makefile Fri Aug 10 12:12:19 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/devices/grotty/Makefile
diff -u src/gnu/usr.bin/groff/src/devices/grotty/Makefile:1.5 src/gnu/usr.bin/groff/src/devices/grotty/Makefile:1.6
--- src/gnu/usr.bin/groff/src/devices/grotty/Makefile:1.5 Thu Dec 16 22:54:19 2010
+++ src/gnu/usr.bin/groff/src/devices/grotty/Makefile Fri Aug 10 12:12:19 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/preproc/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/preproc/Makefile.inc:1.4 src/gnu/usr.bin/groff/src/preproc/Makefile.inc:1.5
--- src/gnu/usr.bin/groff/src/preproc/Makefile.inc:1.4 Thu Dec 16 22:54:20 2010
+++ src/gnu/usr.bin/groff/src/preproc/Makefile.inc Fri Aug 10 12:12:19 2012
@@ -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"
Index: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/eqn/Makefile:1.9 src/gnu/usr.bin/groff/src/preproc/eqn/Makefile:1.10
--- src/gnu/usr.bin/groff/src/preproc/eqn/Makefile:1.9 Thu Dec 16 22:54:20 2010
+++ src/gnu/usr.bin/groff/src/preproc/eqn/Makefile Fri Aug 10 12:12:19 2012
@@ -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
Index: src/gnu/usr.bin/groff/src/preproc/grn/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/grn/Makefile:1.6 src/gnu/usr.bin/groff/src/preproc/grn/Makefile:1.7
--- src/gnu/usr.bin/groff/src/preproc/grn/Makefile:1.6 Thu Dec 16 22:54:20 2010
+++ src/gnu/usr.bin/groff/src/preproc/grn/Makefile Fri Aug 10 12:12:20 2012
@@ -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=
Index: src/gnu/usr.bin/groff/src/preproc/html/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/html/Makefile:1.5 src/gnu/usr.bin/groff/src/preproc/html/Makefile:1.6
--- src/gnu/usr.bin/groff/src/preproc/html/Makefile:1.5 Thu Dec 16 22:54:20 2010
+++ src/gnu/usr.bin/groff/src/preproc/html/Makefile Fri Aug 10 12:12:20 2012
@@ -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
Index: src/gnu/usr.bin/groff/src/preproc/pic/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/pic/Makefile:1.10 src/gnu/usr.bin/groff/src/preproc/pic/Makefile:1.11
--- src/gnu/usr.bin/groff/src/preproc/pic/Makefile:1.10 Thu Dec 16 22:54:20 2010
+++ src/gnu/usr.bin/groff/src/preproc/pic/Makefile Fri Aug 10 12:12:20 2012
@@ -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
Index: src/gnu/usr.bin/groff/src/preproc/refer/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/refer/Makefile:1.10 src/gnu/usr.bin/groff/src/preproc/refer/Makefile:1.11
--- src/gnu/usr.bin/groff/src/preproc/refer/Makefile:1.10 Thu Dec 16 22:54:21 2010
+++ src/gnu/usr.bin/groff/src/preproc/refer/Makefile Fri Aug 10 12:12:20 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/preproc/soelim/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/soelim/Makefile:1.5 src/gnu/usr.bin/groff/src/preproc/soelim/Makefile:1.6
--- src/gnu/usr.bin/groff/src/preproc/soelim/Makefile:1.5 Thu Dec 16 22:54:21 2010
+++ src/gnu/usr.bin/groff/src/preproc/soelim/Makefile Fri Aug 10 12:12:20 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/preproc/tbl/Makefile
diff -u src/gnu/usr.bin/groff/src/preproc/tbl/Makefile:1.5 src/gnu/usr.bin/groff/src/preproc/tbl/Makefile:1.6
--- src/gnu/usr.bin/groff/src/preproc/tbl/Makefile:1.5 Thu Dec 16 22:54:21 2010
+++ src/gnu/usr.bin/groff/src/preproc/tbl/Makefile Fri Aug 10 12:12:20 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/roff/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/roff/Makefile.inc:1.4 src/gnu/usr.bin/groff/src/roff/Makefile.inc:1.5
--- src/gnu/usr.bin/groff/src/roff/Makefile.inc:1.4 Thu Dec 16 22:54:21 2010
+++ src/gnu/usr.bin/groff/src/roff/Makefile.inc Fri Aug 10 12:12:21 2012
@@ -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"
Index: src/gnu/usr.bin/groff/src/roff/groff/Makefile
diff -u src/gnu/usr.bin/groff/src/roff/groff/Makefile:1.5 src/gnu/usr.bin/groff/src/roff/groff/Makefile:1.6
--- src/gnu/usr.bin/groff/src/roff/groff/Makefile:1.5 Thu Dec 16 22:54:21 2010
+++ src/gnu/usr.bin/groff/src/roff/groff/Makefile Fri Aug 10 12:12:21 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/roff/troff/Makefile
diff -u src/gnu/usr.bin/groff/src/roff/troff/Makefile:1.12 src/gnu/usr.bin/groff/src/roff/troff/Makefile:1.13
--- src/gnu/usr.bin/groff/src/roff/troff/Makefile:1.12 Thu May 26 12:56:29 2011
+++ src/gnu/usr.bin/groff/src/roff/troff/Makefile Fri Aug 10 12:12:21 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/utils/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/utils/Makefile.inc:1.4 src/gnu/usr.bin/groff/src/utils/Makefile.inc:1.5
--- src/gnu/usr.bin/groff/src/utils/Makefile.inc:1.4 Thu Dec 16 22:54:22 2010
+++ src/gnu/usr.bin/groff/src/utils/Makefile.inc Fri Aug 10 12:12:21 2012
@@ -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"
Index: src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile:1.5 src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile:1.6
--- src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile:1.5 Thu Dec 16 22:54:22 2010
+++ src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile Fri Aug 10 12:12:21 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile:1.7 src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile:1.8
--- src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile:1.7 Thu May 26 12:56:29 2011
+++ src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile Fri Aug 10 12:12:21 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/indxbib/Makefile:1.7 src/gnu/usr.bin/groff/src/utils/indxbib/Makefile:1.8
--- src/gnu/usr.bin/groff/src/utils/indxbib/Makefile:1.7 Thu Dec 16 22:54:22 2010
+++ src/gnu/usr.bin/groff/src/utils/indxbib/Makefile Fri Aug 10 12:12:22 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/utils/lkbib/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/lkbib/Makefile:1.5 src/gnu/usr.bin/groff/src/utils/lkbib/Makefile:1.6
--- src/gnu/usr.bin/groff/src/utils/lkbib/Makefile:1.5 Thu Dec 16 22:54:22 2010
+++ src/gnu/usr.bin/groff/src/utils/lkbib/Makefile Fri Aug 10 12:12:22 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/utils/lookbib/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/lookbib/Makefile:1.5 src/gnu/usr.bin/groff/src/utils/lookbib/Makefile:1.6
--- src/gnu/usr.bin/groff/src/utils/lookbib/Makefile:1.5 Thu Dec 16 22:54:23 2010
+++ src/gnu/usr.bin/groff/src/utils/lookbib/Makefile Fri Aug 10 12:12:22 2012
@@ -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}
Index: src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
diff -u src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile:1.5 src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile:1.6
--- src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile:1.5 Thu Dec 16 22:54:23 2010
+++ src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile Fri Aug 10 12:12:22 2012
@@ -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}
