Thu Aug 29 19:59:29 2013 UTC ()
Rename xf86-video-ati v6 to xf86-video-ati6 and register conflicts.


(wiz)
diff -r1.21 -r1.22 pkgsrc/x11/xf86-video-ati/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/xf86-video-ati6/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/x11/xf86-video-ati/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xf86-video-ati/Makefile 2013/05/16 06:02:58 1.21
+++ pkgsrc/x11/xf86-video-ati/Makefile 2013/08/29 19:59:29 1.22
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1# $NetBSD: Makefile,v 1.21 2013/05/16 06:02:58 richard Exp $ 1# $NetBSD: Makefile,v 1.22 2013/08/29 19:59:29 wiz Exp $
2 2
3DISTNAME= xf86-video-ati-7.1.0 3DISTNAME= xf86-video-ati-7.1.0
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=driver/} 5MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://xorg.freedesktop.org/ 9HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= Modular Xorg ATI Radeon video driver 10COMMENT= Modular Xorg ATI Radeon video driver
11 11
12CONFIGURE_ARGS+= --enable-dri 12CONFIGURE_ARGS+= --enable-dri
13 13
 14CONFLICTS+= xf86-video-ati6-[0-9]*
 15
14USE_LIBTOOL= YES 16USE_LIBTOOL= YES
15GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
16USE_TOOLS+= gmake pkg-config 18USE_TOOLS+= gmake pkg-config
17 19
18.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
19 21
20.if ${OPSYS} == "SunOS" 22.if ${OPSYS} == "SunOS"
21CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 23CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
22.endif 24.endif
23 25
24.include "../../x11/modular-xorg-server/buildlink3.mk" 26.include "../../x11/modular-xorg-server/buildlink3.mk"
25 27
26.include "../../devel/zlib/buildlink3.mk" 28.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.2 -r1.3 pkgsrc/x11/xf86-video-ati6/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xf86-video-ati6/Makefile 2013/06/18 17:13:11 1.2
+++ pkgsrc/x11/xf86-video-ati6/Makefile 2013/08/29 19:59:29 1.3
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1# $NetBSD: Makefile,v 1.2 2013/06/18 17:13:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2013/08/29 19:59:29 wiz Exp $
2 2
3DISTNAME= xf86-video-ati-6.14.6 3DISTNAME= xf86-video-ati-6.14.6
 4PKGNAME= ${DISTNAME:S/ati/ati6/}
4CATEGORIES= x11 5CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=driver/} 6MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= Modular Xorg ATI Radeon video driver (v6) 11COMMENT= Modular Xorg ATI Radeon video driver (v6)
11 12
12CONFIGURE_ARGS+= --enable-dri 13CONFIGURE_ARGS+= --enable-dri
13 14
 15CONFLICTS+= xf86-video-ati-[0-9]*
 16
14USE_LIBTOOL= YES 17USE_LIBTOOL= YES
15GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
16USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
17 20
18.include "options.mk" 21.include "options.mk"
19.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
20 23
21.if ${OPSYS} == "SunOS" 24.if ${OPSYS} == "SunOS"
22CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 25CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
23.endif 26.endif
24 27
25.include "../../x11/modular-xorg-server/buildlink3.mk" 28.include "../../x11/modular-xorg-server/buildlink3.mk"
26 29