Problem updating to 7.2

[j w]

Hello again - I sent the previous email (same subject), but switched
email address.

I'm still having problems upgrading, but have some more info.

Background:
this is FreeBSD 6.2-RELEASE
This is my "learn unix" machine, so I can just reinstall if needed,
but I'm trying to learn things the right way.
I have all my sessions logged, in case anyone wants detailed info.

I had 6.9 installed and working properly, then went to install jEdit
(a text editor), and got the "/usr/X11R6 has to be a symlink" error,
and it told me to look at UPDATING.

So I followed the instructions in UPDATING to the letter, but no joy.
when I got to the "portupgrade -a" step, I got the problem in my previous email.
I tried with the dev version of portupgrade too, same result.

I also tried running the mergebase script, in order to create the
symlink, but it complained about a bunch of conflict files.
Just for fun, I tried, backing up my old X11RC and deleting those
conflict files.
Then mergebase ran and created the symlink, but the upgrade of
xorg-libraries gave compile errors (I guess because some of those
conflict files were headers that were needed?)

Anyway, I put the old X11RC back, and now I'm trying to figure out
what to do next.
In the output of pkg_info, it looks some X-related items are on 6.9
and others are on 7 - I don't know how that happened (see list at
end).

I guess next I'll try force-removing the 6.9 versions of things, and
then force-adding the 7 versions - does that have any hope of working?
This is pretty much my first experience with portupgrade (:

Any advice would be appreciated.

Thanks,
-John

# pkg_info
ORBit2-2.14.7_1     High-performance CORBA ORB with support for the C language
Terminal-0.2.6      Terminal emulator for the X windowing system
Thunar-0.8.0_1      XFce 4 file manager
a2ps-a4-4.13b_4     Formats an ascii file for printing on a postscript printer
aalib-1.4.r5_2      An ascii art library
an-0.95_1           Fast anagram generator
asciiquarium-1.0    aquarium/sea animation in ASCII art
atk-1.18.0_1        A GNOME accessibility toolkit (ATK)
autoconf-2.13.000227_5 Automatically configure source code on many
Un*x platforms
autoconf-2.53_3     Automatically configure source code on many Un*x platforms
autoconf-2.59_2     Automatically configure source code on many Un*x platforms
automake-1.4.6_3    GNU Standards-compliant Makefile generator (1.4)
avahi-0.6.17        Service discovery on a local network
bash-3.2.17_2       The GNU Project's Bourne Again SHell
bdftopcf-1.0.1      Convert X font from BDF to PCF
bigreqsproto-1.0.2  BigReqs extension headers
bison-1.75_2,1      A parser generator from FSF, (mostly) compatible with Yacc
bitstream-vera-1.10_4 Bitstream Vera TrueType font collection
cairo-1.2.6_1       Vector graphics library with cross-device output support
cdrtools-2.01_6     CD/CD-R[W] and ISO-9660 image creation and extraction tools
db4-4.0.14_1,1      The Berkeley DB package, revision 4
db41-4.1.25_4       The Berkeley DB package, revision 4.1
dbus-1.0.2          A message bus system for inter-application communication
dbus-glib-0.72      GLib bindings for the D-BUS messaging system
desktop-file-utils-0.12_1 A couple of command line utilities for
working with desktop
dmidecode-2.8       A tool for dumping DMI (SMBIOS) contents in human-readable
encodings-1.0.2,1   X.Org Encoding fonts
expat-2.0.0_1       XML 1.0 parser written in C
firefox-2.0.0.2,1   Web browser based on the browser portion of Mozilla
flatzebra-0.1.1_1   A generic game engine for 2D double-buffering animation
font-adobe-100dpi-1.0.0_1 X.Org Adobe 100dpi font
font-adobe-75dpi-1.0.0 X.Org Adobe 75dpi font
font-adobe-utopia-100dpi-1.0.1 X.Org Adobe Utopia 100dpi font
font-adobe-utopia-75dpi-1.0.1 X.Org Adobe Utopia 75dpi font
font-adobe-utopia-type1-1.0.1 X.Org Adobe Utopia Type1 font
font-alias-1.0.1    X.Org Font aliases
font-arabic-misc-1.0.0 X.Org miscellaneous Arabic fonts
font-bh-100dpi-1.0.0 X.Org Bigelow Holmes 100dpi font
font-bh-75dpi-1.0.0 X.Org Bigelow Holmes 75dpi font
font-bh-lucidatypewriter-100dpi-1.0.0 X.Org Bigelow Holmes Lucida
TypeWriter 100dpi font
font-bh-lucidatypewriter-75dpi-1.0.0 X.Org Bigelow Holmes Lucida
TypeWriter 75dpi font
font-bh-ttf-1.0.0   X.Org Bigelow & Holmes TTF font
font-bh-type1-1.0.0 X.Org Bigelow Holmes Type1 font
font-bitstream-100dpi-1.0.0 X.Org Bitstream Vera 100dpi font
font-bitstream-75dpi-1.0.0 X.Org Bitstream Vera 75dpi font
font-bitstream-type1-1.0.0 X.Org Bitstream Vera Type1 font
font-cronyx-cyrillic-1.0.0 X.Org Cronyx Cyrillic font
font-cursor-misc-1.0.0 X.Org miscellaneous Cursor fonts
font-daewoo-misc-1.0.0 X.Org miscellaneous Daewoo fonts
font-dec-misc-1.0.0 X.Org miscellaneous Dec fonts
font-ibm-type1-1.0.0 X.Org IBM Type1 font
font-isas-misc-1.0.0 X.Org miscellaneous ISAS fonts
font-jis-misc-1.0.0 X.Org miscellaneous JIS fonts
font-micro-misc-1.0.0 X.Org miscellaneous Micro fonts
font-misc-cyrillic-1.0.0 X.Org miscellaneous Cyrillic font
font-misc-ethiopic-1.0.0 X.Org miscellaneous Ethiopic font
font-misc-meltho-1.0.0_1 X.Org miscellaneous Meltho font
font-misc-misc-1.0.0 X.Org miscellaneous Misc fonts
font-mutt-misc-1.0.0 X.Org miscellaneous Mutt fonts
font-schumacher-misc-1.0.0 X.Org miscellaneous Schumacher fonts
font-screen-cyrillic-1.0.1 X.Org Screen Cyrillic font
font-sony-misc-1.0.0 X.Org miscellaneous Sony fonts
font-sun-misc-1.0.0 X.Org miscellaneous Sun fonts
font-util-1.0.1     Create an index of X font files in a directory
font-winitzki-cyrillic-1.0.0 X.Org Winitzki Cyrillic font
font-xfree86-type1-1.0.0 X.Org XFree86 Type1 font
fontcacheproto-0.1.2 Fontcache extension headers
fontconfig-2.4.2_2,1 An XML-based font configuration API for X Windows
fontsproto-2.0.2    Fonts extension headers
freetype-1.3.1_4    A free and portable TrueType font rendering engine
freetype2-2.2.1_2   A free and portable TrueType font rendering engine
gamin-0.1.8_1       A file and directory monitoring system
gccmakedep-1.0.2    Create dependencies in makefiles using 'gcc -M'
gconf2-2.16.0       A configuration database system for GNOME
gdbm-1.8.3_3        The GNU database manager
gengameng-4.1_2     An SDL game engine library
gettext-0.16.1_3    GNU gettext package
glib-2.12.12_2      Some useful routines of C programming (current stable versi
gmake-3.81_2        GNU version of 'make' utility
gnome-mime-data-2.4.3 A MIME and Application database for GNOME
gnome-vfs-2.16.3    GNOME Virtual File System
gnome_subr-1.0      Common startup and shutdown subroutines used by GNOME scrip
gnomehier-2.2       A utility port that creates the GNOME directory tree
gtk-2.10.9_1        Gimp Toolkit for X11 GUI (current stable version)
gtk-xfce-engine-2.4.0 An XFCE engine for GTK 2.0
hal-0.5.8.20070210  Hardware Abstraction Layer for simplifying device access
help2man-1.36.4_1   Automatically generating simple manual pages from program o
hex-a-hop-1.0.0_1   A puzzle game based on hexagonal tiles
hicolor-icon-theme-0.10_2 A high-color icon theme shell from the
FreeDesktop project
icu-3.6             International Components for Unicode (from IBM)
imake-1.0.2_4,1     Imake and other utilities from X.Org
inputproto-1.3.2    Input extension headers
intltool-0.35.5_2   Tools to internationalize various kinds of data files
jpeg-6b_4           IJG's jpeg compression utilities
kbproto-1.0.3       KB extension headers
libIDL-0.8.8        A library for creating trees of CORBA IDL files
libX11-1.1.2_1,1    X11 library
libXau-1.0.3_2      Authentication Protocol library for X11
libXdmcp-1.0.2      X Display Manager Control Protocol library
libXfont-1.2.8,1    X font libary
libXft-2.1.12       A client-sided font API for X applications
libXrender-0.9.2    X Render extension library
libbonobo-2.18.0_1  A component and compound document system for GNOME2
libdaemon-0.11      Lightweight C library that eases the writing of UNIX daemon
libdrm-2.3.0        Userspace interface to kernel Direct Rendering Module servi
libexo-0.3.2_1      Terminal library, extensions to Xfce by os-cillation
libfontenc-1.0.4    The fontenc Library
libgmp-4.2.1_2      A free library for arbitrary precision arithmetic
libical-0.24_3      An implementation of the IETF's Calendaring and Scheduling
libiconv-1.9.2_2    A character set conversion library
libmikmod-3.1.11_2  MikMod Sound Library
libnotify-0.4.3     A library for desktop notifications
libogg-1.1.3,3      Ogg bitstream library
libtool-1.5.22_4    Generic shared library support script
libvolume_id-0.75.0_1 Library to provide file system type information
libvorbis-1.1.2,3   Audio compression codec library
libxfce4gui-4.4.0   XFce 4 widget library required by xfce4 and xfwm4
libxfce4mcs-4.4.0   XFce 4 settings management library used by most XFce 4 modu
libxfce4util-4.4.1  XFce 4 library with non-graphical helper functions
libxml2-2.6.29      XML parser library for GNOME
linc-1.0.3_6        A library for writing networked servers & clients
linux_base-fc-4_10  Base set of packages needed in Linux mode (for i386/amd64)
lynx-2.8.6.5,1      A non-graphical, text-based World-Wide Web client
m4-1.4.9            GNU m4
makedepend-1.0.1,1  A dependency generator for makefiles
mercurial-0.9.4     A fast, lightweight source control management system
mird-1.0.7_1        A free database library with transaction support
mkfontdir-1.0.3     Create an index of X font files in a directory
mkfontscale-1.0.3   Creates an index of scalable font files for X
mousepad-0.2.12     Simple xfce editor
mysql-client-5.0.41 Multithreaded SQL database (client)
nasm-0.98.39,1      General-purpose multi-platform x86 assembler
nettle-1.15         A low-level cryptographic library
nspr-4.6.7          A platform-neutral API for system level and libc like funct
nss-3.11.7          Libraries to support development of security-enabled applic
orage-4.4.0         A calendar application to manage your time with XFce 4
p5-Curses-1.15      Perl5 module for terminal screen handling and optimization
p5-Term-Animation-2.4 ASCII sprite animation framework
p5-URI-1.35         Perl5 interface to Uniform Resource Identifier (URI) refere
p5-XML-Parser-2.34_2 Perl extension interface to James Clark's XML parser, expat
p5-gettext-1.05_1   Message handling functions
panda-0.5.4_1       A PDF generation library
pango-1.14.10       An open-source framework for the layout and rendering of i1
pciids-20070702     Database of all known ID's used in PCI devices
pcre-7.1            Perl Compatible Regular Expressions library
pdflib-7.0.0p3      A C library for dynamically generating PDF
perl-5.8.8          Practical Extraction and Report Language
pkg-config-0.22     A utility to retrieve information about installed libraries
png-1.2.18          Library for manipulating PNG images
policykit-0.1.20060514_3 Framework for controlling access to
system-wide components
popt-1.7_4          A getopt(3) like library with a number of enhancements, fro
portaudit-0.5.11    Checks installed ports against a list of security vulnerabi
portupgrade-devel-2.3.1 FreeBSD ports/packages administration and
management tool s
postgresql-client-7.4.17 PostgreSQL database (client)
python24-2.4.4      An interpreted object-oriented programming language
renderproto-0.9.2   RenderProto protocol headers
rpm-3.0.6_13        The Red Hat Package Manager
ruby-1.8.6_1,1      An object-oriented interpreted scripting language
ruby18-bdb-0.6.0    Ruby interface to Sleepycat's Berkeley DB revision 2 or lat
samba-libsmbclient-3.0.25a_1 Shared libs from the samba package
sdl-1.2.11,2        Cross-platform multi-media development API
sdl_image-1.2.5     A simple library to load images of various formats as SDL s
sdl_mixer-1.2.7     A sample multi-channel audio mixer library
shared-mime-info-0.21_3 A MIME type database from the FreeDesktop project
smpeg-0.4.4_6       A free MPEG1 video player library with sound support
startup-notification-0.8_3 Library that supports startup notification
spec from freede
sudo-1.6.8.12_2     Allow others to run commands as root
svgalib-1.4.3_5     A low level console graphics library
tetrons-1.6         Tetris(TM) clone for X11
tiff-3.8.2_1        Tools and library routines for working with TIFF images
vte-0.14.2_1        Terminal widget with improved accessibility and I18N suppor
xcmiscproto-1.1.2   XCMisc extension headers
xextproto-7.0.2     XExt extension headers
xf86bigfontproto-1.1.2 XFree86-Bigfont extension headers
xfce-4.4.0          The "meta-port" for the XFce 4 desktop environment
xfce4-appfinder-4.4.0 Find application in the system supporting
Desktop entry for
xfce4-desktop-4.4.0_1 XFce 4 desktop background manager and root menu
xfce4-icon-theme-4.4.0 Icon themes for XFce 4
xfce4-mcs-manager-4.4.0 XFce 4 settings manager
xfce4-mcs-plugins-4.4.0 XFce 4 settings manager plugins
xfce4-mixer-4.4.0   XFce 4 volume mixer module for xfce4-panel
xfce4-panel-4.4.0   XFce 4 panel module
xfce4-print-4.4.0   XFce 4 graphical frontend for printing
xfce4-session-4.4.0 Session manager for the Xfce 4 desktop environment
xfce4-utils-4.4.0   XFce 4 essential utilities and scripts
xfce4-wm-4.4.0      XFce 4 window manager
xfce4-wm-themes-4.4.1 XFce 4 window decoration themes for xfwm4
xorg-cf-files-1.0.2_2 X.org cf files for use with imake builds
xorg-clients-6.9.0_3 X client programs and related files from X.Org
xorg-docs-1.3,1     X.org documentation files
xorg-fonts-100dpi-7.2 X.Org 100dpi bitmap fonts
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-fontserver-6.9.0_1 X font server from X.Org
xorg-libraries-6.9.0 X11 libraries and headers from X.Org
xorg-nestserver-6.9.0_1 Nesting X server from X.Org
xorg-printserver-6.9.0_2 X Print server from X.Org
xorg-server-6.9.0_5 X.Org X server and related programs
xorg-vfbserver-6.9.0_2 X virtual framebuffer server from X.Org
xproto-7.0.10       X11 protocol headers
xterm-220           Terminal emulator for the X Window System
xtrans-1.0.3        Abstract network code for X
zip-2.32            Create/update ZIP files compatible with pkzip