On Sat, 2007-09-08 at 15:34 +0200, Fabian Keil wrote:
> Florent Thoumie <[EMAIL PROTECTED]> 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.
>
> Fabian
--- Makefile.orig 2007-09-08 17:37:39.000000000 -0400
+++ Makefile 2007-09-08 17:31:44.000000000 -0400
@@ -15,6 +15,11 @@
XORG_CAT= lib
WANT_GNOME= yes
+post-patch:
+ ${REINPLACE_CMD} -e \
+ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|' \
+ ${WRKSRC}/Makefile.in
+
.include <bsd.port.pre.mk>
.if ${HAVE_GNOME:Mgtk20} != ""
_______________________________________________
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
