Move GCC_REQD+=4.6 to boost-libs/buildlink3.mk for OpenBSD.

It is common for boost-libs consumers.

5 files changed, 5 insertions, 36 deletions

diff --git a/converters/libabw/Makefile b/converters/libabw/Makefile
index 272527c662e..f4135337bb1 100644
--- a/converters/libabw/Makefile
+++ b/converters/libabw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/05/12 12:09:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2014/05/13 18:54:01 ryoon Exp $
 
 DISTNAME=	libabw-0.0.2
 CATEGORIES=	converters
@@ -12,12 +12,6 @@ LICENSE=	mpl-2.0
 
 TOOL_DEPENDS+=	gperf-[0-9]*:../../devel/gperf
 
-.include "../../mk/bsd.prefs.mk"
-# GCC 4.5 or later may be required, and gcc45 is not provided for OpenBSD
-.if ${OPSYS} == "OpenBSD"
-GCC_REQD+=	4.6
-.endif
-
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	perl:build pkg-config
diff --git a/converters/libe-book/Makefile b/converters/libe-book/Makefile
index a4de5102f9d..329e8166115 100644
--- a/converters/libe-book/Makefile
+++ b/converters/libe-book/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/05/12 12:10:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2014/05/13 18:54:01 ryoon Exp $
 
 DISTNAME=	libe-book-0.0.3
 PKGREVISION=	1
@@ -18,12 +18,6 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGES=	c++
 
-.include "../../mk/bsd.prefs.mk"
-# GCC 4.5 or later may be required, and gcc45 is not provided for OpenBSD
-.if ${OPSYS} == "OpenBSD"
-GCC_REQD+=      4.6
-.endif
-
 CONFIGURE_ARGS+=	--disable-tests
 CONFIGURE_ARGS+=	--without-docs
 
diff --git a/converters/libwpd/Makefile b/converters/libwpd/Makefile
index fd4eba970e8..99d9055ba00 100644
--- a/converters/libwpd/Makefile
+++ b/converters/libwpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/01/26 04:43:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2014/05/13 18:54:01 ryoon Exp $
 
 DISTNAME=	libwpd-0.9.9
 CATEGORIES=	converters
@@ -10,13 +10,6 @@ HOMEPAGE=	http://libwpd.sourceforge.net/
 COMMENT=	Library for importing and exporting WordPerfect(tm) documents
 LICENSE=	gnu-lgpl-v2.1
 
-.include "../../mk/bsd.prefs.mk"
-# OpenBSD's gcc 4.2.1 is not sufficient, and gcc46 is minimal pkgsrc gcc
-# for OpenBSD. Avoid warning as error.
-.if ${OPSYS} == "OpenBSD"
-GCC_REQD+=		4.6
-.endif
-
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
diff --git a/converters/libwpg/Makefile b/converters/libwpg/Makefile
index 66da13805c4..71ac08e27bf 100644
--- a/converters/libwpg/Makefile
+++ b/converters/libwpg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/05/12 12:08:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2014/05/13 18:54:01 ryoon Exp $
 
 DISTNAME=	libwpg-0.2.2
 CATEGORIES=	converters graphics
@@ -17,12 +17,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-docs
 PKGCONFIG_OVERRIDE+=	libwpg-0.2.pc.in
 
-.include "../../mk/bsd.prefs.mk"
-# GCC 4.5 or later may be required, and gcc45 is not provided for OpenBSD
-.if ${OPSYS} == "OpenBSD"
-GCC_REQD+=      4.6
-.endif
-
 REPLACE_PERL=		src/conv/svg/wpg2svgbatch.pl
 
 .include "../../mk/compiler.mk"
diff --git a/converters/libwps/Makefile b/converters/libwps/Makefile
index a1898eb2e32..a4a85ab5105 100644
--- a/converters/libwps/Makefile
+++ b/converters/libwps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/05/12 12:09:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2014/05/13 18:54:02 ryoon Exp $
 
 DISTNAME=	libwps-0.2.4
 CATEGORIES=	converters
@@ -17,12 +17,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-docs
 PKGCONFIG_OVERRIDE+=	libwps-0.2.pc.in
 
-.include "../../mk/bsd.prefs.mk"
-# GCC 4.5 or later may be required, and gcc45 is not provided for OpenBSD
-.if ${OPSYS} == "OpenBSD"
-GCC_REQD+=      4.6
-.endif
-
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CXX+=	-Wno-unused-private-field -Wno-unused-const-variable