From 1aa4640724b90c31fbf6401c50a32d6e387c9fcc Mon Sep 17 00:00:00 2001
From: antoine <antoine@FreeBSD.org>
Date: Thu, 26 Dec 2013 06:51:03 +0000
Subject: - Remove USE_OPENAL code - Add a developer error to bsd.sanity.mk if
 it is used

Approved by:	portmgr (bapt)
---
 Mk/bsd.port.mk   | 83 --------------------------------------------------------
 Mk/bsd.sanity.mk |  4 +++
 2 files changed, 4 insertions(+), 83 deletions(-)

(limited to 'Mk')

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index b07516bc714a..4d8a670b47c8 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -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
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index ddb239e398ac..e888a6716c4e 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -153,3 +153,7 @@ DEV_WARNING+=	"USE_PYDISTUTILS=easy_install is deprecated, please use USE_PYDIST
 .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
-- 
cgit