diff options
| author | reed <reed@pkgsrc.org> | 2004-04-27 21:32:57 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2004-04-27 21:32:57 +0000 |
| commit | 4995fe597dae9fa510db3709d15a8591ee85ae05 (patch) | |
| tree | 4d0d2ec8e3cae4ade0b7567c1cab03c44d713207 /x11/XFree86-libs | |
| parent | dd82c3374a510a82280213f437ea3bd18955650b (diff) | |
| download | pkgsrc-4995fe597dae9fa510db3709d15a8591ee85ae05.tar.gz | |
By default, it made an automatic CONFLICTS with MesaLibs [sic].
Fixed so now only CONFLICTS with MesaLib when X11ROOT (which is
${PREFIX}/${X11ROOT_PREFIX}) is same as LOCALBASE.
(Fixed typo there too.)
Diffstat (limited to 'x11/XFree86-libs')
| -rw-r--r-- | x11/XFree86-libs/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile index b74e1c9146e..23ba6593c1f 100644 --- a/x11/XFree86-libs/Makefile +++ b/x11/XFree86-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/03/28 22:06:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.6 2004/04/27 21:32:57 reed Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-libs-${XF_VER} @@ -19,8 +19,8 @@ DEPENDS= imake>=4.4.0:../../x11/imake .include "../../mk/bsd.prefs.mk" -.if ${X11PREFIX} == ${LOCALBASE} -CONFLICTS+= MesaLibs-[0-9]* +.if ${X11ROOT} == ${LOCALBASE} +CONFLICTS+= MesaLib-[0-9]* .endif USE_BUILDLINK3= yes |