From owner-cvs-ports@FreeBSD.ORG  Tue Jun 12 15:44:16 2012
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 882D7106564A;
	Tue, 12 Jun 2012 15:44:16 +0000 (UTC)
	(envelope-from rakuco@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A5D78FC15;
	Tue, 12 Jun 2012 15:44:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q5CFiGrq017550;
	Tue, 12 Jun 2012 15:44:16 GMT
	(envelope-from rakuco@repoman.freebsd.org)
Received: (from rakuco@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q5CFiGc8017549;
	Tue, 12 Jun 2012 15:44:16 GMT (envelope-from rakuco)
Message-Id: <201206121544.q5CFiGc8017549@repoman.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Tue, 12 Jun 2012 15:44:16 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/devel/qmake4 Makefile ports/devel/qmake4/files
 patch-qt4-before-ports-in-mkspecs.diff
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jun 2012 15:44:16 -0000

rakuco      2012-06-12 15:44:16 UTC

  FreeBSD ports repository

  Modified files:
    devel/qmake4         Makefile 
    devel/qmake4/files   patch-qt4-before-ports-in-mkspecs.diff 
  Log:
  Partly revert the previous mkspec changes by using the upstream fix instead.
  
  Talking to fluffy@ on IRC, I found out the hard way that my commit
  0ba35fd5a81df57fb0f943c3dddd35d43ebc3383 has not been included in Qt
  4.8.2, so things were pretty much borked when one tried to use
  non-base gcc.
  
  Instead of changing the behavior of g++-base.conf and setting
  QMAKE_{CC,CXX} in "leaf" mkspecs, my upstream commit simply sets these
  values after including g++-base.conf where needed (ie. in the
  freebsd-g++46 mkspec, where we use gcc46 and g++46).
  
  Bump PORTREVISION once again, sorry for the hassle.
  
  Revision  Changes    Path
  1.27      +1 -2      ports/devel/qmake4/Makefile
  1.5       +22 -25    ports/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff