[src/trunk]: src/gnu/usr.bin/groff Don't link explicitly against libsupc++, j...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0e5ae8f98f89
branches:  trunk
changeset: 780874:0e5ae8f98f89
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 10 12:12:18 2012 +0000

description:
Don't link explicitly against libsupc++, just use the normal C++
linkage.

diffstat:

 gnu/usr.bin/groff/Makefile.inc                 |  5 +----
 gnu/usr.bin/groff/src/devices/Makefile.inc     |  6 +++---
 gnu/usr.bin/groff/src/devices/grodvi/Makefile  |  4 ++--
 gnu/usr.bin/groff/src/devices/grohtml/Makefile |  4 ++--
 gnu/usr.bin/groff/src/devices/grolbp/Makefile  |  4 ++--
 gnu/usr.bin/groff/src/devices/grolj4/Makefile  |  4 ++--
 gnu/usr.bin/groff/src/devices/grops/Makefile   |  4 ++--
 gnu/usr.bin/groff/src/devices/grotty/Makefile  |  4 ++--
 gnu/usr.bin/groff/src/preproc/Makefile.inc     |  6 +++---
 gnu/usr.bin/groff/src/preproc/eqn/Makefile     |  4 ++--
 gnu/usr.bin/groff/src/preproc/grn/Makefile     |  4 ++--
 gnu/usr.bin/groff/src/preproc/html/Makefile    |  4 ++--
 gnu/usr.bin/groff/src/preproc/pic/Makefile     |  4 ++--
 gnu/usr.bin/groff/src/preproc/refer/Makefile   |  4 ++--
 gnu/usr.bin/groff/src/preproc/soelim/Makefile  |  4 ++--
 gnu/usr.bin/groff/src/preproc/tbl/Makefile     |  4 ++--
 gnu/usr.bin/groff/src/roff/Makefile.inc        |  6 +++---
 gnu/usr.bin/groff/src/roff/groff/Makefile      |  4 ++--
 gnu/usr.bin/groff/src/roff/troff/Makefile      |  4 ++--
 gnu/usr.bin/groff/src/utils/Makefile.inc       |  6 +++---
 gnu/usr.bin/groff/src/utils/addftinfo/Makefile |  4 ++--
 gnu/usr.bin/groff/src/utils/hpftodit/Makefile  |  4 ++--
 gnu/usr.bin/groff/src/utils/indxbib/Makefile   |  4 ++--
 gnu/usr.bin/groff/src/utils/lkbib/Makefile     |  4 ++--
 gnu/usr.bin/groff/src/utils/lookbib/Makefile   |  4 ++--
 gnu/usr.bin/groff/src/utils/tfmtodit/Makefile  |  4 ++--
 26 files changed, 55 insertions(+), 58 deletions(-)

diffs (truncated from 419 to 300 lines):

diff -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/Makefile.inc
--- a/gnu/usr.bin/groff/Makefile.inc    Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/Makefile.inc    Fri Aug 10 12:12:18 2012 +0000
@@ -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+=       -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/devices/Makefile.inc
--- a/gnu/usr.bin/groff/src/devices/Makefile.inc        Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/devices/Makefile.inc        Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/devices/grodvi/Makefile
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile     Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile     Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/devices/grohtml/Makefile
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile    Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile    Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/devices/grolbp/Makefile
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile     Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile     Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/devices/grolj4/Makefile
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile     Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile     Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/devices/grops/Makefile
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile      Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile      Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/devices/grotty/Makefile
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile     Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile     Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/preproc/Makefile.inc
--- a/gnu/usr.bin/groff/src/preproc/Makefile.inc        Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/preproc/Makefile.inc        Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/preproc/eqn/Makefile
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile        Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile        Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/preproc/grn/Makefile
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile        Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile        Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/preproc/html/Makefile
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile       Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile       Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/preproc/pic/Makefile
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile        Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile        Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/preproc/refer/Makefile
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile      Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile      Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/preproc/soelim/Makefile
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile     Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile     Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/preproc/tbl/Makefile
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile        Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile        Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/roff/Makefile.inc
--- a/gnu/usr.bin/groff/src/roff/Makefile.inc   Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/roff/Makefile.inc   Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/roff/groff/Makefile
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile Fri Aug 10 12:12:18 2012 +0000
@@ -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 -r 6ff689d69c5b -r 0e5ae8f98f89 gnu/usr.bin/groff/src/roff/troff/Makefile
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile Fri Aug 10 12:11:30 2012 +0000
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile Fri Aug 10 12:12:18 2012 +0000
@@ -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