From owner-svn-ports-all@FreeBSD.ORG Thu Dec 26 06:51:04 2013 Return-Path: Delivered-To: svn-ports-all@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 1A3752D9; Thu, 26 Dec 2013 06:51:04 +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 0629D16D3; Thu, 26 Dec 2013 06:51:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBQ6p3Pn034827; Thu, 26 Dec 2013 06:51:03 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBQ6p3vM034825; Thu, 26 Dec 2013 06:51:03 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312260651.rBQ6p3vM034825@svn.freebsd.org> From: Antoine Brodin Date: Thu, 26 Dec 2013 06:51:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337472 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Dec 2013 06:51:04 -0000 Author: antoine Date: Thu Dec 26 06:51:03 2013 New Revision: 337472 URL: http://svnweb.freebsd.org/changeset/ports/337472 Log: - Remove USE_OPENAL code - Add a developer error to bsd.sanity.mk if it is used Approved by: portmgr (bapt) Modified: head/Mk/bsd.port.mk head/Mk/bsd.sanity.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Dec 26 06:42:43 2013 (r337471) +++ head/Mk/bsd.port.mk Thu Dec 26 06:51:03 2013 (r337472) @@ -371,12 +371,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_SDL - If set, this port uses the sdl libraries. # See bsd.sdl.mk for more information. ## -# USE_OPENAL - If set, this port relies on the OpenAL package. -# Legal values are: al, soft, si, alut. -# If set to an unknown value, the port is marked broken. -# WANT_OPENAL - User-specific OpenAL wishes. -# Legal values are: soft, si. The default is soft. -## # USE_OPENSSL - If set, this port relies on the OpenSSL package. ## # USE_OPENLDAP - If set, this port uses the OpenLDAP libraries. @@ -1747,83 +1741,6 @@ MAKE_ENV+= ${b}="${${b}}" .include "${PORTSDIR}/Mk/bsd.ldap.mk" .endif -.if defined(USE_OPENAL) -_OPENAL_ALL= al si soft alut -_OPENAL_LIBS= si soft -# Default choice. -_DEFAULT_OPENAL= soft - -_OPENAL_SOFT= openal.1:${PORTSDIR}/audio/openal-soft -_OPENAL_SI= openal.0:${PORTSDIR}/audio/openal -_OPENAL_ALUT= alut.1:${PORTSDIR}/audio/freealut - -.if exists(${LOCALBASE}/lib/libopenal.a) -_HAVE_OPENAL= si -.elif exists(${LOCALBASE}/bin/openal-info) -_HAVE_OPENAL= soft -.endif - -.if ${USE_OPENAL} == "yes" -# Be friendly. -USE_OPENAL= ${_DEFAULT_OPENAL} -.endif - -__USED_OPENAL= -_USE_OPENAL= -.for component in ${USE_OPENAL} -.if ${__USED_OPENAL:M${component}} == "" -__USED_OPENAL+= ${component} - -.if ${_OPENAL_ALL:M${component}} == "" -BROKEN= OPENAL mismatch: unknown component ${component} -.elif ${_OPENAL_ALL:M${component}} == "al" - -# Check if the user wish matches the found OpenAL system. -.if defined(WANT_OPENAL) && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${WANT_OPENAL} -BROKEN= OPENAL mismatch: ${_HAVE_OPENAL} is installed, but ${WANT_OPENAL} desired -.endif # WANT_OPENAL - -.if defined(_HAVE_OPENAL) -_OPENAL_SYSTEM= ${_HAVE_OPENAL} -.elif defined(WANT_OPENAL) -_OPENAL_SYSTEM= ${WANT_OPENAL} -.else -_OPENAL_SYSTEM= ${_DEFAULT_OPENAL} -.endif # _HAVE_OPENAL - -_USE_OPENAL+= ${_OPENAL_${_OPENAL_SYSTEM:U}} - -.else # ${_OPENAL_ALL:M${component}} == "" - -.if ${_OPENAL_LIBS:M${component}} == ${component} -# Check for the system implementation to use. -.if defined(WANT_OPENAL) && ${WANT_OPENAL} != ${component} -BROKEN= OPENAL mismatch: wants to use ${component}, while you wish to use ${WANT_OPENAL} -.endif -.if defined(_OPENAL_SYSTEM) -BROKEN= OPENAL mismatch: cannot use ${component} and al together. -.endif -.if defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${component} -BROKEN= OPENAL mismatch: wants to use ${component}, but ${_HAVE_OPENAL} is installed -.endif - -_OPENAL_SYSTEM= ${component} - -.endif # ${_OPENAL_LIBS:M${component}} == ${component} - -_USE_OPENAL+= ${_OPENAL_${component:U}} - -.endif # ${_OPENAL_ALL:M${component}} == "" - -.endif # ${__USED_OPENAL:M${component} == "" -.endfor # component in ${USE_OPENAL} - -.for dep in ${_USE_OPENAL} -LIB_DEPENDS+= ${dep} -.endfor - -.endif # USE_OPENAL - .if defined(USE_FAM) DEFAULT_FAM_SYSTEM= gamin # Currently supported FAM systems Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Thu Dec 26 06:42:43 2013 (r337471) +++ head/Mk/bsd.sanity.mk Thu Dec 26 06:51:03 2013 (r337472) @@ -153,3 +153,7 @@ DEV_WARNING+= "USE_PYDISTUTILS=easy_inst .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} != "easy_install" && defined(PYDISTUTILS_AUTOPLIST) && defined(PYDISTUTILS_PKGNAME) 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