Update to beta7. All local patches integrated, and some bug fixes.

5 files changed, 10 insertions, 92 deletions

diff --git a/audio/libopenmpt/Makefile b/audio/libopenmpt/Makefile
index 536cd71a3f9..84da925ee99 100644
--- a/audio/libopenmpt/Makefile
+++ b/audio/libopenmpt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2014/08/26 10:44:15 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2014/09/07 21:38:59 wiz Exp $
 
-DISTNAME=	libopenmpt-0.2.4115-beta5
+DISTNAME=	libopenmpt-0.2.4259-beta7
 PKGNAME=	${DISTNAME:S/-beta/beta/}
 CATEGORIES=	audio
 MASTER_SITES=	http://lib.openmpt.org/files/libopenmpt/src/
@@ -16,12 +16,10 @@ WRKSRC=		${WRKDIR}/${DISTNAME:C/-beta.*//}
 USE_LANGUAGES=	c c++
 USE_TOOLS=	gmake pkg-config
 
-# installation uses non-portable 'install -D'
-# http://bugs.openmpt.org/view.php?id=581
-MAKE_FLAGS+=	INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
-MAKE_FLAGS+=	INSTALL_DATA=${INSTALL_DATA:Q}
-MAKE_FLAGS+=	PKGMANDIR=${PKGMANDIR:Q}
-INSTALLATION_DIRS=	bin include/libopenmpt lib/pkgconfig ${PKGMANDIR}/man1 share/doc/libopenmpt/examples
+MAKE_FLAGS+=			MANDIR=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=			INSTALL_LIB=${INSTALL_LIB:Q}
+PKGCONFIG_OVERRIDE=		bin/libopenmpt.pc
+PKGCONFIG_OVERRIDE_STAGE=	post-build
 
 .include "options.mk"
 
diff --git a/audio/libopenmpt/distinfo b/audio/libopenmpt/distinfo
index f9ed5e0eddf..42fc0404cff 100644
--- a/audio/libopenmpt/distinfo
+++ b/audio/libopenmpt/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.1 2014/08/26 10:44:15 wiz Exp $
+$NetBSD: distinfo,v 1.2 2014/09/07 21:38:59 wiz Exp $
 
-SHA1 (libopenmpt-0.2.4115-beta5.tar.gz) = 5659a8472d5c332d000c9516b40b530dbfe1454f
-RMD160 (libopenmpt-0.2.4115-beta5.tar.gz) = 0dd16f17ab61dce568fd6df27c289ac301e37c7c
-Size (libopenmpt-0.2.4115-beta5.tar.gz) = 818283 bytes
-SHA1 (patch-Makefile) = aed1e11c42225d4de2248d684a5277c09764444f
-SHA1 (patch-common_Endianness.h) = 9619885d5c26b885a28e80efaeabcf27d1581799
-SHA1 (patch-openmpt123_openmpt123.hpp) = 3a4ca5f286ed484faf1921d7a2416dd5bd0e0ad5
+SHA1 (libopenmpt-0.2.4259-beta7.tar.gz) = 95abb296a538c212c53a2d411ac1ef560186c229
+RMD160 (libopenmpt-0.2.4259-beta7.tar.gz) = 2f2c7563747c279fc7d802a987bc5f56b8535474
+Size (libopenmpt-0.2.4259-beta7.tar.gz) = 832690 bytes
diff --git a/audio/libopenmpt/patches/patch-Makefile b/audio/libopenmpt/patches/patch-Makefile
deleted file mode 100644
index 5694f129d3f..00000000000
--- a/audio/libopenmpt/patches/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2014/08/26 10:44:15 wiz Exp $
-
-Fix man page installation path.
-http://bugs.openmpt.org/view.php?id=577
-
---- Makefile.orig	2014-06-03 11:21:46.000000000 +0000
-+++ Makefile
-@@ -598,7 +598,7 @@ endif
- ifeq ($(OPENMPT123),1)
- 	$(INSTALL_PROGRAM) bin/openmpt123$(EXESUFFIX).norpath $(DESTDIR)$(PREFIX)/bin/openmpt123$(EXESUFFIX)
- ifeq ($(MPT_WITH_HELP2MAN),1)
--	$(INSTALL_DATA) bin/openmpt123.1 $(DESTDIR)$(PREFIX)/share/man/man.1/openmpt123.1
-+	$(INSTALL_DATA) bin/openmpt123.1 $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1/openmpt123.1
- endif
- endif
- 	$(INSTALL_DATA) LICENSE   $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/LICENSE
diff --git a/audio/libopenmpt/patches/patch-common_Endianness.h b/audio/libopenmpt/patches/patch-common_Endianness.h
deleted file mode 100644
index 87ebd6cba9a..00000000000
--- a/audio/libopenmpt/patches/patch-common_Endianness.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-common_Endianness.h,v 1.1 2014/08/26 10:44:15 wiz Exp $
-
-Avoid bswap32 re-definition on NetBSD.
-
-In file included from ./soundlib/plugins/PlugInterface.h:25:0,
-                 from ./soundlib/Sndfile.h:47,
-                 from libopenmpt/libopenmpt_impl.cpp:28:
-./soundlib/plugins/../../common/Endianness.h:26:0: warning: "bswap32" redefined [enabled by default]
- #define bswap32 __builtin_bswap32
- ^
-
-http://bugs.openmpt.org/view.php?id=579
-
---- common/Endianness.h.orig	2014-06-10 16:27:31.000000000 +0000
-+++ common/Endianness.h
-@@ -23,8 +23,10 @@ OPENMPT_NAMESPACE_BEGIN
- 
- #if MPT_COMPILER_GCC
- #if MPT_GCC_AT_LEAST(4,3,0)
-+#ifndef bswap32
- #define bswap32 __builtin_bswap32
- #endif
-+#endif
- #elif MPT_COMPILER_MSVC
- #include <intrin.h>
- #define bswap16 _byteswap_ushort
diff --git a/audio/libopenmpt/patches/patch-openmpt123_openmpt123.hpp b/audio/libopenmpt/patches/patch-openmpt123_openmpt123.hpp
deleted file mode 100644
index 967a49390c7..00000000000
--- a/audio/libopenmpt/patches/patch-openmpt123_openmpt123.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-openmpt123_openmpt123.hpp,v 1.1 2014/08/26 10:44:15 wiz Exp $
-
-NetBSD defines both TIOCGSIZE and TIOCGWINSZ, but struct ttysize does not
-contain the referenced members.
-
-http://bugs.openmpt.org/view.php?id=580
-
---- openmpt123/openmpt123.hpp.orig	2014-02-01 16:52:29.000000000 +0000
-+++ openmpt123/openmpt123.hpp
-@@ -336,18 +336,18 @@ struct commandlineflags {
- 					terminal_height = tmp;
- 				}
- 			}
--			#if defined(TIOCGSIZE)
--				struct ttysize ts;
--				if ( ioctl( STDERR_FILENO, TIOCGSIZE, &ts ) >= 0 ) {
--					terminal_width = ts.ts_cols;
--					terminal_height = ts.ts_rows;
--				}
--			#elif defined(TIOCGWINSZ)
-+			#if defined(TIOCGWINSZ)
- 				struct winsize ts;
- 				if ( ioctl( STDERR_FILENO, TIOCGWINSZ, &ts ) >= 0 ) {
- 					terminal_width = ts.ws_col;
- 					terminal_height = ts.ws_row;
- 				}
-+			#elif defined(TIOCGSIZE)
-+				struct ttysize ts;
-+				if ( ioctl( STDERR_FILENO, TIOCGSIZE, &ts ) >= 0 ) {
-+					terminal_width = ts.ts_cols;
-+					terminal_height = ts.ts_rows;
-+				}
- 			#endif
- 		}
- #endif