From nobody Wed Nov 17 09:21:43 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A7A8718A0F3B; Wed, 17 Nov 2021 09:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HvHVv4HCgz3J5W; Wed, 17 Nov 2021 09:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 72F681E7B2; Wed, 17 Nov 2021 09:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AH9Lhah076975; Wed, 17 Nov 2021 09:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AH9LhWu076974; Wed, 17 Nov 2021 09:21:43 GMT (envelope-from git) Date: Wed, 17 Nov 2021 09:21:43 GMT Message-Id: <202111170921.1AH9LhWu076974@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: fca135644fd0 - main - bsd.port.mk: clean up DEV_WARNINGS about migrations that are over List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fca135644fd02bc1e2c81dc59f61c93148f64d5d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fca135644fd02bc1e2c81dc59f61c93148f64d5d commit fca135644fd02bc1e2c81dc59f61c93148f64d5d Author: Baptiste Daroussin AuthorDate: 2021-11-17 08:34:09 +0000 Commit: Baptiste Daroussin CommitDate: 2021-11-17 09:20:04 +0000 bsd.port.mk: clean up DEV_WARNINGS about migrations that are over --- Mk/Uses/gl.mk | 3 --- Mk/Uses/motif.mk | 3 --- Mk/bsd.port.mk | 40 ---------------------------------------- 3 files changed, 46 deletions(-) diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk index 8ecd95a4403a..6bfba723773e 100644 --- a/Mk/Uses/gl.mk +++ b/Mk/Uses/gl.mk @@ -46,10 +46,7 @@ LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS} .endfor # We only need to include xorg.mk if we want USE_XORG modules -# USES+=xorg does not provide any functionality, it just silences an error -# message about USES=xorg not being set .if defined(USE_XORG) && !empty(USE_XORG) -USES+= xorg .include "${USESDIR}/xorg.mk" .endif diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk index 8828ceb4c4d1..3e0f4e9036f2 100644 --- a/Mk/Uses/motif.mk +++ b/Mk/Uses/motif.mk @@ -26,10 +26,7 @@ MOTIFLIB?= -L${LOCALBASE}/lib -lXm MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" # We only need to include xorg.mk if we want USE_XORG modules -# USES+=xorg does not provide any functionality, it just silences an error -# message about USES=xorg not being set .if defined(USE_XORG) && !empty(USE_XORG) -USES+= xorg .include "${USESDIR}/xorg.mk" .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 317b65f748e2..ad50a4af5334 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1377,16 +1377,6 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg .sinclude "${odir}/Mk/bsd.overlay.mk" .endfor -.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 -.endif - .if defined(USE_JAVA) .include "${PORTSDIR}/Mk/bsd.java.mk" .endif @@ -1416,26 +1406,6 @@ USES+= apache:${USE_APACHE:C/2([0-9])/2.\1/g} .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif -.if (defined(USE_GNOME) || defined(INSTALLS_ICONS)) && empty(USES:Mgnome) -DEV_WARNING+= "Using USE_GNOME alone is deprecated, please add USES=gnome." -USES+= gnome -.endif - -.if defined(USE_MATE) && empty(USES:Mmate) -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 -.endif - .if defined(USE_MYSQL) USE_MYSQL:= ${USE_MYSQL:N[yY][eE][sS]:Nclient} .if defined(WANT_MYSQL_VER) @@ -1970,11 +1940,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ .sinclude "${odir}/Mk/bsd.overlay.mk" .endfor -.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(USE_GSTREAMER1) .include "${PORTSDIR}/Mk/bsd.gstreamer.mk" .endif @@ -1987,11 +1952,6 @@ _USES_POST+= xorg .include "${PORTSDIR}/Mk/bsd.ocaml.mk" .endif -.if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} )) -DEV_WARNING+= "Using USE_PHP alone is deprecated, please use USES=php" -_USES_POST+= php -.endif - .if defined(USE_WX) || defined(USE_WX_NOT) .include "${PORTSDIR}/Mk/bsd.wx.mk" .endif