diff options
| author | xtraeme <xtraeme> | 2004-10-22 06:31:42 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-10-22 06:31:42 +0000 |
| commit | 65a17c1e5c98a1b24d989e5772363fd794b1f3ec (patch) | |
| tree | a82c8b55a398910c135a018a416d38f35c86dc4d /x11 | |
| parent | 1fb9d46b7dc5bf3bafd835f719dcb2bacb70020a (diff) | |
| download | pkgsrc-65a17c1e5c98a1b24d989e5772363fd794b1f3ec.tar.gz | |
The CONFLICTS lines for xextensions, libx11 and libXaw should be
only when X11BASE = LOCALBASE, otherwise they are useless, because
the xorg packages install the files into ${X11ROOT} aka ${PREFIX}/xorg
and not ${PREFIX}.
Bump PKGREVISION because the binary has been modified.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xorg-libs/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index cbea9c16f70..ea7d213b4e7 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2004/10/09 09:32:19 xtraeme Exp $ +# $NetBSD: Makefile,v 1.9 2004/10/22 06:31:42 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-libs-${XORG_VER} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \ @@ -12,10 +12,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org Libraries -CONFLICTS+= xextensions-[0-9]* -CONFLICTS+= libX11-[0-9]* -CONFLICTS+= libXau-[0-9]* - BUILD_DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake .include "../../mk/bsd.prefs.mk" @@ -24,6 +20,9 @@ BUILD_DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake .if ${X11ROOT} == ${LOCALBASE} CONFLICTS+= MesaLib-[0-9]* glu-[0-9]* +CONFLICTS+= xextensions-[0-9]* +CONFLICTS+= libX11-[0-9]* +CONFLICTS+= libXau-[0-9]* .endif USE_BUILDLINK3= yes |