Date: Mon, 4 Nov 2019 18:08:20 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516730 - head/Mk Message-ID: <201911041808.xA4I8KG9035043@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Mon Nov 4 18:08:20 2019 New Revision: 516730 URL: https://svnweb.freebsd.org/changeset/ports/516730 Log: Retire XORG_CAT Retire XORG_CAT, it is not needed since all ports has moved to use USES=xorg-cat. Add a check to bsd.sanity.mk causing an error if any port happens to set it in the future. PR: 241694 Approved by: portmgr (mat) Modified: head/Mk/bsd.port.mk head/Mk/bsd.sanity.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Nov 4 17:26:59 2019 (r516729) +++ head/Mk/bsd.port.mk Mon Nov 4 18:08:20 2019 (r516730) @@ -1354,13 +1354,6 @@ DEV_WARNING+= "Using USE_XORG alone is deprecated, pl 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 Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Mon Nov 4 17:26:59 2019 (r516729) +++ head/Mk/bsd.sanity.mk Mon Nov 4 18:08:20 2019 (r516730) @@ -203,7 +203,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF US 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 @@ WANT_FPC_ALL_ALT= USES=fpc:all 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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911041808.xA4I8KG9035043>