diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2007-08-29 11:40:01 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2007-08-29 11:40:01 +0000 |
| commit | b775ccae3989928e3a5993de62f4edc47039fb29 (patch) | |
| tree | acfdf6f92364f4cfb183bef6291a6b688342a36a /x11-drivers/xorg-drivers | |
| parent | 7cc3a0cbf1add79208b045c9ee9b855922ec2938 (diff) | |
| download | ports-b775ccae3989928e3a5993de62f4edc47039fb29.tar.gz ports-b775ccae3989928e3a5993de62f4edc47039fb29.zip | |
Add intel driver to VIDEO_OFF and check for conflict with i810.
Suggested by: Oliver Schonefeld
Notes
Notes:
svn path=/head/; revision=198488
Diffstat (limited to 'x11-drivers/xorg-drivers')
| -rw-r--r-- | x11-drivers/xorg-drivers/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index 3416adca610d..17418fe27406 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-drivers PORTVERSION= 7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MASTER_SITES= # none DISTFILES= # none @@ -34,7 +34,7 @@ VIDEO_OFF= apm ark \ dummy \ fbdev \ glint \ - i128 i740 imstt \ + i128 i740 imstt intel \ mga \ neomagic newport nsc \ rendition \ @@ -73,6 +73,10 @@ OPTIONS+= ${i:U} "Install ${i} ${type} driver" ${default} .include <bsd.port.pre.mk> +.if defined(WITH_INTEL) && !defined(WITHOUT_I810) +IGNORE= You can't choose both i810 and intel drivers as they are conflicting +.endif + .for default in on off . for type in input video . for i in ${${type:U}_${default:U}} |