From owner-p4-projects@FreeBSD.ORG  Fri Jul 27 16:29:22 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3DA2516A46B; Fri, 27 Jul 2007 16:29:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1251F16A41A
	for <perforce@freebsd.org>; Fri, 27 Jul 2007 16:29:22 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ECDDB13C48A
	for <perforce@freebsd.org>; Fri, 27 Jul 2007 16:29:21 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6RGTLTt024775
	for <perforce@freebsd.org>; Fri, 27 Jul 2007 16:29:21 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6RGTLHG024772
	for perforce@freebsd.org; Fri, 27 Jul 2007 16:29:21 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 27 Jul 2007 16:29:21 GMT
Message-Id: <200707271629.l6RGTLHG024772@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 124194 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jul 2007 16:29:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=124194

Change 124194 by gabor@gabor_server on 2007/07/27 16:29:15

	IFC

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/MOVED#14 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.qt.mk#2 integrate

Differences ...

==== //depot/projects/soc2006/gabor_destdir/MOVED#14 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1430 2007/07/23 13:52:04 danfe Exp $
+# $FreeBSD: ports/MOVED,v 1.1432 2007/07/26 13:44:57 bsam Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3106,3 +3106,7 @@
 security/metasploit-devel|security/metasploit|2007-07-23|move to security/metasploit
 x11/nvidia-driver-7184|x11/nvidia-driver-71xx|2007-07-23|moved to x11/nvidia-driver-71xx
 x11/nvidia-driver-9631|x11/nvidia-driver-96xx|2007-07-23|moved to x11/nvidia-driver-96xx
+french/fr-py-qt4-eric4|french/eric4|2007-07-25|Moved to french/eric4
+german/de-py-qt4-eric4|german/eric4|2007-07-25|Moved to german/eric4
+russian/ru-py-qt4-eric4|russian/eric4|2007-07-25|Moved to russian/eric4
+devel/py-qt4-eric4|devel/eric4|2007-07-25|Moved to devel/eric4

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.qt.mk#2 (text+ko) ====

@@ -45,8 +45,13 @@
 QMAKE?=		${QT_PREFIX}/bin/qmake-qt4
 QMAKESPEC?=	${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
 
+.if ${OSVERSION} < 700042 && ${ARCH} == "amd64"
+QTCPPFLAGS?=	-fno-gcse
+.else
 QTCPPFLAGS?=
+.endif
 QTCGFLIBS?=
+
 .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
 
 QT4_VERSION?=		4.3.0