From owner-cvs-all@FreeBSD.ORG Thu Apr 19 17:08:04 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B7F7416A401; Thu, 19 Apr 2007 17:08:04 +0000 (UTC) (envelope-from lofi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A55DD13C43E; Thu, 19 Apr 2007 17:08:04 +0000 (UTC) (envelope-from lofi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3JH84o2062951; Thu, 19 Apr 2007 17:08:04 GMT (envelope-from lofi@repoman.freebsd.org) Received: (from lofi@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3JH84O3062950; Thu, 19 Apr 2007 17:08:04 GMT (envelope-from lofi) Message-Id: <200704191708.l3JH84O3062950@repoman.freebsd.org> From: Michael Nottebrock Date: Thu, 19 Apr 2007 17:08:04 +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/Mk bsd.kde.mk ports/accessibility/qt4-accessible Makefile ports/chinese/qt4-codecs-cn Makefile ports/chinese/qt4-codecs-tw Makefile ports/databases/qt4-sql Makefile ports/devel/dbus-qt4 Makefile ports/devel/qt4 Makefile ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Apr 2007 17:08:04 -0000 lofi 2007-04-19 17:08:04 UTC FreeBSD ports repository Modified files: Mk bsd.kde.mk accessibility/qt4-accessible Makefile chinese/qt4-codecs-cn Makefile chinese/qt4-codecs-tw Makefile databases/qt4-sql Makefile devel/dbus-qt4 Makefile devel/qt4 Makefile devel/qmake4 Makefile devel/qt4-assistant Makefile pkg-plist devel/qt4-corelib Makefile devel/qt4-designer Makefile pkg-plist devel/qt4-libqtassistantclient Makefile devel/qt4-linguist Makefile pkg-plist devel/qt4-moc Makefile pkg-plist devel/qt4-porting Makefile devel/qt4-qvfb Makefile pkg-plist devel/qt4-qt3support Makefile devel/qt4-qtestlib Makefile devel/qt4-uic Makefile pkg-plist graphics/qt4-iconengines Makefile graphics/qt4-imageformats Makefile graphics/qt4-pixeltool Makefile graphics/qt4-svg Makefile japanese/qt4-codecs-jp Makefile korean/qt4-codecs-kr Makefile misc/qt4-qtconfig Makefile pkg-plist misc/qt4-qtdemo Makefile net/qt4-network Makefile textproc/qt4-xml Makefile x11/qt4-inputmethods Makefile x11/qt4-opengl Makefile x11-toolkits/qt4-gui Makefile Log: Rename all binaries in qt4 which conflict with binaries installed by qt33 to ($binary)-qt4 and adjust dependencies accordingly. This avoids conflicts once X11BASE has been changed to /usr/local and incidentally makes the naming scheme of the qt4 executables in ports equal to that of the Fedora Core and Debian packages. Revision Changes Path 1.72 +3 -3 ports/Mk/bsd.kde.mk 1.5 +2 -2 ports/accessibility/qt4-accessible/Makefile 1.4 +1 -1 ports/chinese/qt4-codecs-cn/Makefile 1.4 +1 -1 ports/chinese/qt4-codecs-tw/Makefile 1.5 +2 -2 ports/databases/qt4-sql/Makefile 1.6 +2 -2 ports/devel/dbus-qt4/Makefile 1.5 +3 -2 ports/devel/qmake4/Makefile 1.7 +6 -5 ports/devel/qt4-assistant/Makefile 1.2 +1 -1 ports/devel/qt4-assistant/pkg-plist 1.7 +2 -2 ports/devel/qt4-corelib/Makefile 1.5 +6 -5 ports/devel/qt4-designer/Makefile 1.3 +2 -2 ports/devel/qt4-designer/pkg-plist 1.5 +5 -3 ports/devel/qt4-libqtassistantclient/Makefile 1.5 +6 -5 ports/devel/qt4-linguist/Makefile 1.2 +6 -6 ports/devel/qt4-linguist/pkg-plist 1.4 +2 -1 ports/devel/qt4-moc/Makefile 1.2 +2 -2 ports/devel/qt4-moc/pkg-plist 1.4 +4 -4 ports/devel/qt4-porting/Makefile 1.5 +2 -2 ports/devel/qt4-qt3support/Makefile 1.5 +2 -2 ports/devel/qt4-qtestlib/Makefile 1.5 +7 -5 ports/devel/qt4-qvfb/Makefile 1.2 +2 -2 ports/devel/qt4-qvfb/pkg-plist 1.4 +3 -2 ports/devel/qt4-uic/Makefile 1.2 +2 -2 ports/devel/qt4-uic/pkg-plist 1.5 +7 -6 ports/devel/qt4/Makefile 1.5 +2 -2 ports/graphics/qt4-iconengines/Makefile 1.6 +2 -2 ports/graphics/qt4-imageformats/Makefile 1.5 +4 -4 ports/graphics/qt4-pixeltool/Makefile 1.7 +2 -2 ports/graphics/qt4-svg/Makefile 1.4 +1 -1 ports/japanese/qt4-codecs-jp/Makefile 1.4 +1 -1 ports/korean/qt4-codecs-kr/Makefile 1.5 +6 -4 ports/misc/qt4-qtconfig/Makefile 1.2 +2 -2 ports/misc/qt4-qtconfig/pkg-plist 1.7 +4 -4 ports/misc/qt4-qtdemo/Makefile 1.5 +2 -2 ports/net/qt4-network/Makefile 1.5 +2 -2 ports/textproc/qt4-xml/Makefile 1.5 +4 -4 ports/x11-toolkits/qt4-gui/Makefile 1.5 +2 -2 ports/x11/qt4-inputmethods/Makefile 1.6 +2 -2 ports/x11/qt4-opengl/Makefile