From owner-svn-ports-head@FreeBSD.ORG Wed Mar 12 11:07:55 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B489D399; Wed, 12 Mar 2014 11:07:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 94C28C5A; Wed, 12 Mar 2014 11:07:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2CB7tL7034036; Wed, 12 Mar 2014 11:07:55 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2CB7tGV034035; Wed, 12 Mar 2014 11:07:55 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403121107.s2CB7tGV034035@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 12 Mar 2014 11:07:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347973 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 11:07:55 -0000 Author: bapt Date: Wed Mar 12 11:07:55 2014 New Revision: 347973 URL: http://svnweb.freebsd.org/changeset/ports/347973 QAT: https://qat.redports.org/buildarchive/r347973/ Log: Simplify bsd.sanity.mk a bit Reviewed by: mat Modified: head/Mk/bsd.sanity.mk Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Wed Mar 12 10:37:40 2014 (r347972) +++ head/Mk/bsd.sanity.mk Wed Mar 12 11:07:55 2014 (r347973) @@ -3,10 +3,6 @@ # MAINTAINER: portmgr@FreeBSD.org # -.if defined(USE_GMAKE) -DEV_WARNING+= "USE_GMAKE is deprecated, consider using USES=gmake" -.endif - .if defined(WITHOUT_NLS) WARNING+= "WITHOUT_NLS is deprecated use OPTIONS_UNSET=NLS instead" .endif @@ -23,22 +19,6 @@ WARNING+= "WITHOUT_NLS is deprecated use DEV_ERROR+= "USE_PERL5=yes is unsupported, please use USES=perl5 instead" .endif -.if defined(PERL_CONFIGURE) -DEV_ERROR+= "PERL_CONFIGURE is unsupported, please use USES=perl5 along with USE_PERL5=configure" -.endif - -.if defined(PERL_MODBUILD) -DEV_ERROR+= "PERL_MODBUILD is unsupported, please use USES=perl5 along with USE_PERL5=modbuild" -.endif - -.if defined(USE_PERL5_BUILD) -DEV_ERROR+= "USE_PERL5_BUILD is unsupported, please use USES=perl5 along with USE_PERL5=build" -.endif - -.if defined(USE_PERL5_RUN) -DEV_ERROR+= "USE_PERL5_RUN is unsupported, please use USES=perl5 along with USE_PERL5=run" -.endif - .if defined(USE_KDEBASE_VER) DEV_ERROR+= "USE_KDEBASE_VER is unsupported" .endif @@ -59,30 +39,6 @@ DEV_ERROR+= "LIB_DEPENDS contains unsupp DEV_ERROR+= "RUN_DEPENDS contains unsupported relative path to dependency" .endif -.if defined(USE_DISPLAY) -DEV_WARNING+= "USE_DISPLAY is deprecated, please use USES=display" -.endif - -.if defined(USE_ICONV) -DEV_ERROR+= "USE_ICONV is unsupported, please use USES=iconv" -.endif - -.if defined(USE_CMAKE) -DEV_ERROR+= "USE_CMAKE is unsupported, please use USES=cmake" -.endif - -.if defined(USE_READLINE) -DEV_ERROR+= "USE_READLINE is unsupported, please use USES=readline" -.endif - -.if defined(USE_FUSE) -DEV_ERROR+= "USE_FUSE is unupported, please use USES=fuse" -.endif - -.if defined(USE_GETTEXT) -DEV_ERROR+= "USE_GETTEXT is unsupported, replaced by USES=gettext" -.endif - .if defined(USE_GNOME) && ${USE_GNOME:Mpkgconfig} DEV_ERROR+= "USE_GNOME=pkgconfig is unsupported, please use USES=pkgconfig" .endif @@ -112,10 +68,6 @@ DEV_WARNING+= "Please use the new format DEV_ERROR+= "USE_TCL and USE_TK are no longer supported, please use USES=tcl or USES=tk" .endif -.if defined(USE_SCONS) -DEV_WARNING+= "USE_SCONS=yes is deprecated, please use USES=scons" -.endif - # print warning if no reason given for NO_STAGE .if defined(NO_STAGE) DEV_WARNING+= "NO_STAGE is deprecated, convert port to stage directory:" @@ -160,30 +112,41 @@ DEV_WARNING+= "USE_PYDISTUTILS=easy_inst DEV_WARNING+= "PYDISTUTILS_PKGNAME has no effect for USE_PYDISTUTILS=yes and PYDISTUTILS_AUTOPLIST=yes" .endif -.if defined(USE_OPENAL) -DEV_ERROR+= "USE_OPENAL is unsupported, please use USES=openal" -.endif - -.if defined(USE_FAM) -DEV_ERROR+= "USE_FAM is unsupported, please use USES=fam" -.endif - -.if defined(USE_MAKESELF) -DEV_ERROR+= "USE_MAKESELF is unsupported, please use USES=makeself" -.endif - -.if defined(USE_ZIP) -DEV_ERROR+= 'USE_ZIP is unsupported, please use USES=zip' -.endif - -.if defined(USE_LHA) -DEV_ERROR+= 'USE_LHA is unsupported, please use USES=lha' +UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ + USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \ + USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \ + USE_GETTEXT +DEPRECATED= USE_XZ USE_BZIP2 USE_GMAKE USE_SCONS + +USE_OPENAL_ALT= USES=openal +USE_FAM_ALT= USES=fam +USE_MAKESELF_ALT= USES=makeself +USE_ZIP_ALT= USES=zip +USE_LHA_ALT= USES=lha +USE_BZIP2_ALT= USES=tar:bzip2 +USE_XZ_ALT= USES=tar.xz +USE_CMAKE_ALT= USES=cmake +USE_READLINE_ALT= USES=readline +USE_ICONV_ALT= USES=iconv +USE_GMAKE_ALT= USES=gmake +PERL_CONFIGURE_ALT= USES=perl5 along with USE_PERL5=configure +PERL_MODBUILD_ALT= USES=perl5 along with USE_PERL5=modbuild +USE_PERL5_BUILD_ALT= USES=perl5 along with USE_PERL5=build +USE_PERL5_RUN_ALT= USES=perl5 along with USE_PERL5=run +USE_DISPLAY_ALT= USES=display +USE_FUSE_ALT= USES=fuse +USE_GETTEXT_ALT= USES=gettext +USE_SCONS_ALT= USES=scons + +.for a in ${DEPRECATED} +.if defined(${a}) +DEV_WARNING+= "${a} is deprecated, please use ${${a}_ALT}" .endif +.endfor -.if defined(USE_XZ) -DEV_WARNING+= 'USE_XZ is deprecated, please use USES=tar:xz' +.for a in ${UNSUPPORTED} +.if defined(${a}) +DEV_ERROR+= "${a} is unsupported, please use ${${a}_ALT}" .endif - -.if defined(USE_BZIP2) -DEV_WARNING+= 'USE_BZIP2 is deprecated, please use USES=tar:bzip2' +.endfor .endif