Upgrade to 7.2 - mergebase.sh errors

Tue Jul 17 15:02:44 UTC 2007

Hi,

As adviced in /usr/ports/UPDATING after upgrading x11 to 7.2
successfully I ran /usr/ports/Tools/scripts/mergebase.sh. 

However the script doesn't run through but instead stops with lots of
complaints about conflicting files (see below).

What should I do against these conflicting files? 

Thanks much in advance for any clue,
-ewald

------------------------------ < Cut here > ------------------------------

# sh /usr/ports/Tools/scripts/mergebase.sh
This script will attempt to backup /usr/X11R6 into
/usr/tmp/mergebase/oldx11base.20070717.152602.tar and then move the
contents onto /usr/local. It will then replace /usr/X11R6
with a symbolic link, pointing to /usr/local. After that,
the script will attempt to change some settings in /etc
that by default point to both /usr/X11R6 and /usr/local
to remove references to /usr/X11R6; specifically, the files
that could get altered are /etc/periodic.conf
/etc/manpath.config /etc/rc.conf.

Be advised that this script expects default environment,
notably it assumes that you have not changed $X11BASE and
$LOCALBASE variables from their default values and that
/usr/X11R6 is regular directory and not separate mount.

If these assumptions are not correct, either edit this script
to change $X11BASE $LOCALBASE and/or $BACKUPDIR values or
do the merge by hand (perhaps using this script as a rough guide).

