Date: Sat, 8 Sep 2007 15:34:00 +0200 From: Fabian Keil <freebsd-listen@fabiankeil.de> To: Florent Thoumie <flz@xbsd.org> Cc: ports@FreeBSD.org, x11@FreeBSD.org Subject: Re: Updating X.org FreeBSD ports to 7.3 Message-ID: <20070908153400.4909b8cd@localhost> In-Reply-To: <46E1E44B.6010500@xbsd.org> References: <46E1E44B.6010500@xbsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_0LQ+CUIiMYklveSSSGpFuQy Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Florent Thoumie <flz@xbsd.org> wrote: > As some of you may know already, X.org released X11R7.3 yesterday. Since= =20 > we already made the move to modular ports for 7.2, the work to update=20 > ports to 7.3 was much faster. >=20 > It's not likely to cause any major breakage but I'd like to get some=20 > feedback (from users and pointyhat) before I commit the update, so it=20 > probably won't reach the CVS repository before wednesday. >=20 > Here's a diff against current ports tree: >=20 > 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' =3D=3D=3D> Cleaning for xorg-nestserver-1.4,1 =3D=3D=3D> Extracting for xorg-nestserver-1.4,1 =3D> MD5 Checksum OK for xorg/xserver/xorg-server-1.4.tar.bz2. =3D> SHA256 Checksum OK for xorg/xserver/xorg-server-1.4.tar.bz2. =3D=3D=3D> Patching for xorg-nestserver-1.4,1 =3D=3D=3D> xorg-nestserver-1.4,1 depends on file: /usr/local/libdata/pkgc= onfig/xf86driproto.pc - found [...] =3D=3D=3D> xorg-nestserver-1.4,1 depends on file: /usr/local/libdata/pkgc= onfig/xext.pc - found =3D=3D=3D> xorg-nestserver-1.4,1 depends on file: /usr/local/libdata/pkgc= onfig/pixman-1.pc - not found =3D=3D=3D> Verifying install for /usr/local/libdata/pkgconfig/pixman-1.p= c in /usr/ports/x11/pixman =3D=3D=3D> Extracting for pixman-0.9.5 [...] =3D> MD5 Checksum OK for xorg/lib/pixman-0.9.5.tar.bz2. =3D> SHA256 Checksum OK for xorg/lib/pixman-0.9.5.tar.bz2. =3D=3D=3D> Patching for pixman-0.9.5 =3D=3D=3D> pixman-0.9.5 depends on file: /usr/local/bin/intltool-extract = - found =3D=3D=3D> pixman-0.9.5 depends on executable: pkg-config - found =3D=3D=3D> pixman-0.9.5 depends on shared library: atk-1.0.0 - found =3D=3D=3D> pixman-0.9.5 depends on shared library: glib-2.0.0 - found =3D=3D=3D> pixman-0.9.5 depends on shared library: gtk-x11-2.0.0 - found =3D=3D=3D> pixman-0.9.5 depends on shared library: pango-1.0.0 - found =3D=3D=3D> Configuring for pixman-0.9.5 [...] =3D=3D=3D> Installing for pixman-0.9.5 =3D=3D=3D> pixman-0.9.5 depends on executable: pkg-config - found =3D=3D=3D> Generating temporary packing list =3D=3D=3D> Checking if x11/pixman already installed =3D=3D=3D> 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. After copying it to the expected location I got: =3D=3D=3D> xorg-server-1.4,1 depends on file: /usr/local/bin/perl5.8.8 - = found =3D=3D=3D> Patching for xorg-server-1.4,1 =3D=3D=3D> xorg-server-1.4,1 depends on file: /usr/local/bin/perl5.8.8 - = found =3D=3D=3D> Applying extra patch /usr/ports/x11-servers/xorg-server/files/e= xtra-patch-gcc42 1 out of 1 hunks failed--saving rejects to hw/xfree86/scanpci/Makefile.in.r= ej *** Error code 1 Which I solved by removing the ".if ${OSVERSION} > 700042" check. Afterwards xorg-nestserver's configure script complained about: Requested 'compositeproto >=3D 0.4' but version of CompositeProto is 0.3.1 and xorg-server's about: Requested 'inputproto >=3D 1.4.2' but version of InputProto is 1.3.2 After updating inputproto and compositeproto manually the update continued without problems. Fabian --Sig_0LQ+CUIiMYklveSSSGpFuQy Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFG4qTJBYqIVf93VJ0RAlPPAJsHfM/B2421ODjx/CyiV7xtOmWpuACeItat opXMwdMQmHmZcO7Of15tVkE= =dxlu -----END PGP SIGNATURE----- --Sig_0LQ+CUIiMYklveSSSGpFuQy--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070908153400.4909b8cd>