Attachment 208953 Details for Bug 241790 – v1

[patch] v1

ports.usesxorg-deprecate.diff (text/plain), 2.07 KB, created by Niclas Zeising on 2019-11-07 20:52:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2019-11-07 20:52:33 UTC

Size: 2.07 KB

patch

obsolete

>diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
>index ebac68554f7c..4a6b70191af3 100644
>--- a/Mk/bsd.port.mk
>+++ b/Mk/bsd.port.mk
>@@ -1349,11 +1349,6 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
> .include "${PORTSDIR}/Mk/bsd.local.mk"
> .endif
> 
>-.if defined(USE_XORG) && (!defined(USES) || !${USES:Mxorg})
>-DEV_WARNING+=		"Using USE_XORG alone is deprecated, please use USES=xorg"
>-USES+=	xorg
>-.endif
>-
> .if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))
> DEV_WARNING+=		"Using USE_PHP alone is deprecated, please use USES=php"
> USES+=	php
>@@ -1398,11 +1393,6 @@ DEV_WARNING+=	"Using USE_MATE alone is deprecated, please add USES=mate."
> USES+=	mate
> .endif
> 
>-.if defined(USE_GL) && (!defined(USES) || !${USES:Mgl})
>-DEV_WARNING+=	"Using USE_GL alone is deprecated, please add USES=gl."
>-USES+=	gl
>-.endif
>-
> .if defined(USE_SDL) && (!defined(USES) || !${USES:Msdl})
> DEV_WARNING+=	"Using USE_SDL alone is deprecated, please add USES=sdl."
> USES+=	sdl
>@@ -1931,11 +1921,6 @@ _FORCE_POST_PATTERNS=	rmdir kldxref mkfontscale mkfontdir fc-cache \
> .include "${PORTSDIR}/Mk/bsd.local.mk"
> .endif
> 
>-.if defined(USE_XORG) && (!defined(USES) || ( defined(USES) && !${USES:Mxorg} ))
>-DEV_WARNING+=	"Using USE_XORG alone is deprecated, please use USES=xorg"
>-_USES_POST+=	xorg
>-.endif
>-
> .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1)
> .include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
> .endif
>diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
>index ec2758e70aab..a01697cf9320 100644
>--- a/Mk/bsd.sanity.mk
>+++ b/Mk/bsd.sanity.mk
>@@ -176,6 +176,14 @@ DEV_ERROR+=	"PORTEPOCH needs to be an integer \>= 0"
> DEV_ERROR+=	"PORTREVISION needs to be an integer \>= 0"
> .endif
> 
>+.if defined(USE_XORG) && (!defined(USES) || !${USES:Mxorg})
>+DEV_ERROR+=	"USE_XORG without USES=xorg is no longer supported"
>+.endif
>+
>+.if defined(USE_GL) && (!defined(USES) || !${USES:Mgl})
>+DEV_ERROR+=	"USE_GL without USES=gl is no longer supported"
>+.endif
>+
> # Whitelist of options helper lookalikes that should not be reported on:
> _OPTIONS_HELPERS_SEEN+=	OPENSSL_LDFLAGS
> _BROKEN_OPTIONS_HELPERS=

Actions: View | Diff

Attachments on bug 241790: 208953 | 208987 | 208992