3 files changed, 5 insertions, 8 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 441ef8432e8..4b430dea364 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2017/05/03 08:38:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.117 2017/05/05 17:38:00 joerg Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
 PKGREVISION=	6
@@ -28,9 +28,6 @@ CONFIGURE_ARGS+=	-openssl-linked
 
 CONFIGURE_ARGS+=	-iconv
 
-USE_LANGUAGES+=		c++11
-
-.include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CXXFLAGS+=	-Wno-c++11-narrowing
 .  if empty(MACHINE_PLATFORM:MDarwin-*-*)
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 6c17d9a48ff..b2117502f94 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2016/02/25 08:27:05 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.42 2017/05/05 17:38:00 joerg Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -63,6 +63,8 @@ QMAKE_RANLIB=		${TRUE}
 # avoid creating a .qt directory in the users home directory
 SCRIPTS_ENV+=		HOME=${WRKDIR}
 
+USE_LANGUAGES+=		c++11
+
 .include "../../mk/compiler.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/x11/qt4-libs/hacks.mk b/x11/qt4-libs/hacks.mk
index 00badeda0e2..4769ff3ff27 100644
--- a/x11/qt4-libs/hacks.mk
+++ b/x11/qt4-libs/hacks.mk
@@ -1,10 +1,9 @@
-# $NetBSD: hacks.mk,v 1.3 2014/12/15 11:46:36 jperkin Exp $
+# $NetBSD: hacks.mk,v 1.4 2017/05/05 17:38:00 joerg Exp $
 
 ### [Wed Aug  3 12:18:16 UTC 2011 : tron]
 ### If "qmake" is build with "-O2" or better with "g++" under Mac OS X the
 ### resulting binary will crash. This fixes PR pkg/44716 by Richard Hansen.
 .if ${OPSYS} == "Darwin"
-.  include "../../mk/compiler.mk"
 .  if !empty(CC_VERSION:Mgcc*)
 PKG_HACKS+=		macosx-codegen
 BUILDLINK_TRANSFORM+=	opt:-O[0-9]*:-O1
@@ -16,7 +15,6 @@ BUILDLINK_TRANSFORM+=	opt:-O[0-9]*:-O1
 ### when building gui/painting/qdrawhelper_mmx.cpp.
 ### Building with -O1 instead of -O2 seems to work around the problem.
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
-.  include "../../mk/compiler.mk"
 .  if !empty(CC_VERSION:Mgcc-4.5.*)
 PKG_HACKS+=		pr46978
 SUBST_CLASSES+=		pr46978