Update to 3.3.2:

Summary of changes between libmikmod 3.2.0 and libmikmod 3.3.2 ():
==========================================================================

libmikmod 3.3.2 was released on 05-Oct-2013.

This is a serious bug fix release after the previous 3.2.0 series, with
some additional new features. All who are using libmikmod-3.2.0 (or the
interim 3.3.1-beta) must upgrade to the new libmikmod-3.3.2 version.

THANKS

- Paul Spark <sparkynz74@gmail.com> for Microsoft Visual C 6.0 fixes.
- Ozkan Sezer: many changes.

NEW FEATURES

- New CMake build system.
- Updated configury, support for cross-compilation, support for building
  in a separate directory, support latest autotools.
- New SDL driver - works both with SDL-1.2.x and with SDL2, supports
  floating point output if compiled against SDL2.
- New OpenAL driver, originally suggested by 'kervala', with fixes and
  updates and with floating point output support.
- The multi-platform SDL and OpenAL drivers, if they are compiled, have
  priority over OS-specific hw drivers for MikMod_RegisterAllDrivers().
- New windows xaudio2 driver, originally suggested by 'honza.c', with
  updates, xaudio2.8 support and with floating point output support.
- ALSA driver now supports only the contemporary ALSA 1.0.x versions.
  All of the ancient ALSA 0.3.x-0.4.x code were removed.
- Floating point output mode support for ALSA, OSS, Direct Sound, WinMM
  drivers and for WAV file writer.
- The pipe and stdout drivers are now configurable
- Raw file-writer now has the lowest priority among the file-writers.
- GCC elf and macho symbol visibility attributes now supported.
- Windows: dllexport/dllimport attributes work properly for MinGW[-w64],
  as well as windows compilers. Static builds using MSVC, LCC, etc are
  now named mikmod_static.lib. When compiling against static libmikmod,
  MIKMOD_STATIC should be defined so that dllimport wouldn't be assumed.

BUGFIXES

- ALSA fixes from Fedora.
- ALSA fixes for "Write error: File descriptor in bad state" crashes,
  e.g. RedHat bug #915121. Now works stable.
- ESD (esound) updates from Fedora. Add esd back to configury which was
  removed in 3.2.0b3, now requiring >= 0.2.18.
- Minor OSS fixes.
- The NAS driver now actually compiles.
- 64 bit detection fixes.
- Fix BOOL type use all over the source.
- Several const correctness fixes.
- Fixes for CVE-2007-6720 and CVE-2009-0179.
- mmio: memreader fixes and updates.
- Fixes for access violations introduced in 3.2.0b3.
- Fixes for broken memory allocation wrappers introduced in 3.2.0b3.
- Fix MikMod_strerror() might read beyond end of a static array.
- Fix looping volume in Player_SetVolume(), based on an old patch by
  Yi-Huang Han.
- XM loader now reads songlength amount of orders from the file and
  then seeks to mh->headersize+60 (sf.net bug #10.)
- Fix "unclick" code to consider loop lengths shorter than 16: fixes
  crashes seen with several xm files (sf.net bug #12, mpd bug #3425.)
- Mac OS X: new standalone makefile with cross-compilation support.
- DJGPP build fixes.
- Windows: fixes/updates, win64 fully supported. MinGW[-w64] fully
  supported along with MSVC and LCC. new standalone MinGW makefile with
  cross-compilation support.
- SIMD (AltiVec and SSE2) option is now disabled by default. Can be
  enabled by --enable-simd configury option, similarly with cmake. (the
  standalone makefiles or project files are added instructions on how to
  enable the feature if required.)
- Many compiler warning fixes, other small cleanups.

4 files changed, 15 insertions, 13 deletions

diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index c6c67292f35..1ce4ee88dd5 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2012/09/12 00:24:42 asau Exp $
+# $NetBSD: Makefile,v 1.53 2013/10/06 16:09:00 wiz Exp $
 
-DISTNAME=	libmikmod-3.2.0
+DISTNAME=	libmikmod-3.3.2
 CATEGORIES=	audio
 MASTER_SITES=	http://mikmod.shlomifish.org/files/
 
@@ -17,6 +17,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-threads
 
 INFO_FILES=		yes
+PKGCONFIG_OVERRIDE=	libmikmod.pc.in
 
 pre-configure:
 	cd ${WRKSRC} && autoconf
diff --git a/audio/libmikmod/PLIST b/audio/libmikmod/PLIST
index 15da99fb0f8..24745c01139 100644
--- a/audio/libmikmod/PLIST
+++ b/audio/libmikmod/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2006/03/30 03:44:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/10/06 16:09:00 wiz Exp $
 bin/libmikmod-config
 include/mikmod.h
 info/mikmod.info
 lib/libmikmod.la
+lib/pkgconfig/libmikmod.pc
 man/man1/libmikmod-config.1
 share/aclocal/libmikmod.m4
diff --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
index 3eb867cbd12..53a2a591b39 100644
--- a/audio/libmikmod/distinfo
+++ b/audio/libmikmod/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2013/08/16 10:36:06 jperkin Exp $
+$NetBSD: distinfo,v 1.16 2013/10/06 16:09:00 wiz Exp $
 
-SHA1 (libmikmod-3.2.0.tar.gz) = 6d30f59019872699bdcc9bcf6893eea9d6b12c13
-RMD160 (libmikmod-3.2.0.tar.gz) = 066db43670878914774f16b2c5444acfa8e86f28
-Size (libmikmod-3.2.0.tar.gz) = 873258 bytes
-SHA1 (patch-ac) = f35745a0880181c06f9e37c1cfe51e5408b4928d
+SHA1 (libmikmod-3.3.2.tar.gz) = e3496e6daef4c4361b7c24accc7159ad75dfa600
+RMD160 (libmikmod-3.3.2.tar.gz) = 87a3896dba49420bdefacf680d721cbe2a4ce6ae
+Size (libmikmod-3.3.2.tar.gz) = 1261283 bytes
+SHA1 (patch-ac) = c407e4f2054e09454394879047fbd7dc575a4d4d
 SHA1 (patch-ad) = bc4983d181acedc6f32b85aadd3a0011280d3227
diff --git a/audio/libmikmod/patches/patch-ac b/audio/libmikmod/patches/patch-ac
index a84cc848f57..20d8903214e 100644
--- a/audio/libmikmod/patches/patch-ac
+++ b/audio/libmikmod/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.9 2012/06/03 21:44:59 wiz Exp $
+$NetBSD: patch-ac,v 1.10 2013/10/06 16:09:01 wiz Exp $
 
---- configure.orig	2012-06-01 13:15:40.000000000 +0000
+--- configure.orig	2013-10-05 14:00:10.000000000 +0000
 +++ configure
-@@ -11829,6 +11829,7 @@ $as_echo "libraries $x_libraries, header
- fi
+@@ -11471,6 +11471,7 @@ fi
  
+ fi
  
 +if false ; then
  # Check if makeinfo support html output. If it doesn't, pretend it's missing
  # rather than failing rebuilding the documentation.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if makeinfo supports html output" >&5
-@@ -11851,6 +11852,7 @@ then
+@@ -11493,6 +11494,7 @@ then
  else
  	MAKEINFO="$MAKEINFO --no-split"
  fi