From 1cd85eea10d3393fc2b75f2c68f0406577d9db14 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Mon, 28 Dec 2015 21:16:32 +0000
Subject: Changes 1.2.02: - integrated changes from 1.3.01: - fixed incorrect
 message occurring some times when start after a crash - better logging and
 retries for write errors - added offset to the output created via the command
 line - fixed crash caused by saving very small images - build fix - disabled
 Discogs integration

---
 audio/mp3diags/Makefile                  |  5 ++---
 audio/mp3diags/distinfo                  | 11 +++++------
 audio/mp3diags/patches/patch-src_Notes.h | 22 ----------------------
 3 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 audio/mp3diags/patches/patch-src_Notes.h

diff --git a/audio/mp3diags/Makefile b/audio/mp3diags/Makefile
index afe184caf95..65322e128b2 100644
--- a/audio/mp3diags/Makefile
+++ b/audio/mp3diags/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2015/04/25 14:20:22 tnn Exp $
+# $NetBSD: Makefile,v 1.48 2015/12/28 21:16:32 adam Exp $
 
-DISTNAME=	MP3Diags-1.2.01
+DISTNAME=	MP3Diags-1.2.02
 PKGNAME=	${DISTNAME:S/MP3D/mp3d/}
-PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mp3diags/}
 
diff --git a/audio/mp3diags/distinfo b/audio/mp3diags/distinfo
index 5aa74f3a2b8..309ae0ee727 100644
--- a/audio/mp3diags/distinfo
+++ b/audio/mp3diags/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 01:12:42 agc Exp $
+$NetBSD: distinfo,v 1.19 2015/12/28 21:16:32 adam Exp $
 
-SHA1 (MP3Diags-1.2.01.tar.gz) = 777c5b23426e36aec2557035b6192dec4b909a39
-RMD160 (MP3Diags-1.2.01.tar.gz) = c69961189a5789d91642637794ccf201562c4b9e
-SHA512 (MP3Diags-1.2.01.tar.gz) = 59f86d01ec8a8686a709d683e72f1f36a42da1b43a6bbd55dc4e4814cdcf96b228987d69175d324e4f2aaf6010be5dced67b08cc8013a1f087dd1b43e96fe6eb
-Size (MP3Diags-1.2.01.tar.gz) = 1221991 bytes
+SHA1 (MP3Diags-1.2.02.tar.gz) = 92b102713ac767ed45476c684f68f0d300fc8354
+RMD160 (MP3Diags-1.2.02.tar.gz) = 85b8da63c135e88fcd54bf094fcad1562795ecb2
+SHA512 (MP3Diags-1.2.02.tar.gz) = 51498646ad3c9a19aeb0bcbf8cd280de75a24eb252790cc71d1eba433b986bbc58d4198d8bdfc0339dd6845ddfd966dd482f991b976e2da8f49e9d4e4f0464d0
+Size (MP3Diags-1.2.02.tar.gz) = 1220039 bytes
 SHA1 (patch-aa) = 4aae1922ca2b7fa9dbb30f1b5ceabb773a56c55f
-SHA1 (patch-src_Notes.h) = cec467222fe8e3b269582b256c4d394673497838
diff --git a/audio/mp3diags/patches/patch-src_Notes.h b/audio/mp3diags/patches/patch-src_Notes.h
deleted file mode 100644
index 61be66fa3dd..00000000000
--- a/audio/mp3diags/patches/patch-src_Notes.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_Notes.h,v 1.3 2014/03/12 12:28:28 wiz Exp $
-
-Fix
-cd src/ && /usr/bin/make -f Makefile all
-/usr/pkg/qt4/bin/moc -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I/usr/pkg/qt4/mkspecs/netbsd-g++ -I. -I/usr/pkg/qt4/include/QtCore -I/usr/pkg/qt4/include/QtNetwork -I/usr/pkg/qt4/include/QtGui -I/usr/pkg/qt4/include/QtXml -I/usr/pkg/qt4/include -I. -I. -I/usr/pkg/include CommonData.h -o moc_CommonData.cpp
-usr/pkg/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
-
-using patch similar to one reported in
-https://bugreports.qt-project.org/browse/QTBUG-22829
-
---- src/Notes.h.orig	2014-01-16 13:37:29.000000000 +0000
-+++ src/Notes.h
-@@ -33,7 +33,9 @@
- 
- #include  "SerSupport.h"
- #include  <boost/serialization/split_member.hpp>
-+#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
- #include  <boost/lexical_cast.hpp>
-+#endif
- 
- #ifdef ERR
- #undef ERR
-- 
cgit v1.2.3