From owner-svn-ports-all@FreeBSD.ORG Thu Oct 2 18:40:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8059E755; Thu, 2 Oct 2014 18:40:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 520FFDD2; Thu, 2 Oct 2014 18:40:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s92IeC99033937; Thu, 2 Oct 2014 18:40:12 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s92IeBkv033752; Thu, 2 Oct 2014 18:40:11 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201410021840.s92IeBkv033752@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 2 Oct 2014 18:40:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369847 - in head/x11-toolkits: qt4-gui qt5-gui X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Oct 2014 18:40:12 -0000 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 - -.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 +.include 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 - # 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 +.include