Tue Nov 6 18:38:34 2012 UTC ()
update to 2.0.4
changes:
-minor feature additions
-buffixes
-build system updates
-switched to libmusicbrainz5


(drochner)
diff -r1.12 -r1.13 pkgsrc/audio/flactag/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/audio/flactag/PLIST
diff -r1.5 -r1.6 pkgsrc/audio/flactag/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/flactag/patches/patch-ConfigFile.cc
diff -r1.1 -r1.2 pkgsrc/audio/flactag/patches/patch-ErrorLog.cc
diff -r1.1 -r1.2 pkgsrc/audio/flactag/patches/patch-FileNameBuilder.cc
diff -r1.3 -r1.4 pkgsrc/audio/flactag/patches/patch-aa
diff -r1.1.1.1 -r0 pkgsrc/audio/flactag/patches/patch-ac
diff -r1.1 -r0 pkgsrc/audio/flactag/patches/patch-ad
cvs diff -r1.12 -r1.13 pkgsrc/audio/flactag/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/flactag/Makefile 2012/09/11 23:59:36 1.12
+++ pkgsrc/audio/flactag/Makefile 2012/11/06 18:38:33 1.13
@@ -1,31 +1,33 @@ @@ -1,31 +1,33 @@
1# $NetBSD: Makefile,v 1.12 2012/09/11 23:59:36 asau Exp $ 1# $NetBSD: Makefile,v 1.13 2012/11/06 18:38:33 drochner Exp $
2# 2#
3 3
4DISTNAME= flactag-1.1 4DISTNAME= flactag-2.0.4
5PKGREVISION= 8 
6CATEGORIES= audio 5CATEGORIES= audio
7MASTER_SITES= http://software.gently.org.uk/flactag-1.1/ 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flactag/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://software.gently.org.uk/flactag-1.1/ 9HOMEPAGE= http://software.gently.org.uk/flactag-1.1/
11COMMENT= Tagger for flac album files 10COMMENT= Tagger for flac album files
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14USE_LANGUAGES= c++ 13USE_LANGUAGES= c c++
15USE_TOOLS= gmake 14USE_TOOLS= gmake pkg-config
 15GNU_CONFIGURE= yes
16 16
17INSTALLATION_DIRS= bin 17INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
18 18
 19# "ripflag" doesn't work well, "discid" pollutes the namespace
19do-install: 20do-install:
20 ${INSTALL_PROGRAM} ${WRKSRC}/flactag ${DESTDIR}${PREFIX}/bin 21 ${INSTALL_PROGRAM} ${WRKSRC}/flactag ${DESTDIR}${PREFIX}/bin
21# the "discid" program doesn't do more, don't install for namespace sanity 22 ${INSTALL_MAN} ${WRKSRC}/flactag.1 \
 23 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
22 24
23.include "../../audio/flac/buildlink3.mk" 25.include "../../audio/flac/buildlink3.mk"
24.include "../../audio/libdiscid/buildlink3.mk" 26.include "../../audio/libdiscid/buildlink3.mk"
25.include "../../www/neon/buildlink3.mk" 27.include "../../www/neon/buildlink3.mk"
26.include "../../mk/jpeg.buildlink3.mk" 28.include "../../mk/jpeg.buildlink3.mk"
27.include "../../textproc/unac/buildlink3.mk" 29.include "../../textproc/unac/buildlink3.mk"
28.include "../../audio/libmusicbrainz/buildlink3.mk" 30.include "../../audio/libmusicbrainz5/buildlink3.mk"
29.include "../../devel/libslang2/buildlink3.mk" 31.include "../../devel/libslang2/buildlink3.mk"
30.include "../../devel/gettext-lib/buildlink3.mk" 32.include "../../devel/gettext-lib/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/flactag/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/flactag/PLIST 2009/07/27 13:51:12 1.1.1.1
+++ pkgsrc/audio/flactag/PLIST 2012/11/06 18:38:33 1.2
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2009/07/27 13:51:12 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.2 2012/11/06 18:38:33 drochner Exp $
2bin/flactag 2bin/flactag
 3man/man1/flactag.1
