Date: Mon, 18 Jun 2007 10:26:09 +0100 From: Tom Evans <tevans.uk@googlemail.com> To: Dan Langille <dan@langille.org> Cc: x11@freebsd.org Subject: Re: xorg 7 upgrade: file conflicts Message-ID: <1182158769.1253.5.camel@localhost> In-Reply-To: <4674F468.2077.16F515C0@dan.langille.org> References: <4674F468.2077.16F515C0@dan.langille.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-pDenYRSoFLP94tJnsrXo Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Sun, 2007-06-17 at 08:44 -0400, Dan Langille wrote: > I'm in the the process of upgrading xorg to 7.2. The following are=20 > file conflicts reported by the /usr/ports/Tools/sripts/mergebase.sh >=20 > Any suggestions for resolving these conflicts? >=20 > In addition, I have a few xorg ports left over that don't say 7.* on=20 > them. They also appear below. Suggestions? >=20 > ./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 >=20 Unless you've modified them, I think those can be safely removed. By safely removed, I mean 'moved to safety'. The merge script should then complete. If you find you need any of those files (remember, files left here are files that already exist and differ from files now in /usr/local), and I doubt you will, just restore them from your safe place. >=20 > 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 >=20 These are all fine, apart from the linux-xorg-libs. Not sure what you should do about that one. --=-pDenYRSoFLP94tJnsrXo Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQBGdk+llcRvFfyds/cRApjBAKCv82s2bWKgwDx07HbDw30TQnpvRgCffxfX AszMZC2PPLzIt4KT1LDbpt8= =hm6e -----END PGP SIGNATURE----- --=-pDenYRSoFLP94tJnsrXo--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1182158769.1253.5.camel>