diff options
| author | Jean-Sébastien Pédron <dumbbell@FreeBSD.org> | 2014-12-22 23:04:17 +0000 |
|---|---|---|
| committer | Jean-Sébastien Pédron <dumbbell@FreeBSD.org> | 2014-12-22 23:04:17 +0000 |
| commit | 3c9a1d11c2210dcdc42a63b04622220896daba7a (patch) | |
| tree | c4aafe980f6f5ff7e0903fde047107a9dd8c45d5 /Mk | |
| parent | f04a3f032a75a0a2a7378cf4edf2becfbdacaf25 (diff) | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 8 | ||||
| -rw-r--r-- | Mk/bsd.sanity.mk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index bd7b9cca4a61..216271b378e5 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1225,14 +1225,6 @@ _OSVERSION_MAJOR= ${OSVERSION:C/([0-9]?[0-9])([0-9][0-9])[0-9]{3}/\1/} .error OSREL (${OSREL}) and OSVERSION (${OSVERSION}) do not agree on major version number. .endif -# Enable new xorg for FreeBSD versions after Radeon KMS was imported unless -# WITHOUT_NEW_XORG is set. -.if !defined(WITHOUT_NEW_XORG) -WITH_NEW_XORG?= yes -.else -.undef WITH_NEW_XORG -.endif - # Only define tools here (for transition period with between pkg tools) .include "${PORTSDIR}/Mk/bsd.commands.mk" diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 722b022f8dfa..17a80a2599dc 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -7,6 +7,14 @@ WARNING+= "WITHOUT_NLS is deprecated use OPTIONS_UNSET=NLS instead" .endif +.if defined(WITH_NEW_XORG) || defined(WITHOUT_NEW_XORG) +WARNING+= "WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no effect" +.endif + +.if defined(WITH_KMS) || defined(WITHOUT_KMS) +WARNING+= "WITH_KMS was removed and has no effect" +.endif + #.if defined(PKGORIGIN) #.for _c in ${CATEGORIES} #_CAT?= ${_c} |