Attachment 208853 Details for Bug 241694 – v2

[patch] v2

ports.mk.xorg-cat-removal.diff (text/plain), 1.47 KB, created by Niclas Zeising on 2019-11-04 12:28:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2019-11-04 12:28:18 UTC

Size: 1.47 KB

patch

obsolete

>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 516633)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -1354,13 +1354,6 @@
> USES+=	xorg
> .endif
> 
>-.if defined(XORG_CAT)
>-DEV_WARNING+=		"Using XORG_CAT is deprecated, please use USES=xorg-cat:category"
>-.if !defined(USES) || !${USES:Mxorg-cat*}
>-USES+=	xorg-cat:${XORG_CAT}
>-.endif
>-.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
>Index: Mk/bsd.sanity.mk
>===================================================================
>--- Mk/bsd.sanity.mk	(revision 516633)
>+++ Mk/bsd.sanity.mk	(working copy)
>@@ -203,7 +203,8 @@
> 		USE_RCORDER USE_OPENSSL WANT_GNOME RUBYGEM_AUTOPLIST WANT_SDL \
> 		INSTALLS_EGGINFO USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \
> 		USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT \
>-		USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD
>+		USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD \
>+		XORG_CAT
> SANITY_DEPRECATED=	MLINKS \
> 			USE_MYSQL WANT_MYSQL_VER \
> 			PYDISTUTILS_INSTALLNOSINGLE \
>@@ -290,6 +291,7 @@
> USE_QT4_ALT=		USES=qt:5 and USE_QT=${USE_QT4} $beware$ as Qt4 has been removed
> USE_QT5_ALT=		USES=qt:5 and USE_QT=${USE_QT5}
> QT_NONSTANDARD_ALT=	USES=qmake:no_env
>+XORG_CAT_ALT=		USES=xorg-cat:${XORG_CAT}
> 
> .for a in ${SANITY_DEPRECATED}
> .if defined(${a})

Actions: View | Diff

Attachments on bug 241694: 208830 | 208853