Enter 'yes' to continue, anything else will exit script: yes
CONFLICTING FILES:
./bin/fc-cache
./bin/fc-list
./bin/fc-match
./bin/gapi2-codegen
./bin/gapi2-fixup
./bin/gapi2-parser
./bin/gconfsharp2-schemagen
./bin/xft-config
./etc/fonts/fonts.conf
./etc/fonts/fonts.conf.default
./etc/fonts/fonts.dtd
./etc/gconf/gconf.xml.defaults/%gconf-tree-af.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-am.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-bn_IN.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-br.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-dz.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-eo.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-fa.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-ga.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-hy.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-id.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-is.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-km.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ko.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ku.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ky.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-li.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-lt.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-lv.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-mg.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-mk.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ml.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-mn.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-mr.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-no.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-rw.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sk.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-sl.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-te.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-th.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-tk.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-tr.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-tt.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-ug.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-wa.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-xh.xml
./etc/gconf/gconf.xml.defaults/%gconf-tree-yi.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
./include/GL/gl.h
./include/GL/glext.h
./include/GL/glu.h
./include/GL/glx.h
./include/GL/glxext.h
./include/GL/glxint.h
./include/GL/glxmd.h
./include/GL/glxproto.h
./include/GL/glxtokens.h
./include/X11/CallbackI.h
./include/X11/Composite.h
./include/X11/CompositeP.h
./include/X11/ConstrainP.h
./include/X11/Constraint.h
./include/X11/ConvertI.h
./include/X11/Core.h
./include/X11/CoreP.h
./include/X11/CreateI.h
./include/X11/DECkeysym.h
./include/X11/EventI.h
./include/X11/HPkeysym.h
./include/X11/HookObjI.h
./include/X11/ICE/ICE.h
./include/X11/ICE/ICEconn.h
./include/X11/ICE/ICElib.h
./include/X11/ICE/ICEmsg.h
./include/X11/ICE/ICEproto.h
./include/X11/ICE/ICEutil.h
./include/X11/ImUtil.h
./include/X11/InitialI.h
./include/X11/Intrinsic.h
./include/X11/IntrinsicI.h
./include/X11/IntrinsicP.h
./include/X11/Object.h
./include/X11/ObjectP.h
./include/X11/PassivGraI.h
./include/X11/RectObj.h
./include/X11/RectObjP.h
./include/X11/ResourceI.h
./include/X11/SM/SM.h
./include/X11/SM/SMlib.h
./include/X11/SM/SMproto.h
./include/X11/SelectionI.h
./include/X11/Shell.h
./include/X11/ShellI.h
./include/X11/ShellP.h
./include/X11/StringDefs.h
./include/X11/Sunkeysym.h
./include/X11/ThreadsI.h
./include/X11/TranslateI.h
./include/X11/VarargsI.h
./include/X11/Vendor.h
./include/X11/VendorP.h
./include/X11/X.h
./include/X11/X10.h
./include/X11/XF86keysym.h
./include/X11/XKBlib.h
./include/X11/XWDFile.h
./include/X11/Xalloca.h
./include/X11/Xarch.h
./include/X11/Xatom.h
./include/X11/Xauth.h
./include/X11/Xaw/AllWidgets.h
./include/X11/Xaw/AsciiSink.h
./include/X11/Xaw/AsciiSinkP.h
./include/X11/Xaw/AsciiSrc.h
./include/X11/Xaw/AsciiSrcP.h
./include/X11/Xaw/AsciiText.h
./include/X11/Xaw/AsciiTextP.h
./include/X11/Xaw/Box.h
./include/X11/Xaw/BoxP.h
./include/X11/Xaw/Cardinals.h
./include/X11/Xaw/Command.h
./include/X11/Xaw/CommandP.h
./include/X11/Xaw/Dialog.h
./include/X11/Xaw/DialogP.h
./include/X11/Xaw/Form.h
./include/X11/Xaw/FormP.h
./include/X11/Xaw/Grip.h
./include/X11/Xaw/GripP.h
./include/X11/Xaw/Label.h
./include/X11/Xaw/LabelP.h
./include/X11/Xaw/List.h
./include/X11/Xaw/ListP.h
./include/X11/Xaw/MenuButtoP.h
./include/X11/Xaw/MenuButton.h
./include/X11/Xaw/MultiSink.h
./include/X11/Xaw/MultiSinkP.h
./include/X11/Xaw/MultiSrc.h
./include/X11/Xaw/MultiSrcP.h
./include/X11/Xaw/Paned.h
./include/X11/Xaw/PanedP.h
./include/X11/Xaw/Panner.h
./include/X11/Xaw/PannerP.h
./include/X11/Xaw/Porthole.h
./include/X11/Xaw/PortholeP.h
./include/X11/Xaw/Print.h
./include/X11/Xaw/PrintSP.h
./include/X11/Xaw/Repeater.h
./include/X11/Xaw/RepeaterP.h
./include/X11/Xaw/Reports.h
./include/X11/Xaw/Scrollbar.h
./include/X11/Xaw/ScrollbarP.h
./include/X11/Xaw/Simple.h
./include/X11/Xaw/SimpleMenP.h
./include/X11/Xaw/SimpleMenu.h
./include/X11/Xaw/SimpleP.h
./include/X11/Xaw/Sme.h
./include/X11/Xaw/SmeBSB.h
./include/X11/Xaw/SmeBSBP.h
./include/X11/Xaw/SmeLine.h
./include/X11/Xaw/SmeLineP.h
./include/X11/Xaw/SmeP.h
./include/X11/Xaw/StripCharP.h
./include/X11/Xaw/StripChart.h
./include/X11/Xaw/Template.c
./include/X11/Xaw/Template.h
./include/X11/Xaw/TemplateP.h
./include/X11/Xaw/Text.h
./include/X11/Xaw/TextP.h
./include/X11/Xaw/TextSink.h
./include/X11/Xaw/TextSinkP.h
./include/X11/Xaw/TextSrc.h
./include/X11/Xaw/TextSrcP.h
./include/X11/Xaw/Tip.h
./include/X11/Xaw/TipP.h
./include/X11/Xaw/Toggle.h
./include/X11/Xaw/ToggleP.h
./include/X11/Xaw/Tree.h
./include/X11/Xaw/TreeP.h
./include/X11/Xaw/VendorEP.h
./include/X11/Xaw/Viewport.h
./include/X11/Xaw/ViewportP.h
./include/X11/Xaw/XawImP.h
./include/X11/Xaw/XawInit.h
./include/X11/Xcms.h
./include/X11/Xcursor/Xcursor.h
./include/X11/Xdefs.h
./include/X11/Xdmcp.h
./include/X11/Xft/Xft.h
./include/X11/Xft/XftCompat.h
./include/X11/Xfuncproto.h
./include/X11/Xfuncs.h
./include/X11/Xlib.h
./include/X11/XlibConf.h
./include/X11/Xlibint.h
./include/X11/Xlocale.h
./include/X11/Xmd.h
./include/X11/Xmu/Atoms.h
./include/X11/Xmu/CharSet.h
./include/X11/Xmu/CloseHook.h
./include/X11/Xmu/Converters.h
./include/X11/Xmu/CurUtil.h
./include/X11/Xmu/CvtCache.h
./include/X11/Xmu/DisplayQue.h
./include/X11/Xmu/Drawing.h
./include/X11/Xmu/Editres.h
./include/X11/Xmu/EditresP.h
./include/X11/Xmu/Error.h
./include/X11/Xmu/ExtAgent.h
./include/X11/Xmu/Initer.h
./include/X11/Xmu/Lookup.h
./include/X11/Xmu/Misc.h
./include/X11/Xmu/StdCmap.h
./include/X11/Xmu/StdSel.h
./include/X11/Xmu/SysUtil.h
./include/X11/Xmu/WidgetNode.h
./include/X11/Xmu/WinUtil.h
./include/X11/Xmu/Xct.h
./include/X11/Xmu/Xmu.h
./include/X11/Xos.h
./include/X11/Xos_r.h
./include/X11/Xosdefs.h
./include/X11/Xpoll.h
./include/X11/XprintAppUtil/xpapputil.h
./include/X11/XprintUtil/xprintutil.h
./include/X11/Xproto.h
./include/X11/Xprotostr.h
./include/X11/Xregion.h
./include/X11/Xresource.h
./include/X11/Xthreads.h
./include/X11/Xutil.h
./include/X11/ap_keysym.h
./include/X11/bitmaps/1x1
./include/X11/bitmaps/2x2
./include/X11/bitmaps/black
./include/X11/bitmaps/boxes
./include/X11/bitmaps/calculator
./include/X11/bitmaps/cntr_ptr
./include/X11/bitmaps/cntr_ptrmsk
./include/X11/bitmaps/cross_weave
./include/X11/bitmaps/dimple1
./include/X11/bitmaps/dimple3
./include/X11/bitmaps/dot
./include/X11/bitmaps/dropbar7
./include/X11/bitmaps/dropbar8
./include/X11/bitmaps/escherknot
./include/X11/bitmaps/flagdown
./include/X11/bitmaps/flagup
./include/X11/bitmaps/flipped_gray
./include/X11/bitmaps/gray
./include/X11/bitmaps/gray1
./include/X11/bitmaps/gray3
./include/X11/bitmaps/grid16
./include/X11/bitmaps/grid2
./include/X11/bitmaps/grid4
./include/X11/bitmaps/grid8
./include/X11/bitmaps/hlines2
./include/X11/bitmaps/hlines3
./include/X11/bitmaps/icon
./include/X11/bitmaps/keyboard16
./include/X11/bitmaps/left_ptr
./include/X11/bitmaps/left_ptrmsk
./include/X11/bitmaps/letters
./include/X11/bitmaps/light_gray
./include/X11/bitmaps/mailempty
./include/X11/bitmaps/mailemptymsk
./include/X11/bitmaps/mailfull
./include/X11/bitmaps/mailfullmsk
./include/X11/bitmaps/mensetmanus
./include/X11/bitmaps/menu10
./include/X11/bitmaps/menu12
./include/X11/bitmaps/menu16
./include/X11/bitmaps/menu6
./include/X11/bitmaps/menu8
./include/X11/bitmaps/noletters
./include/X11/bitmaps/opendot
./include/X11/bitmaps/opendotMask
./include/X11/bitmaps/plaid
./include/X11/bitmaps/right_ptr
./include/X11/bitmaps/right_ptrmsk
./include/X11/bitmaps/root_weave
./include/X11/bitmaps/scales
./include/X11/bitmaps/sipb
./include/X11/bitmaps/star
./include/X11/bitmaps/starMask
./include/X11/bitmaps/stipple
./include/X11/bitmaps/target
./include/X11/bitmaps/terminal
./include/X11/bitmaps/tie_fighter
./include/X11/bitmaps/vlines2
./include/X11/bitmaps/vlines3
./include/X11/bitmaps/weird_size
./include/X11/bitmaps/wide_weave
./include/X11/bitmaps/wingdogs
./include/X11/bitmaps/woman
./include/X11/bitmaps/xfd_icon
./include/X11/bitmaps/xlogo11
./include/X11/bitmaps/xlogo16
./include/X11/bitmaps/xlogo32
./include/X11/bitmaps/xlogo64
./include/X11/bitmaps/xsnow
./include/X11/cursorfont.h
./include/X11/extensions/MITMisc.h
./include/X11/extensions/Print.h
./include/X11/extensions/Printstr.h
./include/X11/extensions/XEVI.h
./include/X11/extensions/XEVIstr.h
./include/X11/extensions/XI.h
./include/X11/extensions/XInput.h
./include/X11/extensions/XIproto.h
./include/X11/extensions/XKB.h
./include/X11/extensions/XKBbells.h
./include/X11/extensions/XKBconfig.h
./include/X11/extensions/XKBfile.h
./include/X11/extensions/XKBgeom.h
./include/X11/extensions/XKBproto.h
./include/X11/extensions/XKBrules.h
./include/X11/extensions/XKBsrv.h
./include/X11/extensions/XKBstr.h
./include/X11/extensions/XKBui.h
./include/X11/extensions/XKM.h
./include/X11/extensions/XKMformat.h
./include/X11/extensions/XLbx.h
./include/X11/extensions/XRes.h
./include/X11/extensions/XResproto.h
./include/X11/extensions/XShm.h
./include/X11/extensions/XTest.h
./include/X11/extensions/Xag.h
./include/X11/extensions/Xagsrv.h
./include/X11/extensions/Xagstr.h
./include/X11/extensions/Xcomposite.h
./include/X11/extensions/Xcup.h
./include/X11/extensions/Xcupstr.h
./include/X11/extensions/Xdamage.h
./include/X11/extensions/Xdbe.h
./include/X11/extensions/Xdbeproto.h
./include/X11/extensions/Xevie.h
./include/X11/extensions/Xeviestr.h
./include/X11/extensions/Xext.h
./include/X11/extensions/Xfixes.h
./include/X11/extensions/Xinerama.h
./include/X11/extensions/Xrandr.h
./include/X11/extensions/Xrender.h
./include/X11/extensions/Xv.h
./include/X11/extensions/XvMC.h
./include/X11/extensions/XvMClib.h
./include/X11/extensions/XvMCproto.h
./include/X11/extensions/Xvlib.h
./include/X11/extensions/Xvproto.h
./include/X11/extensions/bigreqstr.h
./include/X11/extensions/composite.h
./include/X11/extensions/compositeproto.h
./include/X11/extensions/damageproto.h
./include/X11/extensions/damagewire.h
./include/X11/extensions/dpms.h
./include/X11/extensions/dpmsstr.h
./include/X11/extensions/extutil.h
./include/X11/extensions/lbxbuf.h
./include/X11/extensions/lbxbufstr.h
./include/X11/extensions/lbxdeltastr.h
./include/X11/extensions/lbximage.h
./include/X11/extensions/lbxopts.h
./include/X11/extensions/lbxstr.h
./include/X11/extensions/lbxzlib.h
./include/X11/extensions/mitmiscstr.h
./include/X11/extensions/multibuf.h
./include/X11/extensions/multibufst.h
./include/X11/extensions/panoramiXext.h
./include/X11/extensions/panoramiXproto.h
./include/X11/extensions/randr.h
./include/X11/extensions/randrproto.h
./include/X11/extensions/record.h
./include/X11/extensions/recordstr.h
./include/X11/extensions/render.h
./include/X11/extensions/renderproto.h
./include/X11/extensions/saver.h
./include/X11/extensions/saverproto.h
./include/X11/extensions/scrnsaver.h
./include/X11/extensions/security.h
./include/X11/extensions/securstr.h
./include/X11/extensions/shape.h
./include/X11/extensions/shapestr.h
./include/X11/extensions/shmstr.h
./include/X11/extensions/sync.h
./include/X11/extensions/syncstr.h
./include/X11/extensions/vldXvMC.h
./include/X11/extensions/xcmiscstr.h
./include/X11/extensions/xf86bigfont.h
./include/X11/extensions/xf86bigfstr.h
./include/X11/extensions/xf86dga.h
./include/X11/extensions/xf86dga1.h
./include/X11/extensions/xf86dga1str.h
./include/X11/extensions/xf86dgastr.h
./include/X11/extensions/xf86misc.h
./include/X11/extensions/xf86mscstr.h
./include/X11/extensions/xf86vmode.h
./include/X11/extensions/xf86vmstr.h
./include/X11/extensions/xfixesproto.h
./include/X11/extensions/xfixeswire.h
./include/X11/extensions/xtestext1.h
./include/X11/extensions/xteststr.h
./include/X11/extensions/xtrapbits.h
./include/X11/extensions/xtrapddmi.h
./include/X11/extensions/xtrapdi.h
./include/X11/extensions/xtrapemacros.h
./include/X11/extensions/xtraplib.h
./include/X11/extensions/xtraplibp.h
./include/X11/extensions/xtrapproto.h
./include/X11/fonts/FS.h
./include/X11/fonts/FSlib.h
./include/X11/fonts/FSproto.h
./include/X11/fonts/bdfint.h
./include/X11/fonts/bitmap.h
./include/X11/fonts/bufio.h
./include/X11/fonts/fntfil.h
./include/X11/fonts/fntfilio.h
./include/X11/fonts/fntfilst.h
./include/X11/fonts/font.h
./include/X11/fonts/fontenc.h
./include/X11/fonts/fontencc.h
./include/X11/fonts/fontmisc.h
./include/X11/fonts/fontmod.h
./include/X11/fonts/fontshow.h
./include/X11/fonts/fontstruct.h
./include/X11/fonts/fontutil.h
./include/X11/fonts/fontxlfd.h
./include/X11/fonts/fsmasks.h
./include/X11/fonts/pcf.h
./include/X11/keysym.h
./include/X11/keysymdef.h
./include/X11/xpm.h
./include/fontconfig/fcfreetype.h
./include/fontconfig/fcprivate.h
./include/fontconfig/fontconfig.h
./lib/X11/XErrorDB
./lib/X11/XKeysymDB
./lib/X11/Xcms.txt
./lib/X11/locale/C/XI18N_OBJS
./lib/X11/locale/C/XLC_LOCALE
./lib/X11/locale/armscii-8/Compose
./lib/X11/locale/armscii-8/XI18N_OBJS
./lib/X11/locale/armscii-8/XLC_LOCALE
./lib/X11/locale/compose.dir
./lib/X11/locale/el_GR.UTF-8/Compose
./lib/X11/locale/en_US.UTF-8/Compose
./lib/X11/locale/en_US.UTF-8/XI18N_OBJS
./lib/X11/locale/en_US.UTF-8/XLC_LOCALE
./lib/X11/locale/georgian-academy/Compose
./lib/X11/locale/georgian-academy/XI18N_OBJS
./lib/X11/locale/georgian-academy/XLC_LOCALE
./lib/X11/locale/georgian-ps/Compose
./lib/X11/locale/georgian-ps/XI18N_OBJS
./lib/X11/locale/georgian-ps/XLC_LOCALE
./lib/X11/locale/ibm-cp1133/Compose
./lib/X11/locale/ibm-cp1133/XI18N_OBJS
./lib/X11/locale/ibm-cp1133/XLC_LOCALE
./lib/X11/locale/iscii-dev/XI18N_OBJS
./lib/X11/locale/iscii-dev/XLC_LOCALE
./lib/X11/locale/isiri-3342/XI18N_OBJS
./lib/X11/locale/isiri-3342/XLC_LOCALE
./lib/X11/locale/iso8859-1/Compose
./lib/X11/locale/iso8859-1/XI18N_OBJS
./lib/X11/locale/iso8859-1/XLC_LOCALE
./lib/X11/locale/iso8859-10/Compose
./lib/X11/locale/iso8859-10/XI18N_OBJS
./lib/X11/locale/iso8859-10/XLC_LOCALE
./lib/X11/locale/iso8859-11/XI18N_OBJS
./lib/X11/locale/iso8859-11/XLC_LOCALE
./lib/X11/locale/iso8859-13/Compose
./lib/X11/locale/iso8859-13/XI18N_OBJS
./lib/X11/locale/iso8859-13/XLC_LOCALE
./lib/X11/locale/iso8859-14/Compose
./lib/X11/locale/iso8859-14/XI18N_OBJS
./lib/X11/locale/iso8859-14/XLC_LOCALE
./lib/X11/locale/iso8859-15/Compose
./lib/X11/locale/iso8859-15/XI18N_OBJS
./lib/X11/locale/iso8859-15/XLC_LOCALE
./lib/X11/locale/iso8859-2/Compose
./lib/X11/locale/iso8859-2/XI18N_OBJS
./lib/X11/locale/iso8859-2/XLC_LOCALE
./lib/X11/locale/iso8859-3/Compose
./lib/X11/locale/iso8859-3/XI18N_OBJS
./lib/X11/locale/iso8859-3/XLC_LOCALE
./lib/X11/locale/iso8859-4/Compose
./lib/X11/locale/iso8859-4/XI18N_OBJS
./lib/X11/locale/iso8859-4/XLC_LOCALE
./lib/X11/locale/iso8859-5/Compose
./lib/X11/locale/iso8859-5/XI18N_OBJS
./lib/X11/locale/iso8859-5/XLC_LOCALE
./lib/X11/locale/iso8859-6/Compose
./lib/X11/locale/iso8859-6/XI18N_OBJS
./lib/X11/locale/iso8859-6/XLC_LOCALE
./lib/X11/locale/iso8859-7/Compose
./lib/X11/locale/iso8859-7/XI18N_OBJS
./lib/X11/locale/iso8859-7/XLC_LOCALE
./lib/X11/locale/iso8859-8/Compose
./lib/X11/locale/iso8859-8/XI18N_OBJS
./lib/X11/locale/iso8859-8/XLC_LOCALE
./lib/X11/locale/iso8859-9/Compose
./lib/X11/locale/iso8859-9/XI18N_OBJS
./lib/X11/locale/iso8859-9/XLC_LOCALE
./lib/X11/locale/iso8859-9e/Compose
./lib/X11/locale/iso8859-9e/XI18N_OBJS
./lib/X11/locale/iso8859-9e/XLC_LOCALE
./lib/X11/locale/ja.JIS/Compose
./lib/X11/locale/ja.JIS/XI18N_OBJS
./lib/X11/locale/ja.JIS/XLC_LOCALE
./lib/X11/locale/ja.SJIS/Compose
./lib/X11/locale/ja.SJIS/XI18N_OBJS
./lib/X11/locale/ja.SJIS/XLC_LOCALE
./lib/X11/locale/ja/Compose
./lib/X11/locale/ja/XI18N_OBJS
./lib/X11/locale/ja/XLC_LOCALE
./lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
./lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
./lib/X11/locale/ko/Compose
./lib/X11/locale/ko/XI18N_OBJS
./lib/X11/locale/ko/XLC_LOCALE
./lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
./lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
./lib/X11/locale/koi8-c/Compose
./lib/X11/locale/koi8-c/XI18N_OBJS
./lib/X11/locale/koi8-c/XLC_LOCALE
./lib/X11/locale/koi8-r/Compose
./lib/X11/locale/koi8-r/XI18N_OBJS
./lib/X11/locale/koi8-r/XLC_LOCALE
./lib/X11/locale/koi8-u/Compose
./lib/X11/locale/koi8-u/XI18N_OBJS
./lib/X11/locale/koi8-u/XLC_LOCALE
./lib/X11/locale/locale.alias
./lib/X11/locale/locale.dir
./lib/X11/locale/microsoft-cp1251/Compose
./lib/X11/locale/microsoft-cp1251/XI18N_OBJS
./lib/X11/locale/microsoft-cp1251/XLC_LOCALE
./lib/X11/locale/microsoft-cp1255/XI18N_OBJS
./lib/X11/locale/microsoft-cp1255/XLC_LOCALE
./lib/X11/locale/microsoft-cp1256/XI18N_OBJS
./lib/X11/locale/microsoft-cp1256/XLC_LOCALE
./lib/X11/locale/mulelao-1/Compose
./lib/X11/locale/mulelao-1/XI18N_OBJS
./lib/X11/locale/mulelao-1/XLC_LOCALE
./lib/X11/locale/nokhchi-1/XI18N_OBJS
./lib/X11/locale/nokhchi-1/XLC_LOCALE
./lib/X11/locale/pt_BR.UTF-8/Compose
./lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
./lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
./lib/X11/locale/tatar-cyr/XI18N_OBJS
./lib/X11/locale/tatar-cyr/XLC_LOCALE
./lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
./lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
./lib/X11/locale/th_TH/XI18N_OBJS
./lib/X11/locale/th_TH/XLC_LOCALE
./lib/X11/locale/tscii-0/XI18N_OBJS
./lib/X11/locale/tscii-0/XLC_LOCALE
./lib/X11/locale/vi_VN.tcvn/Compose
./lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
./lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
./lib/X11/locale/vi_VN.viscii/Compose
./lib/X11/locale/vi_VN.viscii/XI18N_OBJS
./lib/X11/locale/vi_VN.viscii/XLC_LOCALE
./lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
./lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
./lib/X11/locale/zh_CN.gb18030/Compose
./lib/X11/locale/zh_CN.gb18030/XI18N_OBJS
./lib/X11/locale/zh_CN.gb18030/XLC_LOCALE
./lib/X11/locale/zh_CN.gbk/Compose
./lib/X11/locale/zh_CN.gbk/XI18N_OBJS
./lib/X11/locale/zh_CN.gbk/XLC_LOCALE
./lib/X11/locale/zh_CN/Compose
./lib/X11/locale/zh_CN/XI18N_OBJS
./lib/X11/locale/zh_CN/XLC_LOCALE
./lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS
./lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE
./lib/X11/locale/zh_HK.big5/Compose
./lib/X11/locale/zh_HK.big5/XI18N_OBJS
./lib/X11/locale/zh_HK.big5/XLC_LOCALE
./lib/X11/locale/zh_HK.big5hkscs/Compose
./lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
./lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
./lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
./lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
./lib/X11/locale/zh_TW.big5/Compose
./lib/X11/locale/zh_TW.big5/XI18N_OBJS
./lib/X11/locale/zh_TW.big5/XLC_LOCALE
./lib/X11/locale/zh_TW/Compose
./lib/X11/locale/zh_TW/XI18N_OBJS
./lib/X11/locale/zh_TW/XLC_LOCALE
./lib/gtk-sharp-2.0/gapi-fixup.exe
./lib/gtk-sharp-2.0/gapi-parser.exe
./lib/gtk-sharp-2.0/gapi2xml.pl
./lib/gtk-sharp-2.0/gapi_codegen.exe
./lib/gtk-sharp-2.0/gapi_pp.pl
./lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
./lib/libFS.a
./lib/libFS.so
./lib/libFS.so.6
./lib/libGL.so
./lib/libGL.so.1
./lib/libGLU.so
./lib/libGLU.so.1
./lib/libICE.a
./lib/libICE.so
./lib/libICE.so.6
./lib/libSM.a
./lib/libSM.so
./lib/libSM.so.6
./lib/libX11.a
./lib/libX11.so
./lib/libX11.so.6
./lib/libXRes.a
./lib/libXRes.so
./lib/libXRes.so.1
./lib/libXTrap.a
./lib/libXTrap.so
./lib/libXTrap.so.6
./lib/libXau.a
./lib/libXau.so
./lib/libXau.so.0
./lib/libXaw.so
./lib/libXaw.so.6
./lib/libXaw.so.7
./lib/libXaw.so.8
./lib/libXcomposite.a
./lib/libXcomposite.so
./lib/libXcomposite.so.1
./lib/libXcursor.a
./lib/libXcursor.so
./lib/libXcursor.so.1
./lib/libXdamage.a
./lib/libXdamage.so
./lib/libXdamage.so.1
./lib/libXdmcp.a
./lib/libXdmcp.so
./lib/libXevie.a
./lib/libXevie.so
./lib/libXevie.so.1
./lib/libXext.a
./lib/libXext.so
./lib/libXext.so.6
./lib/libXfixes.a
./lib/libXfixes.so
./lib/libXfixes.so.3
./lib/libXfont.a
./lib/libXfont.so
./lib/libXfont.so.1
./lib/libXft.a
./lib/libXft.la
./lib/libXft.so
./lib/libXft.so.2
./lib/libXi.a
./lib/libXi.so
./lib/libXi.so.6
./lib/libXinerama.a
./lib/libXinerama.so
./lib/libXinerama.so.1
./lib/libXmu.a
./lib/libXmu.so
./lib/libXmu.so.6
./lib/libXmuu.a
./lib/libXmuu.so
./lib/libXmuu.so.1
./lib/libXp.a
./lib/libXp.so
./lib/libXp.so.6
./lib/libXpm.a
./lib/libXpm.so
./lib/libXpm.so.4
./lib/libXprintAppUtil.a
./lib/libXprintUtil.a
./lib/libXrandr.a
./lib/libXrandr.so
./lib/libXrandr.so.2
./lib/libXrender.a
./lib/libXrender.so
./lib/libXrender.so.1
./lib/libXss.a
./lib/libXss.so
./lib/libXss.so.1
./lib/libXt.a
./lib/libXt.so
./lib/libXt.so.6
./lib/libXtst.a
./lib/libXtst.so
./lib/libXtst.so.6
./lib/libXv.a
./lib/libXv.so
./lib/libXv.so.1
./lib/libXvMC.a
./lib/libXvMC.so
./lib/libXvMC.so.1
./lib/libXxf86dga.a
./lib/libXxf86dga.so
./lib/libXxf86dga.so.1
./lib/libXxf86misc.a
./lib/libXxf86misc.so
./lib/libXxf86misc.so.1
./lib/libXxf86vm.a
./lib/libXxf86vm.so
./lib/libXxf86vm.so.1
./lib/libfontconfig.a
./lib/libfontconfig.la
./lib/libfontconfig.so
./lib/libfontconfig.so.1
./lib/libfontenc.a
./lib/libfontenc.so
./lib/libfontenc.so.1
./lib/libgdksharpglue-2.a
./lib/libgdksharpglue-2.la
./lib/libgdksharpglue-2.so
./lib/libgladesharpglue-2.a
./lib/libgladesharpglue-2.la
./lib/libgladesharpglue-2.so
./lib/libglibsharpglue-2.a
./lib/libglibsharpglue-2.la
./lib/libglibsharpglue-2.so
./lib/libgnomesharpglue-2.a
./lib/libgnomesharpglue-2.la
./lib/libgnomesharpglue-2.so
./lib/libgtksharpglue-2.a
./lib/libgtksharpglue-2.la
./lib/libgtksharpglue-2.so
./lib/liboldX.a
./lib/liboldX.so
./lib/liboldX.so.6
./lib/libpangosharpglue-2.a
./lib/libpangosharpglue-2.la
./lib/libpangosharpglue-2.so
./lib/libvtesharpglue-2.a
./lib/libvtesharpglue-2.la
./lib/libvtesharpglue-2.so
./lib/libxkbfile.a
./lib/libxkbfile.so
./lib/libxkbfile.so.1
./lib/libxkbui.a
./lib/libxkbui.so
./lib/libxkbui.so.1
./lib/mono/gac/policy.2.4.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.art-sharp.dll
./lib/mono/gac/policy.2.4.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.atk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.atk-sharp.dll
./lib/mono/gac/policy.2.4.atk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.4.gconf-sharp-peditors.dll
./lib/mono/gac/policy.2.4.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gconf-sharp.dll
./lib/mono/gac/policy.2.4.gdk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.gdk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gdk-sharp.dll
./lib/mono/gac/policy.2.4.glade-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.glade-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.glade-sharp.dll
./lib/mono/gac/policy.2.4.glib-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.glib-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.glib-sharp.dll
./lib/mono/gac/policy.2.4.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gnome-sharp.dll
./lib/mono/gac/policy.2.4.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gnome-vfs-sharp.dll
./lib/mono/gac/policy.2.4.gtk-dotnet/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.gtk-dotnet/0.0.0.0__35e10195dab3c99f/policy.2.4.gtk-dotnet.dll
./lib/mono/gac/policy.2.4.gtk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.gtk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gtk-sharp.dll
./lib/mono/gac/policy.2.4.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.gtkhtml-sharp.dll
./lib/mono/gac/policy.2.4.pango-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.pango-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.pango-sharp.dll
./lib/mono/gac/policy.2.4.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.rsvg-sharp.dll
./lib/mono/gac/policy.2.4.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.config
./lib/mono/gac/policy.2.4.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.4.vte-sharp.dll
./lib/mono/gac/policy.2.6.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.art-sharp.dll
./lib/mono/gac/policy.2.6.art-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.atk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.atk-sharp.dll
./lib/mono/gac/policy.2.6.atk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.gconf-sharp-peditors/0.0.0.0__35e10195dab3c99f/policy.2.6.gconf-sharp-peditors.dll
./lib/mono/gac/policy.2.6.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.gconf-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gconf-sharp.dll
./lib/mono/gac/policy.2.6.gdk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.gdk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gdk-sharp.dll
./lib/mono/gac/policy.2.6.glade-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.glade-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.glade-sharp.dll
./lib/mono/gac/policy.2.6.glib-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.glib-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.glib-sharp.dll
./lib/mono/gac/policy.2.6.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.gnome-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gnome-sharp.dll
./lib/mono/gac/policy.2.6.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.gnome-vfs-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gnome-vfs-sharp.dll
./lib/mono/gac/policy.2.6.gtk-dotnet/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.gtk-dotnet/0.0.0.0__35e10195dab3c99f/policy.2.6.gtk-dotnet.dll
./lib/mono/gac/policy.2.6.gtk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.gtk-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gtk-sharp.dll
./lib/mono/gac/policy.2.6.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.gtkhtml-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.gtkhtml-sharp.dll
./lib/mono/gac/policy.2.6.pango-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.pango-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.pango-sharp.dll
./lib/mono/gac/policy.2.6.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.rsvg-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.rsvg-sharp.dll
./lib/mono/gac/policy.2.6.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.config
./lib/mono/gac/policy.2.6.vte-sharp/0.0.0.0__35e10195dab3c99f/policy.2.6.vte-sharp.dll
./lib/mono/gtk-sharp-2.0/art-sharp.dll
./lib/mono/gtk-sharp-2.0/atk-sharp.dll
./lib/mono/gtk-sharp-2.0/gconf-sharp-peditors.dll
./lib/mono/gtk-sharp-2.0/gconf-sharp.dll
./lib/mono/gtk-sharp-2.0/gdk-sharp.dll
./lib/mono/gtk-sharp-2.0/glade-sharp.dll
./lib/mono/gtk-sharp-2.0/glib-sharp.dll
./lib/mono/gtk-sharp-2.0/gnome-sharp.dll
./lib/mono/gtk-sharp-2.0/gnome-vfs-sharp.dll
./lib/mono/gtk-sharp-2.0/gtk-dotnet.dll
./lib/mono/gtk-sharp-2.0/gtk-sharp.dll
./lib/mono/gtk-sharp-2.0/gtkhtml-sharp.dll
./lib/mono/gtk-sharp-2.0/pango-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.art-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.atk-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.gconf-sharp-peditors.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.gconf-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.gdk-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.glade-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.glib-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.gnome-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.gnome-vfs-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.gtk-dotnet.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.gtk-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.gtkhtml-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.pango-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.rsvg-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.4.vte-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.art-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.atk-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.gconf-sharp-peditors.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.gconf-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.gdk-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.glade-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.glib-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.gnome-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.gnome-vfs-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.gtk-dotnet.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.gtk-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.gtkhtml-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.pango-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.rsvg-sharp.dll
./lib/mono/gtk-sharp-2.0/policy.2.6.vte-sharp.dll
./lib/mono/gtk-sharp-2.0/rsvg-sharp.dll
./lib/mono/gtk-sharp-2.0/vte-sharp.dll
./lib/monodoc/sources/gtk-sharp-docs.source
./lib/monodoc/sources/gtk-sharp-docs.tree
./lib/monodoc/sources/gtk-sharp-docs.zip
./libdata/pkgconfig/art-sharp-2.0.pc
./libdata/pkgconfig/fontconfig.pc
./libdata/pkgconfig/gapi-2.0.pc
./libdata/pkgconfig/gconf-sharp-2.0.pc
./libdata/pkgconfig/glade-sharp-2.0.pc
./libdata/pkgconfig/glib-sharp-2.0.pc
./libdata/pkgconfig/gnome-sharp-2.0.pc
./libdata/pkgconfig/gnome-vfs-sharp-2.0.pc
./libdata/pkgconfig/gtk-dotnet-2.0.pc
./libdata/pkgconfig/gtk-sharp-2.0.pc
./libdata/pkgconfig/gtkhtml-sharp-2.0.pc
./libdata/pkgconfig/rsvg-sharp-2.0.pc
./libdata/pkgconfig/system-tools-backends.pc
./libdata/pkgconfig/vte-sharp-2.0.pc
./libdata/pkgconfig/xcomposite.pc
./libdata/pkgconfig/xcursor.pc
./libdata/pkgconfig/xdamage.pc
./libdata/pkgconfig/xevie.pc
./libdata/pkgconfig/xfixes.pc
./libdata/pkgconfig/xft.pc
./libdata/pkgconfig/xrender.pc
./man/man1/fc-match.1.gz
./man/man3/Xft.3.gz
./man/man5/fonts-conf.5.gz
./man/whatis
./share/aclocal/system-tools-backends.m4
./share/doc/fontconfig/fontconfig-user.html
./share/doc/fontconfig/fontconfig-user.pdf
./share/doc/fontconfig/fontconfig-user.txt
./share/gapi-2.0/art-api.xml
./share/gapi-2.0/atk-api.xml
./share/gapi-2.0/gdk-api.xml
./share/gapi-2.0/glade-api.xml
./share/gapi-2.0/gnome-api.xml
./share/gapi-2.0/gnome-vfs-api.xml
./share/gapi-2.0/gtk-api.xml
./share/gapi-2.0/gtkhtml-api.xml
./share/gapi-2.0/pango-api.xml
./share/gapi-2.0/rsvg-api.xml
./share/gapi-2.0/vte-api.xml
./share/locale/ar/LC_MESSAGES/system-tools-backends.mo
./share/locale/az/LC_MESSAGES/system-tools-backends.mo
./share/locale/bg/LC_MESSAGES/system-tools-backends.mo
./share/locale/bn/LC_MESSAGES/system-tools-backends.mo
./share/locale/bs/LC_MESSAGES/system-tools-backends.mo
./share/locale/ca/LC_MESSAGES/system-tools-backends.mo
./share/locale/cs/LC_MESSAGES/system-tools-backends.mo
./share/locale/da/LC_MESSAGES/system-tools-backends.mo
./share/locale/de/LC_MESSAGES/system-tools-backends.mo
./share/locale/el/LC_MESSAGES/system-tools-backends.mo
./share/locale/en_CA/LC_MESSAGES/system-tools-backends.mo
./share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo
./share/locale/es/LC_MESSAGES/system-tools-backends.mo
./share/locale/eu/LC_MESSAGES/system-tools-backends.mo
./share/locale/fi/LC_MESSAGES/system-tools-backends.mo
./share/locale/fr/LC_MESSAGES/system-tools-backends.mo
./share/locale/gu/LC_MESSAGES/system-tools-backends.mo
./share/locale/hi/LC_MESSAGES/system-tools-backends.mo
./share/locale/hr/LC_MESSAGES/system-tools-backends.mo
./share/locale/hu/LC_MESSAGES/system-tools-backends.mo
./share/locale/id/LC_MESSAGES/system-tools-backends.mo
./share/locale/it/LC_MESSAGES/system-tools-backends.mo
./share/locale/ja/LC_MESSAGES/system-tools-backends.mo
./share/locale/ko/LC_MESSAGES/system-tools-backends.mo
./share/locale/lt/LC_MESSAGES/system-tools-backends.mo
./share/locale/ms/LC_MESSAGES/system-tools-backends.mo
./share/locale/nb/LC_MESSAGES/system-tools-backends.mo
./share/locale/ne/LC_MESSAGES/system-tools-backends.mo
./share/locale/nl/LC_MESSAGES/system-tools-backends.mo
./share/locale/no/LC_MESSAGES/system-tools-backends.mo
./share/locale/pa/LC_MESSAGES/system-tools-backends.mo
./share/locale/pl/LC_MESSAGES/system-tools-backends.mo
./share/locale/pt/LC_MESSAGES/system-tools-backends.mo
./share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo
./share/locale/ro/LC_MESSAGES/system-tools-backends.mo
./share/locale/rw/LC_MESSAGES/system-tools-backends.mo
./share/locale/sk/LC_MESSAGES/system-tools-backends.mo
./share/locale/sq/LC_MESSAGES/system-tools-backends.mo
./share/locale/sr/LC_MESSAGES/system-tools-backends.mo
./share/locale/sr at Latn/LC_MESSAGES/system-tools-backends.mo
./share/locale/sv/LC_MESSAGES/system-tools-backends.mo
./share/locale/ta/LC_MESSAGES/system-tools-backends.mo
./share/locale/th/LC_MESSAGES/system-tools-backends.mo
./share/locale/tr/LC_MESSAGES/system-tools-backends.mo
./share/locale/uk/LC_MESSAGES/system-tools-backends.mo
./share/locale/vi/LC_MESSAGES/system-tools-backends.mo
./share/locale/xh/LC_MESSAGES/system-tools-backends.mo
./share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo
./share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo
./share/setup-tool-backends/files/general_isdn_ppp_options
./share/setup-tool-backends/scripts/boot-conf
./share/setup-tool-backends/scripts/boot-grub.pl
./share/setup-tool-backends/scripts/boot-lilo.pl
./share/setup-tool-backends/scripts/boot-yaboot.pl
./share/setup-tool-backends/scripts/boot.pl
./share/setup-tool-backends/scripts/debug.pl
./share/setup-tool-backends/scripts/dhcpd-conf
./share/setup-tool-backends/scripts/dhcpd.pl
./share/setup-tool-backends/scripts/disks-conf
./share/setup-tool-backends/scripts/display-conf
./share/setup-tool-backends/scripts/file.pl
./share/setup-tool-backends/scripts/filesys.pl
./share/setup-tool-backends/scripts/font-conf
./share/setup-tool-backends/scripts/font.pl
./share/setup-tool-backends/scripts/general.pl
./share/setup-tool-backends/scripts/guess_system.sh
./share/setup-tool-backends/scripts/internetsharing-conf
./share/setup-tool-backends/scripts/ishare.pl
./share/setup-tool-backends/scripts/media.pl
./share/setup-tool-backends/scripts/memory-conf
./share/setup-tool-backends/scripts/mouse-conf
./share/setup-tool-backends/scripts/network-conf
./share/setup-tool-backends/scripts/network.pl
./share/setup-tool-backends/scripts/package-conf
./share/setup-tool-backends/scripts/parse.pl
./share/setup-tool-backends/scripts/partition.pl
./share/setup-tool-backends/scripts/platform.pl
./share/setup-tool-backends/scripts/print-conf
./share/setup-tool-backends/scripts/print.pl
./share/setup-tool-backends/scripts/process.pl
./share/setup-tool-backends/scripts/replace.pl
./share/setup-tool-backends/scripts/report.pl
./share/setup-tool-backends/scripts/service-list.pl
./share/setup-tool-backends/scripts/service.pl
./share/setup-tool-backends/scripts/services-conf
./share/setup-tool-backends/scripts/share.pl
./share/setup-tool-backends/scripts/shares-conf
./share/setup-tool-backends/scripts/time-conf
./share/setup-tool-backends/scripts/tokenizer.pl
./share/setup-tool-backends/scripts/type1inst
./share/setup-tool-backends/scripts/users-conf
./share/setup-tool-backends/scripts/util.pl
./share/setup-tool-backends/scripts/x.pl
./share/setup-tool-backends/scripts/xml.pl

Files that exist both in /usr/local and /usr/X11R6 have been found as shown above. Merging will not continue.
While some such files are safe to remove as they will be regenerated (like /usr/X11R6/man/whatis), some you might want to move away somewhere safe, and some might point to conflicts in ports.
For this script to continue, you need to either move these files away from /usr/X11R6 or delete them. If you don't know what to do about a particular file, ask on x11 at FreeBSD.org mailing list.
The list is saved in /tmp/mergebase.BoRjZpiO.
# 