xorg 7 upgrade: file conflicts

[Dan Langille]

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 at Latn.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sr at 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/