From owner-freebsd-ports@FreeBSD.ORG  Thu Jul  1 03:56:09 2004
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D27E016A4CE
	for <freebsd-ports@freebsd.org>; Thu,  1 Jul 2004 03:56:09 +0000 (GMT)
Received: from mx1.mail.ru (mx1.mail.ru [194.67.23.121])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6146E43D39
	for <freebsd-ports@freebsd.org>; Thu,  1 Jul 2004 03:56:07 +0000 (GMT)
	(envelope-from bogorodskiy@inbox.ru)
Received: from [194.186.150.25] (port=49313 helo=inbox.ru)
	by mx1.mail.ru with esmtp 
	id 1Bfsg2-000ANI-00; Thu, 01 Jul 2004 07:55:59 +0400
Date: Thu, 1 Jul 2004 07:55:52 +0400
From: Roman Bogorodskiy <bogorodskiy@inbox.ru>
To: "Conrad J. Sabatier" <conrads@cox.net>
Message-ID: <20040701035552.GB658@lame.novel.ru>
References: <200407010027.i610RXjs030999@dolphin.localnet.net>
	<XFMail.20040630220544.conrads@cox.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="KFztAG8eRSV9hGtP"
Content-Disposition: inline
In-Reply-To: <XFMail.20040630220544.conrads@cox.net>
X-GPG: http://phptags.sourceforge.net/key
User-Agent: Mutt/1.5.6i
cc: freebsd-ports@freebsd.org
Subject: Re: Simplifying life with X.org and ports dependencies
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jul 2004 03:56:09 -0000


--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--