- Use a new-style helper for the special powerpc64 CFLAGS setting.

- Include only bsd.port.mk, the bsd.port.{pre,post}.mk combo is not needed
  here.

2 files changed, 4 insertions, 12 deletions

diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 175b7c331b17..4be3bc145c9e 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -75,11 +75,7 @@ RUN_DEPENDS+=	${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == powerpc64
-CFLAGS+=	-mminimal-toc
-.endif
+CFLAGS_powerpc64=	-mminimal-toc
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/mkspecs
@@ -100,4 +96,4 @@ post-install:
 	${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/qtlogo.png
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index 52b5bb6317c2..d1f4cb7aaf4e 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -61,12 +61,8 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11
 		${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
 .endif
 
-.include <bsd.port.pre.mk>
-
 # Inherited from Qt 4.
-.if ${ARCH} == powerpc64
-CFLAGS+=	-mminimal-toc
-.endif
+CFLAGS_powerpc64=	-mminimal-toc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-ldl/$$$$QMAKE_LIBS_DYNLOAD/' \
@@ -92,4 +88,4 @@ post-install:
 		${MAKE_ARGS} ${INSTALL_TARGET}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>