From cf698d83cfe4918a4f88591aae223ee6468bb90e Mon Sep 17 00:00:00 2001
From: jolan <jolan@openbsd.org>
Date: Fri, 30 Jul 2010 20:00:26 +0000
Subject: [PATCH] update to 1.2.11; from brad

---
 devel/sdl-mixer/Makefile                      | 43 ++++++++++---------
 devel/sdl-mixer/distinfo                      | 10 ++---
 devel/sdl-mixer/patches/patch-Makefile_am     | 12 ------
 devel/sdl-mixer/patches/patch-Makefile_in     | 20 ++++-----
 devel/sdl-mixer/patches/patch-SDL_mixer_pc_in | 11 +++++
 devel/sdl-mixer/patches/patch-configure       | 39 +++++++++++++++++
 devel/sdl-mixer/patches/patch-music_c         | 16 -------
 .../sdl-mixer/patches/patch-timidity_config_h | 18 ++++----
 .../patches/patch-timidity_resample_c         | 12 ------
 devel/sdl-mixer/pkg/PLIST                     |  8 ++--
 10 files changed, 103 insertions(+), 86 deletions(-)
 delete mode 100644 devel/sdl-mixer/patches/patch-Makefile_am
 create mode 100644 devel/sdl-mixer/patches/patch-SDL_mixer_pc_in
 create mode 100644 devel/sdl-mixer/patches/patch-configure
 delete mode 100644 devel/sdl-mixer/patches/patch-music_c
 delete mode 100644 devel/sdl-mixer/patches/patch-timidity_resample_c

diff --git a/devel/sdl-mixer/Makefile b/devel/sdl-mixer/Makefile
index e3fd018e53e..a5192d6c859 100644
--- a/devel/sdl-mixer/Makefile
+++ b/devel/sdl-mixer/Makefile
@@ -1,42 +1,45 @@
-# $OpenBSD: Makefile,v 1.36 2009/08/10 06:31:08 kili Exp $
+# $OpenBSD: Makefile,v 1.37 2010/07/30 20:00:26 jolan Exp $
 
 COMMENT=	SDL multi-channel audio mixer library
-DISTNAME=	SDL_mixer-1.2.6
-PKGNAME=	${DISTNAME:L:S/_/-/}p8
-SHARED_LIBS=	SDL_mixer 3.0
+
+DISTNAME=	SDL_mixer-1.2.11
+PKGNAME=	${DISTNAME:L:S/_/-/}
 CATEGORIES=	devel audio
-MASTER_SITES=	ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/ \
-		${HOMEPAGE}release/
+MASTER_SITES=	${HOMEPAGE}release/
+
+SHARED_LIBS=	SDL_mixer	4.0
 
 HOMEPAGE=	http://www.libsdl.org/projects/SDL_mixer/
 
-# LGPL
+# LGPLv2.1+
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+WANTLIB=	c m ogg pthread sndio usbhid
 
-USE_LIBTOOL=	Yes
-USE_X11=	Yes
-
+MODULES=	converters/libiconv
 LIB_DEPENDS=	mikmod.>=2::audio/libmikmod \
 		vorbis,vorbisfile.>=1::audio/libvorbis \
+		FLAC.>=9::audio/flac \
 		SDL.>=4::devel/sdl \
 		smpeg.>=1::devel/smpeg
 
-WANTLIB=	X11 Xau Xdmcp Xext Xrandr Xrender \
-		c iconv m ogg pthread pthread-stubs sndio usbhid xcb
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=${CONFIGURE_SHARED}
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -Dunix=1" \
-		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
+USE_LIBTOOL=	Yes
+USE_GMAKE=	Yes
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+		--disable-music-flac-shared \
+		--disable-music-mod-shared \
+		--disable-music-mp3-shared \
+		--disable-music-ogg-shared
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-build:
-	@perl -pi -e 's,_SYSCONFDIR_,${SYSCONFDIR},g' \
-		${WRKSRC}/timidity/config.h
+	${SUBST_CMD} ${WRKSRC}/timidity/config.h
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/.libs/play{mus,wave} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKBUILD}/build/.libs/play{mus,wave} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/devel/sdl-mixer/distinfo b/devel/sdl-mixer/distinfo
index 0571e165f2e..588756a1ef2 100644
--- a/devel/sdl-mixer/distinfo
+++ b/devel/sdl-mixer/distinfo
@@ -1,5 +1,5 @@
-MD5 (SDL_mixer-1.2.6.tar.gz) = K4vv+tkXnYDlmMIsgO+xNQ==
-RMD160 (SDL_mixer-1.2.6.tar.gz) = 8g47fbJm2aDadfIxncxAPYaZB+Y=
-SHA1 (SDL_mixer-1.2.6.tar.gz) = 2OCdh6dQxL2Ynwo+Txtrr/YBuPE=
-SHA256 (SDL_mixer-1.2.6.tar.gz) = iflIQLG0Ld/lOoruQVMxUW8bvdlCtC0l50kGozLN8io=
-SIZE (SDL_mixer-1.2.6.tar.gz) = 1147838
+MD5 (SDL_mixer-1.2.11.tar.gz) = Za2j2Zf+hRCRkaX7CD8kjA==
+RMD160 (SDL_mixer-1.2.11.tar.gz) = VZNVEWocOA7fcYedoNvPU1nwVHY=
+SHA1 (SDL_mixer-1.2.11.tar.gz) = 711FFgur61Hq+n5AGc7DgyTuGl0=
+SHA256 (SDL_mixer-1.2.11.tar.gz) = hhRaw5ysbSxhacIm+TdkjcpeidzYKHUXY90XT6mvnPk=
+SIZE (SDL_mixer-1.2.11.tar.gz) = 2690654
diff --git a/devel/sdl-mixer/patches/patch-Makefile_am b/devel/sdl-mixer/patches/patch-Makefile_am
deleted file mode 100644
index db5851edbc1..00000000000
--- a/devel/sdl-mixer/patches/patch-Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_am,v 1.5 2005/07/03 21:36:35 jolan Exp $
---- Makefile.am.orig	Wed Dec 15 23:20:13 2004
-+++ Makefile.am	Sun Jul  3 16:25:58 2005
-@@ -60,8 +60,6 @@ EXTRA_DIST =			\
- 	autogen.sh
- 
- libSDL_mixer_la_LDFLAGS = 	\
--	-no-undefined		\
--	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- 	-export-symbols-regex Mix_.*
- libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@
diff --git a/devel/sdl-mixer/patches/patch-Makefile_in b/devel/sdl-mixer/patches/patch-Makefile_in
index b3e997e4b33..ffd587fa057 100644
--- a/devel/sdl-mixer/patches/patch-Makefile_in
+++ b/devel/sdl-mixer/patches/patch-Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2005/07/03 21:36:35 jolan Exp $
---- Makefile.in.orig	Thu Dec 16 00:44:36 2004
-+++ Makefile.in	Sun Jul  3 16:26:03 2005
-@@ -296,8 +296,6 @@ EXTRA_DIST = \
- 	autogen.sh
+$OpenBSD: patch-Makefile_in,v 1.6 2010/07/30 20:00:26 jolan Exp $
+--- Makefile.in.orig	Mon Oct 12 19:06:53 2009
++++ Makefile.in	Fri Jul  9 20:06:52 2010
+@@ -44,7 +44,7 @@ LT_AGE      = @LT_AGE@
+ LT_CURRENT  = @LT_CURRENT@
+ LT_RELEASE  = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+-LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++LT_LDFLAGS  = -no-undefined -rpath $(libdir) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
- libSDL_mixer_la_LDFLAGS = \
--	-no-undefined		\
--	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- 	-export-symbols-regex Mix_.*
+ all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
  
