From owner-freebsd-ports@FreeBSD.ORG Mon Sep 10 02:45:46 2007 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C53816A419; Mon, 10 Sep 2007 02:45:46 +0000 (UTC) (envelope-from beech@freebsd.org) Received: from stargate.alaskaparadise.com (137-42-178-69.gci.net [69.178.42.137]) by mx1.freebsd.org (Postfix) with ESMTP id 2ECD813C465; Mon, 10 Sep 2007 02:45:46 +0000 (UTC) (envelope-from beech@freebsd.org) Received: by stargate.alaskaparadise.com (Postfix, from userid 0) id 49F4282B4; Sun, 9 Sep 2007 18:25:56 -0800 (AKDT) From: Beech Rintoul To: Florent Thoumie Date: Sun, 9 Sep 2007 18:25:46 -0800 User-Agent: KMail/1.9.7 References: <46E1E44B.6010500@xbsd.org> <20070908153400.4909b8cd@localhost> <1189287549.21395.5.camel@bbeng-laptop.acs.internap.com> In-Reply-To: <1189287549.21395.5.camel@bbeng-laptop.acs.internap.com> X-Face: jC2w\k*Q1\0DA2Q0Eh&BrP/Rt2M,^2O#R07VoT98m*>miQF9%Bi9vy`F6cPjwEe?m,)=?utf-8?q?2=0A=09X=3FM=5C=3AOE9QgZ?="xT3/n3,3MJ7N=Cfkmi%f(w^~X"SUxn>; 27NO; C+)g[7J`$G*SN>{<=?utf-8?q?O=3Bg7=7C=0A=09o=7D=265A=5D4?=@7D`=Eb@Zs1Ln814?]|k@'bG=.Ca"[|8+_.OsNAo8!#?4u MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200709091825.52704.beech@freebsd.org> Cc: ports@freebsd.org, x11@freebsd.org Subject: Re: Updating X.org FreeBSD ports to 7.3 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Beech Rintoul List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2007 02:45:46 -0000 On Saturday 08 September 2007, Robert C. Noland III said: > On Sat, 2007-09-08 at 15:34 +0200, Fabian Keil wrote: > > Florent Thoumie wrote: > > > As some of you may know already, X.org released X11R7.3 > > > yesterday. Since we already made the move to modular ports for > > > 7.2, the work to update ports to 7.3 was much faster. > > > > > > It's not likely to cause any major breakage but I'd like to get > > > some feedback (from users and pointyhat) before I commit the > > > update, so it probably won't reach the CVS repository before > > > wednesday. > > > > > > Here's a diff against current ports tree: > > > > > > http://dump.xbsd.org/freebsd/xorg73.diff.gz > > > > I run into a few problems with this on > > FreeBSD 7.0-CURRENT #22: Thu Aug 30 21:45:49 CEST 2007, > > the first being: > > > > ---> Building '/usr/ports/x11-servers/xorg-nestserver' > > ===> Cleaning for xorg-nestserver-1.4,1 > > ===> Extracting for xorg-nestserver-1.4,1 > > => MD5 Checksum OK for xorg/xserver/xorg-server-1.4.tar.bz2. > > => SHA256 Checksum OK for xorg/xserver/xorg-server-1.4.tar.bz2. > > ===> Patching for xorg-nestserver-1.4,1 > > ===> xorg-nestserver-1.4,1 depends on file: > > /usr/local/libdata/pkgconfig/xf86driproto.pc - found [...] > > ===> xorg-nestserver-1.4,1 depends on file: > > /usr/local/libdata/pkgconfig/xext.pc - found ===> > > xorg-nestserver-1.4,1 depends on file: > > /usr/local/libdata/pkgconfig/pixman-1.pc - not found ===> > > Verifying install for /usr/local/libdata/pkgconfig/pixman-1.pc in > > /usr/ports/x11/pixman ===> Extracting for pixman-0.9.5 > > [...] > > => MD5 Checksum OK for xorg/lib/pixman-0.9.5.tar.bz2. > > => SHA256 Checksum OK for xorg/lib/pixman-0.9.5.tar.bz2. > > ===> Patching for pixman-0.9.5 > > ===> pixman-0.9.5 depends on file: > > /usr/local/bin/intltool-extract - found ===> pixman-0.9.5 > > depends on executable: pkg-config - found ===> pixman-0.9.5 > > depends on shared library: atk-1.0.0 - found ===> pixman-0.9.5 > > depends on shared library: glib-2.0.0 - found ===> pixman-0.9.5 > > depends on shared library: gtk-x11-2.0.0 - found ===> > > pixman-0.9.5 depends on shared library: pango-1.0.0 - found ===> > > Configuring for pixman-0.9.5 > > [...] > > ===> Installing for pixman-0.9.5 > > ===> pixman-0.9.5 depends on executable: pkg-config - found > > ===> Generating temporary packing list > > ===> Checking if x11/pixman already installed > > ===> pixman-0.9.5 is already installed > > You may wish to ``make deinstall'' and install this port > > again by ``make reinstall'' to upgrade it properly. > > If you really wish to overwrite the old port of x11/pixman > > without deleting it first, set the variable > > "FORCE_PKG_REGISTER" in your environment or the "make install" > > command line. > > > > The problem seems to be that xorg-nestserver checks for > > /usr/local/libdata/pkgconfig/pixman-1.pc which is also referenced > > in pixman's pkg-plist, but pixman actually install it to > > /usr/local/lib/pkgconfig/pixman-1.pc. > > Attached is a patch to the patch for pixman... > > robert. > > > After copying it to the expected location I got: > > > > ===> xorg-server-1.4,1 depends on file: > > /usr/local/bin/perl5.8.8 - found ===> Patching for > > xorg-server-1.4,1 > > ===> xorg-server-1.4,1 depends on file: > > /usr/local/bin/perl5.8.8 - found ===> Applying extra patch > > /usr/ports/x11-servers/xorg-server/files/extra-patch-gcc42 1 out > > of 1 hunks failed--saving rejects to > > hw/xfree86/scanpci/Makefile.in.rej *** Error code 1 > > > > Which I solved by removing the ".if ${OSVERSION} > 700042" check. > > > > Afterwards xorg-nestserver's configure script complained about: > > Requested 'compositeproto >= 0.4' but version of CompositeProto > > is 0.3.1 and xorg-server's about: > > Requested 'inputproto >= 1.4.2' but version of InputProto is > > 1.3.2 > > > > After updating inputproto and compositeproto manually > > the update continued without problems. I had to rebuild those and my video driver, but other than that it builds and works as advertised :-) Beech -- --------------------------------------------------------------------------------------- Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org /"\ ASCII Ribbon Campaign | FreeBSD Since 4.x \ / - NO HTML/RTF in e-mail | http://www.freebsd.org X - NO Word docs in e-mail | Latest Release: / \ - http://www.FreeBSD.org/releases/6.2R/announce.html ---------------------------------------------------------------------------------------