cvs diff -r1.5 -r1.6 pkgsrc/audio/flactag/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/flactag/distinfo 2012/02/04 09:26:10 1.5
+++ pkgsrc/audio/flactag/distinfo 2012/11/06 18:38:33 1.6
@@ -1,12 +1,10 @@ @@ -1,12 +1,10 @@
1$NetBSD: distinfo,v 1.5 2012/02/04 09:26:10 sbd Exp $ 1$NetBSD: distinfo,v 1.6 2012/11/06 18:38:33 drochner Exp $
2 2
3SHA1 (flactag-1.1.tar.gz) = 8b0b65068b2659eceb36831694657bf2210ca36b 3SHA1 (flactag-2.0.4.tar.gz) = eb62b3b8657fe26c6f838b0098fd4f176ccb454d
4RMD160 (flactag-1.1.tar.gz) = 975091ad58b1c88e972e0b99ae800c068bc668d7 4RMD160 (flactag-2.0.4.tar.gz) = 2eeece5d5da94a51e0e11fe425de3d0ec11b6639
5Size (flactag-1.1.tar.gz) = 110567 bytes 5Size (flactag-2.0.4.tar.gz) = 482150 bytes
6SHA1 (patch-CommandLine.cc) = f677354989b98c26a613cfdf1f10ab8746ac6ec3 6SHA1 (patch-CommandLine.cc) = f677354989b98c26a613cfdf1f10ab8746ac6ec3
7SHA1 (patch-ConfigFile.cc) = 3936aabe97b7660cbe5731e81317494782859877 7SHA1 (patch-ConfigFile.cc) = 73ead20be34420b903eaa5ad61b7ba60f0aa03fe
8SHA1 (patch-ErrorLog.cc) = 7ae1bbce462db4e7b776d976b14485be1a40d063 8SHA1 (patch-ErrorLog.cc) = d3557d5f19a571fbaeb9b6cfe574cf7b31afb1d1
9SHA1 (patch-FileNameBuilder.cc) = c7ba316bcf999670125c37573f29b7338804b15c 9SHA1 (patch-FileNameBuilder.cc) = 8daed0f95e479b22228bd4f62163f8f148107df8
10SHA1 (patch-aa) = 71425b556d64b828083f0738e61fb0b9ca15b1df 10SHA1 (patch-aa) = af23402361767ad79a2b0af006e2a89a25318d41
11SHA1 (patch-ac) = cf71f4f68663ed9dc73662e32df55c0621fcaa14 
12SHA1 (patch-ad) = ff867a7acc08e08e3f109c63a235c13243a95cc6 
cvs diff -r1.1 -r1.2 pkgsrc/audio/flactag/patches/patch-ConfigFile.cc (expand / switch to unified diff)

