diff options
| author | wiz <wiz> | 2013-08-29 19:59:29 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2013-08-29 19:59:29 +0000 |
| commit | f6b467a9c93930e388d2aa0f2be19f72d5c3fad7 (patch) | |
| tree | 2e077b04c7c3db9873d781694dae9d33c7a40412 | |
| parent | 0ac565706a9cb1cbc642fb753d77d3e5a533708d (diff) | |
| download | pkgsrc-f6b467a9c93930e388d2aa0f2be19f72d5c3fad7.tar.gz | |
Rename xf86-video-ati v6 to xf86-video-ati6 and register conflicts.
| -rw-r--r-- | x11/xf86-video-ati/Makefile | 4 | ||||
| -rw-r--r-- | x11/xf86-video-ati6/Makefile | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile index dbe994b7b42..37b45ceeba7 100644 --- a/x11/xf86-video-ati/Makefile +++ b/x11/xf86-video-ati/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/05/16 06:02:58 richard Exp $ +# $NetBSD: Makefile,v 1.22 2013/08/29 19:59:29 wiz Exp $ DISTNAME= xf86-video-ati-7.1.0 CATEGORIES= x11 @@ -11,6 +11,8 @@ COMMENT= Modular Xorg ATI Radeon video driver CONFIGURE_ARGS+= --enable-dri +CONFLICTS+= xf86-video-ati6-[0-9]* + USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake pkg-config diff --git a/x11/xf86-video-ati6/Makefile b/x11/xf86-video-ati6/Makefile index c71e209cc84..22df8635571 100644 --- a/x11/xf86-video-ati6/Makefile +++ b/x11/xf86-video-ati6/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2013/06/18 17:13:11 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2013/08/29 19:59:29 wiz Exp $ DISTNAME= xf86-video-ati-6.14.6 +PKGNAME= ${DISTNAME:S/ati/ati6/} CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -11,6 +12,8 @@ COMMENT= Modular Xorg ATI Radeon video driver (v6) CONFIGURE_ARGS+= --enable-dri +CONFLICTS+= xf86-video-ati-[0-9]* + USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_TOOLS+= gmake pkg-config |