Date: Thu, 1 Jul 2004 07:55:52 +0400 From: Roman Bogorodskiy <bogorodskiy@inbox.ru> To: "Conrad J. Sabatier" <conrads@cox.net> Cc: freebsd-ports@freebsd.org Subject: Re: Simplifying life with X.org and ports dependencies Message-ID: <20040701035552.GB658@lame.novel.ru> In-Reply-To: <XFMail.20040630220544.conrads@cox.net> References: <200407010027.i610RXjs030999@dolphin.localnet.net> <XFMail.20040630220544.conrads@cox.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--KFztAG8eRSV9hGtP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Conrad wrote:
> Ah, OK, I see that in /usr/ports/Mk/bsd.port.mk we have the following:
>=20
> .if defined(USE_XLIB)
> .if ${XFREE86_VERSION} =3D=3D 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+=3D X11.6:${PORTSDIR}/x11/XFree86
> .endif
> .else
> LIB_DEPENDS+=3D 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+=3D--x-libraries=3D${X11BASE}/lib
> --x-includes=3D${X11BASE}/include
> .endif
> .endif
Some time ago I've sent a such patch to anholt@, but he havn't answered
yet. =20
--- 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+=3D X11.6:${PORTSDIR}/x11/XFree86
.endif
.else
+.if !defined(USE_XORG)
LIB_DEPENDS+=3D X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+.else
+LIB_DEPENDS+=3D X11.6:${PORTSDIR}/x11/xorg-libraries
+.endif
.endif
# Add explicit X options to avoid problems with false positives in configu=
re
.if defined(GNU_CONFIGURE)
So, XFree <-> XOrg can be switched by adding USE_XORG=3D1 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.=20
-Roman Bogorodskiy
--KFztAG8eRSV9hGtP
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iQCVAwUBQOOLSIB0WzgdqspGAQIcWgQAxyyK2pCEYXooOdphfS5FN5ALFO/U9mnI
xfnhy7egKAE8ccbk+XAX/NyN8iRlMVDz3Uf4D0+sfXaRJjlbhrHihtrhCOKGshZG
LxEX+RH7YJFsae8HJLduA5n4USRv19YJlKcozSDiZd0eYcLwUcPj3AyZ930fhHrt
RjMYZNJcH50=
=tj5G
-----END PGP SIGNATURE-----
--KFztAG8eRSV9hGtP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040701035552.GB658>