b0VIM 8.1]0Tzeisingvivi.daemonic.se~zeising/FreeBSD/diff/ports/ports.usesxorg-deprecate.difflatin1 3210#"! Utp;ad;> wom f Y Q O   6 * J e ] ,  S K I b% _BROKEN_OPTIONS_HELPERS= _OPTIONS_HELPERS_SEEN+= OPENSSL_LDFLAGS # Whitelist of options helper lookalikes that should not be reported on:++.endif+DEV_ERROR+= "USE_GL without USES=gl is no longer supported"+.if defined(USE_GL) && !empty(USE_GL) && (!defined(USES) || !${USES:Mgl})++.endif+DEV_ERROR+= "USE_XORG without USES=xorg is no longer supported"+.if defined(USE_XORG) && !empty(USE_XORG) && (!defined(USES) || !${USES:Mxorg}) .endif DEV_ERROR+= "PORTREVISION needs to be an integer \>= 0"@@ -176,6 +176,14 @@ DEV_ERROR+= "PORTEPOCH needs to be an integer \>= 0"+++ b/Mk/bsd.sanity.mk--- a/Mk/bsd.sanity.mkindex ec2758e70aab..be039c181565 100644diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk .endif .include "${PORTSDIR}/Mk/bsd.gstreamer.mk" .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1)--.endif-_USES_POST+= xorg-DEV_WARNING+= "Using USE_XORG alone is deprecated, please use USES=xorg"-.if defined(USE_XORG) && (!defined(USES) || ( defined(USES) && !${USES:Mxorg} )) .endif .include "${PORTSDIR}/Mk/bsd.local.mk"@@ -1931,11 +1921,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ USES+= sdl DEV_WARNING+= "Using USE_SDL alone is deprecated, please add USES=sdl." .if defined(USE_SDL) && (!defined(USES) || !${USES:Msdl})--.endif-USES+= gl-DEV_WARNING+= "Using USE_GL alone is deprecated, please add USES=gl."-.if defined(USE_GL) && (!defined(USES) || !${USES:Mgl}) .endif USES+= mate@@ -1398,11 +1393,6 @@ DEV_WARNING+= "Using USE_MATE alone is deprecated, please add USES=mate." USES+= php DEV_WARNING+= "Using USE_PHP alone is deprecated, please use USES=php" .if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))--.endif-USES+= xorg-DEV_WARNING+= "Using USE_XORG alone is deprecated, please use USES=xorg"-.if defined(USE_XORG) && (!defined(USES) || !${USES:Mxorg}) .endif .include "${PORTSDIR}/Mk/bsd.local.mk"@@ -1349,11 +1349,6 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg+++ b/Mk/bsd.port.mk--- a/Mk/bsd.port.mkindex ebac68554f7c..4a6b70191af3 100644diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk