From 9e0758caca910eb1a75303261a890456a3bb4b86 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 9 Dec 2007 13:40:16 +0000
Subject: [PATCH] - remove the sun FLAVOR and add sunaudio support by default

note: people running with non-default FLAVOR(s) will need to update their
package manually as "pkg_add -u" won't be able to cope with this change

discussed with and ok steven@, "theorical ok" from pvalchev@
---
 devel/sdl/Makefile  | 17 ++++++-----------
 devel/sdl/pkg/DESCR |  2 --
 devel/sdl/pkg/PLIST |  3 ++-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile
index 092097402c9..fcc23b009fe 100644
--- a/devel/sdl/Makefile
+++ b/devel/sdl/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.58 2007/11/18 09:39:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2007/12/09 13:40:16 ajacoutot Exp $
 
 COMMENT=	cross-platform multimedia library
 
 VERSION=	1.2.12
 DISTNAME=	SDL-${VERSION}
-PKGNAME=	${DISTNAME:L}p1
+PKGNAME=	${DISTNAME:L}p2
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.libsdl.org/
@@ -23,8 +23,8 @@ MASTER_SITES=	ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/ \
 MASTER_SITES0=	http://dev.beastie.hu/ \
 		http://www.beastie.hu/
 
-FLAVORS=	sun esd arts aa caca no_x11 altivec
-FLAVOR?=	sun
+FLAVORS=	esd arts aa caca no_x11 altivec
+FLAVOR?=
 
 USE_LIBTOOL=	Yes
 MODULES=	converters/libiconv
@@ -45,7 +45,8 @@ CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 		 --disable-oss \
 		 --disable-ltdl \
-		 --enable-pthread-sem
+		 --enable-pthread-sem \
+		 --enable-sunaudio
 
 .include <bsd.own.mk>
 USE_GCC3?=No
@@ -57,12 +58,6 @@ CONFIGURE_ARGS+= --enable-nasm
 CONFIGURE_ARGS+= --disable-nasm
 .endif
 
-.if ${FLAVOR:L:Msun}
-CONFIGURE_ARGS+= --enable-sunaudio
-.else
-CONFIGURE_ARGS+= --disable-sunaudio
-.endif
-
 .if ${FLAVOR:L:Mesd}
 LIB_DEPENDS+=	esd.>=2::audio/esound
 CONFIGURE_ARGS+= --enable-esd
diff --git a/devel/sdl/pkg/DESCR b/devel/sdl/pkg/DESCR
index 5b504b05088..5de113fb829 100644
--- a/devel/sdl/pkg/DESCR
+++ b/devel/sdl/pkg/DESCR
@@ -5,8 +5,6 @@ software, emulators, and many popular games.
 
 Packages can be built with additional FLAVORs:
 
-  sun:	SDL built with our native audio driver.
-
   esd:	SDL built with the esound package.
 	This FLAVOR requires the esound package.
 
diff --git a/devel/sdl/pkg/PLIST b/devel/sdl/pkg/PLIST
index 4aa37bcf3d1..4b154697de8 100644
--- a/devel/sdl/pkg/PLIST
+++ b/devel/sdl/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.12 2007/09/22 01:12:38 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.13 2007/12/09 13:40:16 ajacoutot Exp $
+@pkgpath ${BASE_PKGPATH},sun
 bin/sdl-config
 include/SDL/
 include/SDL/SDL.h