diff --git a/devel/sdl-mixer/patches/patch-SDL_mixer_pc_in b/devel/sdl-mixer/patches/patch-SDL_mixer_pc_in
new file mode 100644
index 00000000000..5795f260083
--- /dev/null
+++ b/devel/sdl-mixer/patches/patch-SDL_mixer_pc_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-SDL_mixer_pc_in,v 1.1 2010/07/30 20:00:26 jolan Exp $
+--- SDL_mixer.pc.in.orig	Fri Jul  9 20:54:09 2010
++++ SDL_mixer.pc.in	Fri Jul  9 20:55:07 2010
+@@ -7,6 +7,6 @@ Name: SDL_mixer
+ Description: mixer library for Simple DirectMedia Layer
+ Version: @VERSION@
+ Requires: sdl >= @SDL_VERSION@
+-Libs: -L${libdir} -lSDL_mixer
++Libs: -L${libdir} -lSDL_mixer -lmikmod -lvorbisfile -lvorbis -lFLAC -logg -lsmpeg -lm
+ Cflags: -I${includedir}/SDL
+ 
diff --git a/devel/sdl-mixer/patches/patch-configure b/devel/sdl-mixer/patches/patch-configure
new file mode 100644
index 00000000000..558e1b3fed4
--- /dev/null
+++ b/devel/sdl-mixer/patches/patch-configure
@@ -0,0 +1,39 @@
+$OpenBSD: patch-configure,v 1.1 2010/07/30 20:00:26 jolan Exp $
+--- configure.orig	Thu Jul 29 19:35:07 2010
++++ configure	Thu Jul 29 19:36:21 2010
+@@ -13275,7 +13275,7 @@ if test "${ac_cv_lib_vorbisfile_ov_open_callbacks+set}
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lvorbisfile  $LIBS"
++LIBS="-lvorbisfile -lvorbis -logg $LIBM  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -13520,7 +13520,7 @@ fi
+ 
+     if test x$have_flac_export = xyes; then
+         LIBS_SAVED="$LIBS"
+-        LIBS="-lFLAC"
++        LIBS="-lFLAC -logg $LIBM"
+         { $as_echo "$as_me:$LINENO: checking for libflac so-name version >= $libflac_ver" >&5
+ $as_echo_n "checking for libflac so-name version >= $libflac_ver... " >&6; }
+         if test "$cross_compiling" = yes; then
+@@ -13730,7 +13730,7 @@ if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lFLAC  $LIBS"
++LIBS="-lFLAC -logg $LIBM  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -13814,7 +13814,7 @@ fi
+                 echo "-- dynamic libFLAC -> $flac_lib"
+                 EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_DYNAMIC=\\\"$flac_lib\\\""
+             else
+-                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lFLAC"
++                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lFLAC -logg $LIBM"
+             fi
+         fi
+     else
diff --git a/devel/sdl-mixer/patches/patch-music_c b/devel/sdl-mixer/patches/patch-music_c
deleted file mode 100644
index ff061a6ac1c..00000000000
--- a/devel/sdl-mixer/patches/patch-music_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-music_c,v 1.1 2005/07/06 05:04:58 jolan Exp $
---- music.c.orig	Tue Jul  5 23:57:06 2005
-+++ music.c	Tue Jul  5 23:57:16 2005
-@@ -391,8 +391,11 @@ int open_music(SDL_AudioSpec *mixer)
- #endif
- #ifdef LIBMIKMOD_MUSIC
- 	if(!MikMod_InfoDriver())
--#endif
-+          MikMod_RegisterDriver(&drv_nos);
-+#else
- 	MikMod_RegisterAllDrivers();
-+#endif
-+
- #ifdef LIBMIKMOD_MUSIC
- 	if(!MikMod_InfoLoader())
- #endif
diff --git a/devel/sdl-mixer/patches/patch-timidity_config_h b/devel/sdl-mixer/patches/patch-timidity_config_h
index 062a949f334..5da6164763b 100644
--- a/devel/sdl-mixer/patches/patch-timidity_config_h
+++ b/devel/sdl-mixer/patches/patch-timidity_config_h
@@ -1,12 +1,14 @@
-$OpenBSD: patch-timidity_config_h,v 1.1 2006/01/30 10:22:11 jsg Exp $
---- timidity/config.h.orig	Wed Dec 15 23:20:14 2004
-+++ timidity/config.h	Thu Jan 26 11:51:01 2006
-@@ -227,7 +227,7 @@ typedef char int8;
- #ifdef __WIN32__
- #define DEFAULT_PATH	"\\TIMIDITY"
+$OpenBSD: patch-timidity_config_h,v 1.2 2010/07/30 20:00:26 jolan Exp $
+--- timidity/config.h.orig	Mon Oct 12 19:06:52 2009
++++ timidity/config.h	Thu Jul 29 19:27:12 2010
+@@ -177,9 +177,7 @@ typedef char int8;
+ #if defined(__WIN32__) || defined(__OS2__)
+ #define DEFAULT_PATH	"C:\\TIMIDITY"
  #else
--#define DEFAULT_PATH	"/usr/local/lib/timidity"
-+#define DEFAULT_PATH	"_SYSCONFDIR_"
+-#define DEFAULT_PATH	"/etc/timidity"
+-#define DEFAULT_PATH1	"/usr/share/timidity"
+-#define DEFAULT_PATH2	"/usr/local/lib/timidity"
++#define DEFAULT_PATH	"${SYSCONFDIR}"
  #endif
  
  /* These affect general volume */
diff --git a/devel/sdl-mixer/patches/patch-timidity_resample_c b/devel/sdl-mixer/patches/patch-timidity_resample_c
deleted file mode 100644
index 02b8bf7aa41..00000000000
--- a/devel/sdl-mixer/patches/patch-timidity_resample_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-timidity_resample_c,v 1.1 2007/07/15 01:05:52 jolan Exp $
---- timidity/resample.c.orig	Wed Dec 15 23:20:15 2004
-+++ timidity/resample.c	Sat Jul 14 20:00:18 2007
-@@ -720,7 +720,7 @@ void pre_resample(Sample * sp)
-   while (--count)
-     {
-       vptr = src + (ofs >> FRACTION_BITS);
--      v1 = *(vptr - 1);
-+      v1 = (vptr == src) ? *vptr : *(vptr - 1);
-       v2 = *vptr;
-       v3 = *(vptr + 1);
-       v4 = *(vptr + 2);
diff --git a/devel/sdl-mixer/pkg/PLIST b/devel/sdl-mixer/pkg/PLIST
index 76b618a415a..ac25ab5d9ee 100644
--- a/devel/sdl-mixer/pkg/PLIST
+++ b/devel/sdl-mixer/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/14 23:44:01 espie Exp $
-bin/playmus
-bin/playwave
+@comment $OpenBSD: PLIST,v 1.6 2010/07/30 20:00:26 jolan Exp $
+@bin bin/playmus
+@bin bin/playwave
 include/SDL/
 include/SDL/SDL_mixer.h
 lib/libSDL_mixer.a
 lib/libSDL_mixer.la
 %%SHARED%%
+lib/pkgconfig/
+lib/pkgconfig/SDL_mixer.pc