--- pkgsrc/audio/flactag/patches/patch-ConfigFile.cc 2012/02/04 09:26:11 1.1
+++ pkgsrc/audio/flactag/patches/patch-ConfigFile.cc 2012/11/06 18:38:34 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-ConfigFile.cc,v 1.1 2012/02/04 09:26:11 sbd Exp $ 1$NetBSD: patch-ConfigFile.cc,v 1.2 2012/11/06 18:38:34 drochner Exp $
2 2
3--- ConfigFile.cc.orig 2008-12-16 11:20:56.000000000 +0000 3--- ConfigFile.cc.orig 2012-10-19 21:40:21.000000000 +0000
4+++ ConfigFile.cc 4+++ ConfigFile.cc
5@@ -25,6 +25,7 @@ 5@@ -27,6 +27,7 @@
6 ----------------------------------------------------------------------------*/ 6 ----------------------------------------------------------------------------*/
7  7
8 #include "ConfigFile.h" 8 #include "ConfigFile.h"
9+#include <cstdio> 9+#include <cstdio>
10  10
11 CConfigFile::CConfigFile() 11 #include <stdio.h>
12 { 12 #include <strings.h>
cvs diff -r1.1 -r1.2 pkgsrc/audio/flactag/patches/patch-ErrorLog.cc (expand / switch to unified diff)

--- pkgsrc/audio/flactag/patches/patch-ErrorLog.cc 2012/02/04 09:26:11 1.1
+++ pkgsrc/audio/flactag/patches/patch-ErrorLog.cc 2012/11/06 18:38:34 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-ErrorLog.cc,v 1.1 2012/02/04 09:26:11 sbd Exp $ 1$NetBSD: patch-ErrorLog.cc,v 1.2 2012/11/06 18:38:34 drochner Exp $
2 2
3--- ErrorLog.cc.orig 2008-12-16 11:20:56.000000000 +0000 3--- ErrorLog.cc.orig 2012-10-19 21:40:21.000000000 +0000
4+++ ErrorLog.cc 4+++ ErrorLog.cc
5@@ -25,6 +25,7 @@ 5@@ -26,6 +26,7 @@
6 ----------------------------------------------------------------------------*/ 6 ----------------------------------------------------------------------------*/
7  7
8 #include "ErrorLog.h" 8 #include "ErrorLog.h"
9+#include <cstdio> 9+#include <cstdio>
10  10
11 const std::vector<std::string>::size_type CErrorLog::m_cMaxSize=100; 11 #include <stdio.h>
12  12
cvs diff -r1.1 -r1.2 pkgsrc/audio/flactag/patches/patch-FileNameBuilder.cc (expand / switch to unified diff)

--- pkgsrc/audio/flactag/patches/patch-FileNameBuilder.cc 2012/02/04 09:26:11 1.1
+++ pkgsrc/audio/flactag/patches/patch-FileNameBuilder.cc 2012/11/06 18:38:34 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-FileNameBuilder.cc,v 1.1 2012/02/04 09:26:11 sbd Exp $ 1$NetBSD: patch-FileNameBuilder.cc,v 1.2 2012/11/06 18:38:34 drochner Exp $
2 2
3--- FileNameBuilder.cc.orig 2012-02-04 08:44:33.120854935 +0000 3--- FileNameBuilder.cc.orig 2012-10-19 21:40:21.000000000 +0000
4+++ FileNameBuilder.cc 4+++ FileNameBuilder.cc
5@@ -27,6 +27,7 @@ 5@@ -30,6 +30,7 @@
6 #include "FileNameBuilder.h" 
7  6
 7 #include <stdio.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9+#include <cstdio> 9+#include <cstdio>
10  10
11 #include <unac.h> 11 #include <unac.h>
12  12
cvs diff -r1.3 -r1.4 pkgsrc/audio/flactag/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/flactag/patches/patch-aa 2012/02/04 09:26:11 1.3
+++ pkgsrc/audio/flactag/patches/patch-aa 2012/11/06 18:38:34 1.4
@@ -1,24 +1,29 @@ @@ -1,24 +1,29 @@
1$NetBSD: patch-aa,v 1.3 2012/02/04 09:26:11 sbd Exp $ 1$NetBSD: patch-aa,v 1.4 2012/11/06 18:38:34 drochner Exp $
2 2
3--- UTF8Tag.cc.orig 2008-12-16 11:20:56.000000000 +0000 3--- UTF8Tag.cc.orig 2012-06-19 12:40:34.000000000 +0000
4+++ UTF8Tag.cc 4+++ UTF8Tag.cc
5@@ -32,6 +32,7 @@ 5@@ -34,6 +34,7 @@
6 #include <errno.h> 
7 #include <string.h> 6 #include <string.h>
 7 #include <stdio.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9+#include <cstdio> 9+#include <cstdio>
10  10
11 #include <iconv.h> 11 #include <iconv.h>
12  12
13@@ -71,7 +72,11 @@ void CUTF8Tag::Convert() 13@@ -73,11 +74,15 @@ void CUTF8Tag::Convert()
14 memset(Out,0,m_UTF8Value.length()*4); 14 memset(Out,0,m_UTF8Value.length()*4);
15 size_t OutLeft=m_UTF8Value.length()*4; 15 size_t OutLeft=m_UTF8Value.length()*4;
16  16
17+#if defined(__DragonFly__) || (__linux__) 17+#if defined(__DragonFly__) || (__linux__)
18 char *InBuff=In; 18 char *InBuff=In;
19+#else 19+#else
20+ const char *InBuff=In; 20+ const char *InBuff=In;
21+#endif 21+#endif
22 char *OutBuff=Out; 22 char *OutBuff=Out;
23  23
24 iconv_t Convert=iconv_open(Codeset,"UTF-8"); 24 std::stringstream NewCodeset;
 25- NewCodeset << Codeset << "//TRANSLIT//IGNORE";
 26+ NewCodeset << Codeset;
 27
 28 iconv_t Convert=iconv_open(NewCodeset.str().c_str(),"UTF-8");
 29 if ((iconv_t)-1!=Convert)
File Deleted: pkgsrc/audio/flactag/patches/Attic/patch-ac
File Deleted: pkgsrc/audio/flactag/patches/Attic/patch-ad