update to 0.8.7

changes: compilation fixes

8 files changed, 15 insertions, 93 deletions

diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile
index 940fa2a56e3..52f69e48fda 100644
--- a/audio/mp3check/Makefile
+++ b/audio/mp3check/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2012/10/02 23:47:58 asau Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/10 16:20:21 drochner Exp $
 
-DISTNAME=	mp3check-0.8.3
+DISTNAME=	mp3check-0.8.7
 CATEGORIES=	audio
-MASTER_SITES=	http://jo.ath.cx/soft/mp3check/
+MASTER_SITES=	http://mp3check.googlecode.com/files/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://jo.ath.cx/soft/mp3check/
@@ -11,6 +12,7 @@ LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake
 
 BUILD_TARGET=	mp3check
 
diff --git a/audio/mp3check/distinfo b/audio/mp3check/distinfo
index ae9d52c1806..3e853cba0ad 100644
--- a/audio/mp3check/distinfo
+++ b/audio/mp3check/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.10 2012/08/10 18:02:12 joerg Exp $
+$NetBSD: distinfo,v 1.11 2013/04/10 16:20:21 drochner Exp $
 
-SHA1 (mp3check-0.8.3.tar.gz) = 4921a0f5250016abd8fe92d8ca4522c4c6e8b657
-RMD160 (mp3check-0.8.3.tar.gz) = da244159e2f6637d5bd1d386dbca6a2078329bdb
-Size (mp3check-0.8.3.tar.gz) = 163594 bytes
-SHA1 (patch-aa) = 0f2c2022951305e5efa5e057014fa17347704f47
-SHA1 (patch-ab) = 86e1da01f1407f748dbd2fa8436e2d2cdaaf3f4d
-SHA1 (patch-ad) = ca416a54a1b751f7587f977288a99b5da061a12a
-SHA1 (patch-ae) = 8858652cd376372411366d6c06e1e31e4d4b7590
-SHA1 (patch-tmap_h) = 9621cf08744cb164636c4b21087b415fa2f30471
-SHA1 (patch-tvector_h) = 02f6671dd45921e78aac24335522423f74c2b03c
+SHA1 (mp3check-0.8.7.tgz) = 31fe95bb7949343f6ebc04fcaa2faffd2b738264
+RMD160 (mp3check-0.8.7.tgz) = 03ababdfbd3742b4dd55df5d05f980d1c291bd6e
+Size (mp3check-0.8.7.tgz) = 71629 bytes
+SHA1 (patch-aa) = b5eccef8ae3ccccbfe7fd54ae3bc3b6a15e7f614
+SHA1 (patch-ae) = 45e1a74fd38fe3413faa85909878a896ddd87620
diff --git a/audio/mp3check/patches/patch-aa b/audio/mp3check/patches/patch-aa
index 65cbb6061fe..d3c697925f5 100644
--- a/audio/mp3check/patches/patch-aa
+++ b/audio/mp3check/patches/patch-aa
@@ -1,18 +1,12 @@
-$NetBSD: patch-aa,v 1.4 2012/01/11 19:23:03 hans Exp $
+$NetBSD: patch-aa,v 1.5 2013/04/10 16:20:21 drochner Exp $
 
---- mp3check.cc.orig	Mon Jan 27 23:58:46 2003
+--- mp3check.cc.orig	2009-04-28 21:15:16.000000000 +0000
 +++ mp3check.cc
-@@ -26,11 +26,12 @@
+@@ -26,6 +26,7 @@
  #include <unistd.h>
  #include <stdio.h>
  #include <stdlib.h>
 +#include <termios.h>
-+#include "config.h"
  #include "tappconfig.h"
  #include "crc16.h"
  #include "id3tag.h"
