From d5f69f88920728e1f5fb4e5b45ff0c730d02644b Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Thu, 18 Jan 2018 07:26:06 +0200
Subject: [PATCH] gcc47: Move out manpage version handling.

The Makefile.cco should only affect global ones.
---
 gnu/usr.bin/Makefile.cco       | 2 --
 gnu/usr.bin/cc47/c++/Makefile  | 1 +
 gnu/usr.bin/cc47/cc/Makefile   | 3 ++-
 gnu/usr.bin/cc47/cpp/Makefile  | 1 +
 gnu/usr.bin/cc47/gcov/Makefile | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/usr.bin/Makefile.cco b/gnu/usr.bin/Makefile.cco
index 7b4e96d04c..603fda3ee0 100644
--- a/gnu/usr.bin/Makefile.cco
+++ b/gnu/usr.bin/Makefile.cco
@@ -11,7 +11,5 @@ CC_BACKUP=	gcc47
 .if (${COMPVERSION} == ${CC_PRIMARY})
 IS_PRIMARY=	1
 MANPAGEVER=	50
-.elif (${COMPVERSION} == ${CC_BACKUP})
-MANPAGEVER=	47
 .endif
 .endif
diff --git a/gnu/usr.bin/cc47/c++/Makefile b/gnu/usr.bin/cc47/c++/Makefile
index cc71758faf..72038f2cef 100644
--- a/gnu/usr.bin/cc47/c++/Makefile
+++ b/gnu/usr.bin/cc47/c++/Makefile
@@ -3,6 +3,7 @@ GCC_LANG_DIR=	gcc/cp
 .include "../../Makefile.cco"
 
 PROG=	c++
+MANPAGEVER= 47
 MFILE=	g++${MANPAGEVER}.1
 MAN=	${MFILE}
 
diff --git a/gnu/usr.bin/cc47/cc/Makefile b/gnu/usr.bin/cc47/cc/Makefile
index 7b9667b9d0..dd1c794cf0 100644
--- a/gnu/usr.bin/cc47/cc/Makefile
+++ b/gnu/usr.bin/cc47/cc/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	cc
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
+MANPAGEVER= 47
 MFILE=	gcc${MANPAGEVER}.1
 MAN=	${MFILE}
 
@@ -20,7 +21,7 @@ MLINKS+= ${MFILE} cc${MANPAGEVER}.1
 MLINKS+= ${MFILE} CC${MANPAGEVER}.1
 MLINKS+= ${MFILE} c++${MANPAGEVER}.1
 MLINKS+= ${MFILE} g++${MANPAGEVER}.1
-	
+
 .if defined(IS_PRIMARY)
 MLINKS+= ${MFILE} cc.1
 MLINKS+= ${MFILE} CC.1
diff --git a/gnu/usr.bin/cc47/cpp/Makefile b/gnu/usr.bin/cc47/cpp/Makefile
index abf6bf1e88..525b66d54c 100644
--- a/gnu/usr.bin/cc47/cpp/Makefile
+++ b/gnu/usr.bin/cc47/cpp/Makefile
@@ -3,6 +3,7 @@
 .include "../../Makefile.cco"
 
 PROG=	cpp
+MANPAGEVER= 47
 MFILE=	cpp${MANPAGEVER}.1
 MAN=	${MFILE}
 
diff --git a/gnu/usr.bin/cc47/gcov/Makefile b/gnu/usr.bin/cc47/gcov/Makefile
index dd5ecb80df..2ecbdad78c 100644
--- a/gnu/usr.bin/cc47/gcov/Makefile
+++ b/gnu/usr.bin/cc47/gcov/Makefile
@@ -2,6 +2,7 @@
 .include "../../Makefile.cco"
 
 PROG=	gcov
+MANPAGEVER= 47
 MFILE=	gcov${MANPAGEVER}.1
 MAN=	${MFILE}
 
-- 
2.41.0