Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Jul 2004 10:57:27 +0200
From:      Oliver Eikemeier <eikemeier@fillmore-labs.com>
To:        Eric Anholt <eta@lclark.edu>
Cc:        x11@freebsd.org
Subject:   Re: dependency fixing for xorg stuff
Message-ID:  <575A8BB2-CE61-11D8-9FE1-00039312D914@fillmore-labs.com>
In-Reply-To: <1088990415.987.9.camel@leguin>

next in thread | previous in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?575A8BB2-CE61-11D8-9FE1-00039312D914>