- #include "tfiletools.h"
--#include "config.h"
- 
- 
- 
diff --git a/audio/mp3check/patches/patch-ab b/audio/mp3check/patches/patch-ab
deleted file mode 100644
index be608ac06f9..00000000000
--- a/audio/mp3check/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/02/16 23:08:25 abs Exp $
-
---- tappconfig.cc.orig	Thu Jan 16 08:20:34 2003
-+++ tappconfig.cc
-@@ -28,6 +28,7 @@
- #include <sys/stat.h>
- #include <termios.h>
- #include <unistd.h>
-+#include "config.h"
- #include "tappconfig.h"
- 
- // config:
diff --git a/audio/mp3check/patches/patch-ad b/audio/mp3check/patches/patch-ad
deleted file mode 100644
index 703d57bb7c9..00000000000
--- a/audio/mp3check/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/02/16 23:08:25 abs Exp $
-
---- tfiletools.cc.orig	Tue Dec  3 22:00:57 2002
-+++ tfiletools.cc
-@@ -21,6 +21,7 @@
- 
- #include <sys/types.h>
- #include <dirent.h>
-+#include "config.h"
- #include "tfiletools.h"
- 
- #define COUNT_VERBOSE_STEP 1000
diff --git a/audio/mp3check/patches/patch-ae b/audio/mp3check/patches/patch-ae
index 3e45c2cf9dc..509dc7f0691 100644
--- a/audio/mp3check/patches/patch-ae
+++ b/audio/mp3check/patches/patch-ae
@@ -1,15 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2007/08/31 10:37:37 drochner Exp $
+$NetBSD: patch-ae,v 1.4 2013/04/10 16:20:21 drochner Exp $
 
 --- tstring.cc.orig	2006-09-21 23:17:07.000000000 +0200
 +++ tstring.cc
-@@ -23,6 +23,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <errno.h>
-+#include "config.h"
- #include "tstring.h"
- #include "texception.h"
- 
 @@ -716,12 +717,12 @@ void tstring::truncate(size_t max) {
  
  void tstring::replaceUnprintable(bool only_ascii) {
diff --git a/audio/mp3check/patches/patch-tmap_h b/audio/mp3check/patches/patch-tmap_h
deleted file mode 100644
index 6bfa6bb5791..00000000000
--- a/audio/mp3check/patches/patch-tmap_h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-tmap_h,v 1.2 2012/08/10 18:02:12 joerg Exp $
-
-- C++ tweaks to appease clang
-
---- tmap.h.orig	2006-09-21 21:17:07.000000000 +0000
-+++ tmap.h
-@@ -54,11 +54,11 @@ class tmap: public tmap_base<K,T> {
-    // new functionality
- 
-    /// return whether an element with key is contained or not
--    bool contains(const K& key) const { return find(key) != tmap_base<K,T>::end(); }
-+    bool contains(const K& key) const { return this->find(key) != this->end(); }
-    /// access element read only (const)
- // g++ 2.95.2 does not allow this:
- // const T& operator[](const K& key) const { const_iterator i = find(key); if(i != end()) return i->second; else throw TNotFoundException(); } // throw(TNotFoundException)
--   const T& operator[](const K& key) const { if(contains(key)) return find(key)->second; else throw TNotFoundException(); } // throw(TNotFoundException)
-+   const T& operator[](const K& key) const { if(contains(key)) return this->find(key)->second; else throw TNotFoundException(); } // throw(TNotFoundException)
- };
- 
- 
diff --git a/audio/mp3check/patches/patch-tvector_h b/audio/mp3check/patches/patch-tvector_h
deleted file mode 100644
index 1b89cc0f060..00000000000
--- a/audio/mp3check/patches/patch-tvector_h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tvector_h,v 1.2 2012/08/10 18:02:13 joerg Exp $
-
-- C++ tweaks to appease clang
-
---- tvector.h.orig	2006-09-21 21:17:07.000000000 +0000
-+++ tvector.h
-@@ -58,9 +58,9 @@ class tvector: public tvector_base<T> {
-    // new functionality
-    
-    /// append an element to the end
--   const tvector& operator += (const T& a) { push_back(a); return *this; }
-+   const tvector& operator += (const T& a) { this->push_back(a); return *this; }
-    /// append another tvector to the end
--   const tvector& operator += (const tvector& a) { insert(tvector_base<T>::end(), a.tvector_base<T>::begin(), a.tvector_base<T>::end()); return *this; }
-+   const tvector& operator += (const tvector& a) { this->insert(tvector_base<T>::end(), a.tvector_base<T>::begin(), a.tvector_base<T>::end()); return *this; }
-    /// direct read only access, safe
-    const T& operator[](size_t i) const { if(i < tvector_base<T>::size()) return tvector_base<T>::operator[](i); else throw TZeroBasedIndexOutOfRangeException(i, tvector_base<T>::size()); } // throw(TZeroBasedIndexOutOfRangeException);
-    /// direct read/write access, automatically create new elements