From owner-freebsd-x11@FreeBSD.ORG  Mon Jul  5 08:57:00 2004
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: freebsd-x11@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3223016A4CE; Mon,  5 Jul 2004 08:57:00 +0000 (GMT)
Received: from fillmore.dyndns.org (port-212-202-50-15.dynamic.qsc.de
	[212.202.50.15])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E2F0B43D1D; Mon,  5 Jul 2004 08:56:59 +0000 (GMT)
	(envelope-from eikemeier@fillmore-labs.com)
Received: from dhcp-14.local ([172.16.0.14] helo=localhost)
	by fillmore.dyndns.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34 (FreeBSD))
	id 1BhPHU-000KoX-1o; Mon, 05 Jul 2004 10:56:58 +0200
Date: Mon, 5 Jul 2004 10:57:27 +0200
Content-Type: text/plain; charset=US-ASCII; format=flowed
Mime-Version: 1.0 (Apple Message framework v482)
To: Eric Anholt <eta@lclark.edu>
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
In-Reply-To: <1088990415.987.9.camel@leguin>
Message-Id: <575A8BB2-CE61-11D8-9FE1-00039312D914@fillmore-labs.com>
Content-Transfer-Encoding: 7bit
User-Agent: KMail/1.5.9
cc: ports@freebsd.org
cc: x11@freebsd.org
Subject: Re: dependency fixing for xorg stuff
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jul 2004 08:57:00 -0000

Eric Anholt wrote:

> http://people.freebsd.org/~anholt/X/xorg-conv-1.diff
>
> The link above is a patch to fix up dependencies and make xorg the
> default X for FreeBSD 5.2 and up.  [...]


May I suggest to just define a default X_WINDOW_SYSTEM in bsd.port.mk, 
and make a new category meta, with the following ports:

* port `meta/imake', used with 
`BUILD_DEPENDS+=imake:${PORTSDIR}/meta/imake', Makefile contents:

META_PROVIDES=		imake

.include <bsd.port.pre.mk>
.if ${X_WINDOW_SYSTEM:L} == xorg
RUN_DEPENDS=		${META_PROVIDES}:${PORTSDIR}/devel/imake-6
.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
RUN_DEPENDS=		${META_PROVIDES}:${PORTSDIR}/devel/imake-4
.elif ${X_WINDOW_SYSTEM:L} == xfree86-3
RUN_DEPENDS=		${META_PROVIDES}:${PORTSDIR}/x11/XFree86
.else
BROKEN=			Unknown X_WINDOW_SYSTEM: ${X_WINDOW_SYSTEM}
.endif
.include <bsd.port.post.mk>



* port `meta/X11-libraries', used with 
`LIB_DEPENDS+=X11.6:${PORTSDIR}/meta/X11-libraries', Makefile contents:

META_LIB_PROVIDES=	X11.6

.include <bsd.port.pre.mk>
.if ${X_WINDOW_SYSTEM:L} == xorg
LIB_DEPENDS=	${META_LIB_PROVIDES}:${PORTSDIR}/x11/xorg-libraries
.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
LIB_DEPENDS=	${META_LIB_PROVIDES}:${PORTSDIR}/x11/XFree86-4-libraries
.elif ${X_WINDOW_SYSTEM:L} == xfree86-3
LIB_DEPENDS=	${META_LIB_PROVIDES}:${PORTSDIR}/x11/XFree86
.else
BROKEN=			Unknown X_WINDOW_SYSTEM: ${X_WINDOW_SYSTEM}
.endif
.include <bsd.port.post.mk>



* port `meta/openldap-client', used with 
`LIB_DEPENDS+=ldap:${PORTSDIR}/meta/openldap-client', Makefile contents:

META_LIB_PROVIDES=	ldap

.include <bsd.port.pre.mk>
.if ${WANT_OPENLDAP_VER} == 22
LIB_DEPENDS=		${META_LIB_PROVIDES}.202:${PORTSDIR}/net/openldap22-client
.elif  ${WANT_OPENLDAP_VER} == 21
LIB_DEPENDS=		${META_LIB_PROVIDES}.2:${PORTSDIR}/net/openldap21-client
.else
BROKEN=			Unknown WANT_OPENLDAP_VER: ${WANT_OPENLDAP_VER}
.endif
.include <bsd.port.post.mk>


-Oliver