Simplifying life with X.org and ports dependencies

[Roman Bogorodskiy]

 Conrad wrote:

> Ah, OK, I see that in /usr/ports/Mk/bsd.port.mk we have the following:
> 
> .if defined(USE_XLIB)
> .if ${XFREE86_VERSION} == 3
> # Don't try to build XFree86-3 even if ALWAYS_BUILD_DEPENDS is defined
> --
> # it's just too big....
> .if !defined(ALWAYS_BUILD_DEPENDS)
> LIB_DEPENDS+=   X11.6:${PORTSDIR}/x11/XFree86
> .endif
> .else
> LIB_DEPENDS+=   X11.6:${PORTSDIR}/x11/XFree86-4-libraries
> .endif
> # Add explicit X options to avoid problems with false positives in
> configure
> .if defined(GNU_CONFIGURE)
> CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib
> --x-includes=${X11BASE}/include
> .endif
> .endif

Some time ago I've sent a such patch to anholt@, but he havn't answered
yet.  

--- bsd.port.mk.orig	Thu Jul  1 07:43:43 2004
+++ bsd.port.mk	Thu Jul  1 07:45:06 2004
@@ -1511,7 +1511,11 @@
 LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/XFree86
 .endif
 .else
+.if !defined(USE_XORG)
 LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+.else
+LIB_DEPENDS+=	X11.6:${PORTSDIR}/x11/xorg-libraries
+.endif
 .endif
 # Add explicit X options to avoid problems with false positives in configure
 .if defined(GNU_CONFIGURE)

So, XFree <-> XOrg can be switched by adding USE_XORG=1 to make.conf.
But I hasn't tested it enough. Anyway, this can couse some problmes
since some ports may use straight deps on XFree, like i.e. fluxbox-devel
before the lastest commit. 

-Roman Bogorodskiy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 305 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20040701/20f613fa/attachment.bin