diff options
| author | hira <hira> | 2005-01-24 17:24:08 +0000 |
|---|---|---|
| committer | hira <hira> | 2005-01-24 17:24:08 +0000 |
| commit | cc2926b2f75c1a087545575fe5719b3e62902a87 (patch) | |
| tree | 81064a6d456411be76aedb212d0306eba6610669 /x11 | |
| parent | 64242f3d4c034ea94c82ab291e1bc9e6980c2cdf (diff) | |
| download | pkgsrc-cc2926b2f75c1a087545575fe5719b3e62902a87.tar.gz | |
Don't use imake to get the supported drivers. It does not work
before installing imake.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xorg-server/Makefile | 3 | ||||
| -rw-r--r-- | x11/xorg-server/options.mk | 34 |
2 files changed, 24 insertions, 13 deletions
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index 4bd6dc8ffaa..346c88cc6e9 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/01/24 10:57:27 hira Exp $ +# $NetBSD: Makefile,v 1.15 2005/01/24 17:24:08 hira Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} @@ -49,7 +49,6 @@ SUBST_MESSAGE.stubs= "Fixing stubs Makefile." USE_PERL5= build # Yeah, we need this :-) .endif -BUILDLINK_FILES.xorg-libs+= ${X11ROOT_PREFIX}/lib/X11/config/* .include "options.mk" post-install: diff --git a/x11/xorg-server/options.mk b/x11/xorg-server/options.mk index 3b22bdc3175..1e840d5aa6b 100644 --- a/x11/xorg-server/options.mk +++ b/x11/xorg-server/options.mk @@ -1,23 +1,35 @@ -# $NetBSD: options.mk,v 1.1 2005/01/24 10:57:27 hira Exp $ +# $NetBSD: options.mk,v 1.2 2005/01/24 17:24:08 hira Exp $ + +_COMMONCARDDRIVERS= apm ark ati chips cirrus cyrix dummy glint i128 mga \ + neomagic nv rendition s3 s3virge savage siliconmotion \ + sis tdfx tga trident tseng vesa vga +_NOTX86_64CARDDRIVERS= i740 i810 imstt newport nsc via vmware +_LINUXCARDDRIVERS= fbdev v4l + +_ALLCARDDRIVERS= ${_COMMONCARDDRIVERS} ${_NOTX86_64CARDDRIVERS} \ + ${_LINUXCARDDRIVERS} + +_OSCARDDRIVERS= # defined + +# Not tested with the other x86_64 platforms. +.if empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) +_OSCARDDRIVERS+= ${_NOTX86_64CARDDRIVERS} +.endif + +.if ${OPSYS} == "Linux" +_OSCARDDRIVERS+= ${_LINUXCARDDRIVERS} +.endif PKG_OPTIONS_VAR= PKG_OPTIONS.xorg-server -PKG_SUPPORTED_OPTIONS!= ${X11BASE}/bin/imake -I${X11BASE}/lib/X11/config \ - -f ${FILESDIR}/Imakefile.drivers -s - | \ - ${EGREP} "^CARDDRIVERS=" | \ - ${AWK} '{$$1=""; print $$0}' +PKG_SUPPORTED_OPTIONS= ${_COMMONCARDDRIVERS} ${_OSCARDDRIVERS} PKG_DEFAULT_OPTIONS= ${PKG_SUPPORTED_OPTIONS} .include "../../mk/bsd.options.mk" -ALLCARDDRIVERS= apm ark ati chips cirrus cyrix dummy fbdev glint i128 \ - i740 i810 imstt mga neomagic newport nsc nv rendition \ - rendition s3 s3virge savage siliconmotion sis tdfx tga \ - trident tseng v4l vesa vga via vmware - .for _drv in ${PKG_OPTIONS} PLIST_SUBST+= CARDDRIVER.${_drv}= .endfor -.for _drv in ${ALLCARDDRIVERS} +.for _drv in ${_ALLCARDDRIVERS} . if empty(PLIST_SUBST:MCARDDRIVER\.${_drv}=) PLIST_SUBST+= CARDDRIVER.${_drv}="@comment " . endif |