From owner-freebsd-x11@FreeBSD.ORG Thu Jun 7 01:08:08 2007 Return-Path: X-Original-To: freebsd-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 CC3F416A400 for ; Thu, 7 Jun 2007 01:08:08 +0000 (UTC) (envelope-from mark.lubratt@indeq.com) Received: from smtpauth13.prod.mesa1.secureserver.net (smtpauth13.prod.mesa1.secureserver.net [64.202.165.37]) by mx1.freebsd.org (Postfix) with SMTP id 82EE313C457 for ; Thu, 7 Jun 2007 01:08:08 +0000 (UTC) (envelope-from mark.lubratt@indeq.com) Received: (qmail 11327 invoked from network); 7 Jun 2007 00:41:28 -0000 Received: from unknown (209.98.250.135) by smtpauth13.prod.mesa1.secureserver.net (64.202.165.37) with ESMTP; 07 Jun 2007 00:41:28 -0000 Mime-Version: 1.0 (Apple Message framework v752.3) Content-Transfer-Encoding: 7bit Message-Id: Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed To: freebsd-x11@freebsd.org From: Mark Lubratt Date: Wed, 6 Jun 2007 19:41:25 -0500 X-Mailer: Apple Mail (2.752.3) Subject: Xorg portupgrade problem 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: Thu, 07 Jun 2007 01:08:08 -0000 Hello! I'm currently running FreeBSD 6.2 (and also somewhat of a X novice). Last week I began a port upgrade of all of my installed ports. I tried following the upgrade instructions in the /usr/ports/UPDATING file regarding the xorg upgrade to 7.2. I completed the steps the best that I could (I'm still having some gstreamer upgrade problems). I finally made it to the part where mergebase.sh is run. Mergebase.sh cited a list of files that it claims are duplicated. At the suggestions of the UPDATING file, I'm checking here to see what my next step should be. mergebase.sh output: http://www.indeq.com/mergebase.zMry6rN3 Could anyone please point me in the right direction? Thanks! Mark