From fbd5fbe2bde03a2ccbb500833e2e8297cebe3fec Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 7 Aug 2015 13:40:55 +0000
Subject: [PATCH] libmikmod: bump version.

---
 ...od-3.3.3.recipe => libmikmod-3.3.7.recipe} | 19 ++++-----
 .../libmikmod/patches/libmikmod-3.3.3.patch   | 30 --------------
 .../patches/libmikmod-3.3.7.patchset          | 41 +++++++++++++++++++
 3 files changed, 49 insertions(+), 41 deletions(-)
 rename media-libs/libmikmod/{libmikmod-3.3.3.recipe => libmikmod-3.3.7.recipe} (76%)
 delete mode 100644 media-libs/libmikmod/patches/libmikmod-3.3.3.patch
 create mode 100644 media-libs/libmikmod/patches/libmikmod-3.3.7.patchset

diff --git a/media-libs/libmikmod/libmikmod-3.3.3.recipe b/media-libs/libmikmod/libmikmod-3.3.7.recipe
similarity index 76%
rename from media-libs/libmikmod/libmikmod-3.3.3.recipe
rename to media-libs/libmikmod/libmikmod-3.3.7.recipe
index acae070c4..5a7a9c09d 100644
--- a/media-libs/libmikmod/libmikmod-3.3.3.recipe
+++ b/media-libs/libmikmod/libmikmod-3.3.7.recipe
@@ -1,20 +1,20 @@
-SUMMARY="libmikmod is a lib for playing mod files"
+SUMMARY="A lib for playing mod files"
 DESCRIPTION="
 libmikmod is a library supporting many formats, including mod, s3m, it, and xm.
 "
 HOMEPAGE="http://mikmod.sourceforge.net"
-SOURCE_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/3.3.3/libmikmod-3.3.3.tar.gz"
-CHECKSUM_SHA256="79f02478c5abd8b2af73df4cc5f9d52625aa044327c01563168e270cf79b2437"
+SOURCE_URI="http://sourceforge.net/projects/mikmod/files/libmikmod/$portVersion/libmikmod-$portVersion.tar.gz"
+CHECKSUM_SHA256="4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat."
-REVISION="2"
+REVISION="1"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libmikmod$secondaryArchSuffix = $portVersion compat >= 3.3
-	lib:libmikmod$secondaryArchSuffix = 3.2.0 compat >= 3
+	lib:libmikmod$secondaryArchSuffix = 3.3.0 compat >= 3
 	"
 
 REQUIRES="
@@ -37,14 +37,11 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PATCHES="libmikmod-3.3.3.patch"
+PATCHES="libmikmod-$portVersion.patchset"
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	aclocal --install -I m4
-	autoconf
-	automake --add-missing
+	autoreconf -fi
 	runConfigure ./configure --enable-sdl
 	make
 }
@@ -68,7 +65,7 @@ INSTALL()
 PROVIDES_devel="
 	libmikmod${secondaryArchSuffix}_devel = $portVersion
 	cmd:libmikmod_config$secondaryArchSuffix
-	devel:libmikmod$secondaryArchSuffix = 3.2.0 compat >= 3
+	devel:libmikmod$secondaryArchSuffix = 3.3.0 compat >= 3
 	"
 
 REQUIRES_devel="
diff --git a/media-libs/libmikmod/patches/libmikmod-3.3.3.patch b/media-libs/libmikmod/patches/libmikmod-3.3.3.patch
deleted file mode 100644
index 793f3a8ed..000000000
--- a/media-libs/libmikmod/patches/libmikmod-3.3.3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac	2013-10-15 09:50:02.011796480 +0000
-+++ b/configure.ac	2013-11-08 21:25:01.681574400 +0000
-@@ -43,6 +43,7 @@
- libmikmod_openbsd=no
- libmikmod_os2=no
- libmikmod_djgpp=no
-+libmikmod_haiku=no
- 
- case $host_os in
- 	mingw*) libmikmod_mingw=yes ;;
-@@ -53,6 +54,7 @@
- 	openbsd*) libmikmod_openbsd=yes ;;
- 	emx*) libmikmod_os2=yes;;
- 	*djgpp) libmikmod_djgpp=yes ;;
-+	haiku*) libmikmod_haiku=yes ;;
- esac
- 
- # ==============================================================
-@@ -444,9 +446,9 @@
- 	)
- 	if test $libmikmod_cv_gcc_pthread = yes
- 	then
--		dnl There is no need for -pthread on darwin, and gcc
-+		dnl There is no need for -pthread on darwin or haiku, and gcc
- 		dnl complains about unrecognized option -pthread
--		if test $libmikmod_darwin = no
-+		if test $libmikmod_darwin = no && test $libmikmod_haiku = no
- 		then
- 			libmikmod_threads=""
- 			CFLAGS="$CFLAGS -pthread"
diff --git a/media-libs/libmikmod/patches/libmikmod-3.3.7.patchset b/media-libs/libmikmod/patches/libmikmod-3.3.7.patchset
new file mode 100644
index 000000000..247545254
--- /dev/null
+++ b/media-libs/libmikmod/patches/libmikmod-3.3.7.patchset
@@ -0,0 +1,41 @@
+From d5e9bbbf31af28e94806ad9ecfe8547d459abceb Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 7 Aug 2015 13:31:37 +0000
+Subject: Haiku patch
+
+
+diff --git a/configure.ac b/configure.ac
+index 79a4fd2..f15c532 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,6 +44,7 @@ libmikmod_openbsd=no
+ libmikmod_os2=no
+ libmikmod_djgpp=no
+ libmikmod_amiga=no
++libmikmod_haiku=no
+ 
+ case $host_os in
+ 	mingw*) libmikmod_mingw=yes ;;
+@@ -56,6 +57,7 @@ case $host_os in
+ 	*djgpp) libmikmod_djgpp=yes ;;
+ 	amigaos*|aros*|morphos*)
+ 		libmikmod_amiga=yes ;;
++	haiku*) libmikmod_haiku=yes ;;
+ esac
+ 
+ # ==============================================================
+@@ -508,9 +510,9 @@ then
+ 		CFLAGS=$ac_save_CFLAGS
+ 	)
+ 	if test $libmikmod_cv_gcc_pthread = yes; then
+-		dnl There is no need for -pthread on darwin, and gcc
++		dnl There is no need for -pthread on darwin or haiku, and gcc
+ 		dnl complains about unrecognized option -pthread
+-		if test $libmikmod_darwin = no; then
++		if test $libmikmod_darwin = no && test $libmikmod_haiku = no; then
+ 			libmikmod_threads=""
+ 			CFLAGS="$CFLAGS -pthread"
+ 		fi
+-- 
+1.8.3.4
+