cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retire XORG_CAT

Browse Source 
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)
This commit is contained in:
Niclas Zeising 2019-11-04 18:08:20 +00:00
parent 2b429f298a
commit 5b67b34c82
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=516730
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mk/bsd.port.mk
View File

@ -1354,13 +1354,6 @@ DEV_WARNING+= "Using USE_XORG alone is deprecated, please use USES=xorg"
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

4
Mk/bsd.sanity.mk
View File

@ -203,7 +203,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
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})