diff options
| author | dumbbell <dumbbell@FreeBSD.org> | 2014-12-23 07:04:17 +0800 |
|---|---|---|
| committer | dumbbell <dumbbell@FreeBSD.org> | 2014-12-23 07:04:17 +0800 |
| commit | 5bebe6a62d9ab7796738b8cf47e8cea68cb6f008 (patch) | |
| tree | c4aafe980f6f5ff7e0903fde047107a9dd8c45d5 /x11 | |
| parent | 8fed23cf2459f63a11abf55cc9928fe2cf6cea15 (diff) | |
| download | freebsd-ports-gnome-5bebe6a62d9ab7796738b8cf47e8cea68cb6f008.tar.gz freebsd-ports-gnome-5bebe6a62d9ab7796738b8cf47e8cea68cb6f008.tar.zst freebsd-ports-gnome-5bebe6a62d9ab7796738b8cf47e8cea68cb6f008.zip | |
Final removal of WITH_NEW_XORG
This knob was turned on for all version of FreeBSD in r369875
(2014-10-03) and officially deprecated. Since then, it was gradually
removed from many ports when they needed an update.
x11-servers/xorg-server was the last major user of this knob. The port
was updated to xserver 1.14 in r374982 (2014-12-19). The update got rid
of the knob, clearing the path to the final removal.
This commit changes ports who were checking for WITH_NEW_XORG and remove
its handling from bsd.port.mk.
While here, two sanity checks are added to warn user about WITH_KMS and
WITH_NEW_XORG which have no effect now.
Differential Revision: https://reviews.freebsd.org/D1351
Reviewed by: antoine, bapt, kwm
Approved by: portmgr (antoine, bapt), kwm
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kde4-workspace/Makefile | 4 | ||||
| -rw-r--r-- | x11/xorg-minimal/Makefile | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 5a3fd6090fec..96e1510d8fd9 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -107,10 +107,6 @@ WALLPAPERS_RUN_DEPENDS= ${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:$ .include <bsd.port.options.mk> -.ifndef(WITH_NEW_XORG) -IGNORE= requires modern libGL. Please, set WITH_NEW_XORG and update your ports -.endif - .if !exists(/usr/lib/libutempter.so) LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter .endif diff --git a/x11/xorg-minimal/Makefile b/x11/xorg-minimal/Makefile index 3c7bc30b5c89..591b77b43032 100644 --- a/x11/xorg-minimal/Makefile +++ b/x11/xorg-minimal/Makefile @@ -32,7 +32,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/drivers/intel_drv.so:${PORTSDIR}/x11 RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/drivers/${VIDEO_DRIVER}_drv.so:${PORTSDIR}/x11-drivers/xf86-video-${VIDEO_DRIVER} .endif -.if ${VIDEO_DRIVER} == intel && defined(WITH_NEW_XORG) +.if ${VIDEO_DRIVER} == intel RUN_DEPENDS+= ${LOCALBASE}/lib/va/i965_drv_video.so:${PORTSDIR}/multimedia/libva-intel-driver .endif |