svn commit: r369847 - in head/x11-toolkits: qt4-gui qt5-gui

[Raphael Kubo da Costa]

Author: rakuco
Date: Thu Oct  2 18:40:10 2014
New Revision: 369847
URL: https://svnweb.freebsd.org/changeset/ports/369847
QAT: https://qat.redports.org/buildarchive/r369847/

Log:
  - 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.

Modified:
  head/x11-toolkits/qt4-gui/Makefile
  head/x11-toolkits/qt5-gui/Makefile

Modified: head/x11-toolkits/qt4-gui/Makefile
==============================================================================
--- head/x11-toolkits/qt4-gui/Makefile	Thu Oct  2 18:39:36 2014	(r369846)
+++ head/x11-toolkits/qt4-gui/Makefile	Thu Oct  2 18:40:10 2014	(r369847)
@@ -75,11 +75,7 @@ RUN_DEPENDS+=	${FONTSCALE}:${PORTSDIR}/x
 		${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>

Modified: head/x11-toolkits/qt5-gui/Makefile
==============================================================================
--- head/x11-toolkits/qt5-gui/Makefile	Thu Oct  2 18:39:36 2014	(r369846)
+++ head/x11-toolkits/qt5-gui/Makefile	Thu Oct  2 18:40:10 2014	(r369847)
@@ -61,12 +61,8 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts
 		${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>