From owner-freebsd-x11@FreeBSD.ORG Sun Jun 17 13:05:11 2007 Return-Path: X-Original-To: x11@freebsd.org Delivered-To: freebsd-x11@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B8A3616A47E for ; Sun, 17 Jun 2007 13:05:11 +0000 (UTC) (envelope-from dan@langille.org) Received: from supernews.unixathome.org (supernews.unixathome.org [216.168.29.4]) by mx1.freebsd.org (Postfix) with ESMTP id 6CBF713C4BE for ; Sun, 17 Jun 2007 13:05:11 +0000 (UTC) (envelope-from dan@langille.org) Received: from localhost (localhost [127.0.0.1]) by supernews.unixathome.org (Postfix) with ESMTP id DC7A41702A for ; Sun, 17 Jun 2007 08:44:26 -0400 (EDT) X-Virus-Scanned: amavisd-new at unixathome.org Received: from supernews.unixathome.org ([127.0.0.1]) by localhost (supernews.unixathome.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EOTqM-O9ePk7 for ; Sun, 17 Jun 2007 08:44:22 -0400 (EDT) Received: from bast.unixathome.org (bast.unixathome.org [76.110.86.209]) by supernews.unixathome.org (Postfix) with ESMTP id CB0FF17027 for ; Sun, 17 Jun 2007 08:44:21 -0400 (EDT) Received: from [10.55.0.99] (wocker.unixathome.org [10.55.0.99]) by bast.unixathome.org (Postfix) with ESMTP id D1EF2B87D for ; Sun, 17 Jun 2007 08:44:24 -0400 (EDT) From: "Dan Langille" To: x11@freebsd.org Date: Sun, 17 Jun 2007 08:44:24 -0400 MIME-Version: 1.0 Message-ID: <4674F468.2077.16F515C0@dan.langille.org> Priority: normal X-mailer: Pegasus Mail for Windows (4.41) Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7BIT Content-description: Mail message body Cc: Subject: xorg 7 upgrade: file conflicts X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jun 2007 13:05:11 -0000 I'm in the the process of upgrading xorg to 7.2. The following are file conflicts reported by the /usr/ports/Tools/sripts/mergebase.sh Any suggestions for resolving these conflicts? In addition, I have a few xorg ports left over that don't say 7.* on them. They also appear below. Suggestions? ./etc/gconf/gconf.xml.defaults/%gconf-tree-af.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ar.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-az.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-be.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-bg.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-bn.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-bs.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ca.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-cs.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-cy.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-da.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-de.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-el.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-en_CA.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-es.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-et.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-eu.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-fi.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-fr.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-gl.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-gu.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-he.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-hi.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-hr.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-hu.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-id.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-it.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ja.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ka.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ko.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-lt.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-mk.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-mn.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ms.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-nb.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ne.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-nl.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-nn.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-nso.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-or.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-pa.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-pl.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-pt.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-pt_BR.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ro.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ru.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-sk.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-sq.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-sr.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-sr@Latn.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-sr@ije.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-sv.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-ta.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-th.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-tr.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-uk.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-vi.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-xh.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-zh_CN.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-zh_HK.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-zh_TW.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree-zu.xml ./etc/gconf/gconf.xml.defaults/%gconf-tree.xml ./etc/settings/.qt_plugins_3.3rc.lock ./etc/settings/qt_plugins_3.3rc ./man/whatis ./share/applications/gimp-2.2.desktop ./share/icons/hicolor/index.theme linux-xorg-libs-6.8.2_5 Xorg libraries, linux binaries xorg-7.2 X.Org complete distribution metaport xorg-apps-7.2 X.org apps meta-port xorg-cf-files-1.0.2_2 X.org cf files for use with imake builds xorg-docs-1.3,1 X.org documentation files xorg-drivers-7.2 X.org drivers meta-port xorg-fonts-100dpi-7.2 X.Org 100dpi bitmap fonts xorg-fonts-7.2 X.org fonts meta-port xorg-fonts-75dpi-7.2 X.Org 75dpi bitmap fonts xorg-fonts-cyrillic-7.2 X.Org Cyrillic bitmap fonts xorg-fonts-miscbitmaps-7.2 X.Org miscellaneous bitmap fonts xorg-fonts-truetype-7.2 X.Org TrueType fonts xorg-fonts-type1-7.2 X.Org Type1 fonts xorg-libraries-7.2_1 X.org libraries meta-port xorg-nestserver-1.2.0,1 Nesting X server from X.Org xorg-printserver-1.2.0,1 X Print server from X.Org xorg-protos-7.2 X.org protos meta-port xorg-server-1.2.0_2,1 X.Org X server and related programs xorg-vfbserver-1.2.0,1 X virtual framebuffer server from X.Org -- Dan Langille two conferences, one trip, great value: May 2007 BSDCan - The BSD Conference - http://www.bsdcan.org/ PGCon - The PostgreSQL Conference - http://www.pgcon.org/