Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/05/10 18:50:47 bsiegert Exp $
+# $NetBSD: Makefile,v 1.32 2015/09/24 02:47:15 tnn Exp $

 DISTNAME=	arj-3.10.22
 PKGREVISION=	2
@@ -31,6 +31,8 @@ pre-configure:

 INSTALLATION_DIRS+=	${ARJ_DOCSDIR}

+BROKEN_ON_PLATFORM=	${LP64PLATFORMS}
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${WRKSRC}/doc/debug.txt 	\
 					${DESTDIR}${ARJ_DOCSDIR}
--- a/archivers/lhasa/Makefile
+++ b/archivers/lhasa/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2013/12/02 20:08:06 adam Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/26 21:25:31 shattered Exp $

-DISTNAME=	lhasa-0.2.0
+DISTNAME=	lhasa-0.3.0
 CATEGORIES=	archivers
 MASTER_SITES=	https://soulsphere.org/projects/lhasa/

--- a/archivers/lhasa/distinfo
+++ b/archivers/lhasa/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2013/12/02 20:08:06 adam Exp $
+$NetBSD: distinfo,v 1.6 2015/08/26 21:25:31 shattered Exp $

-SHA1 (lhasa-0.2.0.tar.gz) = ffc5c9cebe99e94f7ab3c8ddba522565eac8e42b
-RMD160 (lhasa-0.2.0.tar.gz) = b23a5c6b3603d9e76df58e05c7a3d73ff7832814
-Size (lhasa-0.2.0.tar.gz) = 2833575 bytes
+SHA1 (lhasa-0.3.0.tar.gz) = 044e9bf2bcef5664c1e13ecf440c4a4829059f0d
+RMD160 (lhasa-0.3.0.tar.gz) = 55d3dc69186fdc138279106f94cfb424559fad84
+Size (lhasa-0.3.0.tar.gz) = 2921183 bytes
--- a/archivers/lz4/Makefile
+++ b/archivers/lz4/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2015/06/09 12:04:19 fhajny Exp $
+# $NetBSD: Makefile,v 1.6 2015/08/24 16:28:32 fhajny Exp $

-DISTNAME=	lz4-r130
+DISTNAME=	lz4-r131
 PKGNAME=	${DISTNAME:S/-r/-/}
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Cyan4973/}

 MAINTAINER=	filip@joyent.com
-HOMEPAGE=	http://code.google.com/p/lz4/
+HOMEPAGE=	http://github.com/Cyan4973/lz4/
 COMMENT=	Extremely Fast Compression algorithm
 LICENSE=	2-clause-bsd

--- a/archivers/lz4/PLIST
+++ b/archivers/lz4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/06/09 12:04:19 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/08/24 16:28:32 fhajny Exp $
 bin/lz4
 bin/lz4c
 bin/lz4cat
@@ -9,7 +9,7 @@ include/lz4hc.h
 lib/liblz4.a
 lib/liblz4.so
 lib/liblz4.so.1
-lib/liblz4.so.1.7.0
+lib/liblz4.so.1.7.1
 lib/pkgconfig/liblz4.pc
 man/man1/lz4.1
 man/man1/lz4c.1
--- a/archivers/lz4/distinfo
+++ b/archivers/lz4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2015/06/09 12:04:19 fhajny Exp $
+$NetBSD: distinfo,v 1.7 2015/08/24 16:28:32 fhajny Exp $

-SHA1 (lz4-r130.tar.gz) = 5e1167e578639cb75e4103933dbf68e193a4d4c4
-RMD160 (lz4-r130.tar.gz) = c02f1852e17fea7f88f23cca5ca36a694b857d98
-Size (lz4-r130.tar.gz) = 129154 bytes
+SHA1 (lz4-r131.tar.gz) = b6eab6461977dca11e7efc4ed79d59924b216c7e
+RMD160 (lz4-r131.tar.gz) = 4a76a20739a4842bbbc6435c460e52b0a32f0540
+Size (lz4-r131.tar.gz) = 133784 bytes
 SHA1 (patch-Makefile) = c6e5cd7c375aea8d37704f307bd6488f80a208bf
 SHA1 (patch-lib_Makefile) = 30caae8b487ceedb378c7d4c264cacbfaf3df3e9
 SHA1 (patch-programs_Makefile) = 9211e3718b52834fe461dc57ca486113659bbf8d
--- a/archivers/lzip/Makefile
+++ b/archivers/lzip/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2014/11/20 07:32:15 mef Exp $
+# $NetBSD: Makefile,v 1.11 2015/07/26 12:15:30 mef Exp $

-DISTNAME=	lzip-1.16
+DISTNAME=	lzip-1.17
 CATEGORIES=	archivers
 MASTER_SITES=	http://download.savannah.gnu.org/releases/lzip/

--- a/archivers/lzip/distinfo
+++ b/archivers/lzip/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2014/11/20 07:32:15 mef Exp $
+$NetBSD: distinfo,v 1.7 2015/07/26 12:15:30 mef Exp $

-SHA1 (lzip-1.16.tar.gz) = 5bcefbb788305db7be9748d3c0478156518f1025
-RMD160 (lzip-1.16.tar.gz) = f2e5ef5a56ece6b56330f2365e3703592266833a
-Size (lzip-1.16.tar.gz) = 86035 bytes
+SHA1 (lzip-1.17.tar.gz) = d023f1e95202e45b50656833d09eee1a8c7bd9d6
+RMD160 (lzip-1.17.tar.gz) = bf3d2c68939cbf7d489e4635009dfddbc5c2092d
+Size (lzip-1.17.tar.gz) = 91299 bytes
--- a/archivers/lziprecover/Makefile
+++ b/archivers/lziprecover/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2015/01/04 10:45:22 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/26 12:17:47 mef Exp $

-DISTNAME=	lziprecover-1.16
+DISTNAME=	lziprecover-1.17
 CATEGORIES=	archivers
 MASTER_SITES=	http://download.savannah.gnu.org/releases/lzip/lziprecover/

--- a/archivers/lziprecover/distinfo
+++ b/archivers/lziprecover/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2015/01/04 10:45:22 wiz Exp $
+$NetBSD: distinfo,v 1.4 2015/07/26 12:17:47 mef Exp $

-SHA1 (lziprecover-1.16.tar.gz) = 2e044ba9497bd96d912d304aef3108b3a7169115
-RMD160 (lziprecover-1.16.tar.gz) = e9e0047057177fcd3f608ade386c93c333db8b55
-Size (lziprecover-1.16.tar.gz) = 71746 bytes
+SHA1 (lziprecover-1.17.tar.gz) = 004ba46a0bc33e133326dc225a4f6ffdcdc18981
+RMD160 (lziprecover-1.17.tar.gz) = 37389b61739f68cb9a1c5a2abe3da5f2ea4da30c
+Size (lziprecover-1.17.tar.gz) = 75941 bytes
--- a/archivers/ocaml-bz2/Makefile
+++ b/archivers/ocaml-bz2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/01/20 14:24:34 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2015/08/07 11:20:33 jaapb Exp $

 PKGNAME=	ocaml-bz2-${VERSION}
 DISTNAME=	camlbz2-${VERSION}
 VERSION=	0.6.0
-PKGREVISION=	4
+PKGREVISION=	6
 CATEGORIES=	archivers
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/72/

--- a/archivers/ocaml-zip/Makefile
+++ b/archivers/ocaml-zip/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2015/01/20 14:24:35 jaapb Exp $
+# $NetBSD: Makefile,v 1.13 2015/08/07 11:20:33 jaapb Exp $
 #

 PKGNAME=	ocaml-zip-${VERSION}
 DISTNAME=	camlzip-${VERSION}
 VERSION=	1.05
-PKGREVISION=	3
+PKGREVISION=	5
 CATEGORIES=	archivers
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1037/
 LICENSE=	gnu-lgpl-v2.1
--- a/archivers/p5-Archive-Any-Lite/Makefile
+++ b/archivers/p5-Archive-Any-Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/06/12 10:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/20 14:07:34 mef Exp $

 DISTNAME=	Archive-Any-Lite-0.10
 PKGNAME=	p5-${DISTNAME}
@@ -13,6 +13,9 @@ LICENSE=	${PERL5_LICENSE}

 DEPENDS+=	p5-Module-CPANfile>=0:../../devel/p5-Module-CPANfile
 DEPENDS+=	p5-ExtUtils-MakeMaker-CPANfile>=0:../../devel/p5-ExtUtils-MakeMaker-CPANfile
+# for make test
+BUILD_DEPENDS+=	p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
+BUILD_DEPENDS+=	p5-Test-UseAllModules-[0-9]*:../../devel/p5-Test-UseAllModules

 PERL5_PACKLIST=	auto/Archive/Any/Lite/.packlist

--- a/archivers/p5-Archive-Any/Makefile
+++ b/archivers/p5-Archive-Any/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/06/12 10:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/07/12 18:56:06 wiz Exp $

 DISTNAME=	Archive-Any-0.0942
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://search.cpan.org/dist/Archive-Any/
 COMMENT=	Perl5 module with single interface to deal with archives
 LICENSE=	${PERL5_LICENSE}

-DEPENDS+=	{perl>=5.9.3,p5-Archive-Tar>=0.22}:../../archivers/p5-Archive-Tar
+#DEPENDS+=	{perl>=5.9.3,p5-Archive-Tar>=0.22}:../../archivers/p5-Archive-Tar
 DEPENDS+=	p5-Archive-Tar>=0:../../archivers/p5-Archive-Tar
 DEPENDS+=	p5-Archive-Zip>=0:../../archivers/p5-Archive-Zip
 DEPENDS+=	p5-File-MMagic>=0:../../misc/p5-File-MMagic
--- a/archivers/p5-Archive-Extract/Makefile
+++ b/archivers/p5-Archive-Extract/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2015/06/12 10:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/15 23:59:14 mef Exp $

-DISTNAME=	Archive-Extract-0.74
+DISTNAME=	Archive-Extract-0.76
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}

--- a/archivers/p5-Archive-Extract/distinfo
+++ b/archivers/p5-Archive-Extract/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2015/01/26 07:48:36 mef Exp $
+$NetBSD: distinfo,v 1.2 2015/08/15 23:59:14 mef Exp $

-SHA1 (Archive-Extract-0.74.tar.gz) = 54f24360baf4852fdc1850a1a88c7fbb6b1b858b
-RMD160 (Archive-Extract-0.74.tar.gz) = a18c6d6f2c24ea1bbe488f5ee30789a590082517
-Size (Archive-Extract-0.74.tar.gz) = 27392 bytes
+SHA1 (Archive-Extract-0.76.tar.gz) = 1f20aac711658fb11b31dd08177f698457654ffe
+RMD160 (Archive-Extract-0.76.tar.gz) = 57309bd9bd9ac8263560ddb041b8870f5296cd9d
+Size (Archive-Extract-0.76.tar.gz) = 27530 bytes
--- a/archivers/p5-Archive-Tar-Wrapper/Makefile
+++ b/archivers/p5-Archive-Tar-Wrapper/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2015/06/12 10:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/08/16 00:07:53 mef Exp $

-DISTNAME=	Archive-Tar-Wrapper-0.22
+DISTNAME=	Archive-Tar-Wrapper-0.23
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}

@@ -11,6 +10,11 @@ HOMEPAGE=	http://search.cpan.org/~mschilli/Archive-Tar-Wrapper/
 COMMENT=	API wrapper around the 'tar' utility
 LICENSE=	${PERL5_LICENSE}

+# for make test
+BUILD_DEPENDS+=	p5-Log-Log4perl-[0-9]*:../../devel/p5-Log-Log4perl
+BUILD_DEPENDS+=	p5-File-Which-[0-9]*:../../devel/p5-File-Which
+BUILD_DEPENDS+=	p5-IPC-Run-[0-9]*:../../devel/p5-IPC-Run
+
 PERL5_PACKLIST=	auto/Archive/Tar/Wrapper/.packlist
 USE_LANGUAGES=	# none

--- a/archivers/p5-Archive-Tar-Wrapper/distinfo
+++ b/archivers/p5-Archive-Tar-Wrapper/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2015/05/24 07:33:59 mef Exp $
+$NetBSD: distinfo,v 1.3 2015/08/16 00:07:53 mef Exp $

-SHA1 (Archive-Tar-Wrapper-0.22.tar.gz) = 287fbd4290d6950cc92143a850e3616cf9275378
-RMD160 (Archive-Tar-Wrapper-0.22.tar.gz) = 9c716770c0d96de6f55c96f6e001c2d7678f9a77
-Size (Archive-Tar-Wrapper-0.22.tar.gz) = 16230 bytes
+SHA1 (Archive-Tar-Wrapper-0.23.tar.gz) = 0d3afa0315c6e5a45c1c4d907632cb18dbea2c1f
+RMD160 (Archive-Tar-Wrapper-0.23.tar.gz) = 08bb974c95182b4240ee1d2954a126cfe5a209bd
+Size (Archive-Tar-Wrapper-0.23.tar.gz) = 16287 bytes
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2015/06/12 10:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2015/07/12 18:56:06 wiz Exp $

 DISTNAME=	Archive-Tar-2.04
 PKGNAME=	p5-${DISTNAME}
@@ -11,9 +11,9 @@ HOMEPAGE=	http://search.cpan.org/dist/Archive-Tar/
 COMMENT=	Perl5 module interface to manipulate tar files
 LICENSE=	${PERL5_LICENSE}

-DEPENDS+=	{perl>=5.9.3,p5-IO-Zlib>=1.01}:../../devel/p5-IO-Zlib
+#DEPENDS+=	{perl>=5.9.3,p5-IO-Zlib>=1.01}:../../devel/p5-IO-Zlib
 # IO::Compress::{Base,Gzip,Bzip2} are included since perl-5.10.1
-DEPENDS+=	{perl>=5.10.1,p5-IO-Compress>=2.017}:../../devel/p5-IO-Compress
+#DEPENDS+=	{perl>=5.10.1,p5-IO-Compress>=2.017}:../../devel/p5-IO-Compress
 DEPENDS+=	p5-IO-String-[0-9]*:../../devel/p5-IO-String
 DEPENDS+=	p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff

--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2015/06/12 10:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2015/08/26 11:46:46 wiz Exp $

-DISTNAME=	Archive-Zip-1.46
+DISTNAME=	Archive-Zip-1.50
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Archive/}

@@ -11,10 +10,13 @@ HOMEPAGE=	http://search.cpan.org/dist/Archive-Zip/
 COMMENT=	Perl5 module interface to manipulate zip files
 LICENSE=	${PERL5_LICENSE}

-DEPENDS+=	{perl>=5.10.1,p5-IO-Compress>=2.017}:../../devel/p5-IO-Compress	# Compress::Raw::Zlib>=2.017
+#DEPENDS+=	{perl>=5.10.1,p5-IO-Compress>=2.017}:../../devel/p5-IO-Compress	# Compress::Raw::Zlib>=2.017

 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Archive/Zip/.packlist

+post-extract:
+	rm -rf ${WRKSRC}/PaxHeader ${WRKSRC}/*/PaxHeader ${WRKSRC}/*/*/PaxHeader
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/archivers/p5-Archive-Zip/distinfo
+++ b/archivers/p5-Archive-Zip/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2015/04/05 04:44:09 mef Exp $
+$NetBSD: distinfo,v 1.20 2015/08/26 11:46:46 wiz Exp $

-SHA1 (Archive-Zip-1.46.tar.gz) = bb552467b0ded28efbeaff82cfe9a3eaafaaf5f3
-RMD160 (Archive-Zip-1.46.tar.gz) = 387f23de6c25ca351a9f8539eb1b57e65f3306b2
-Size (Archive-Zip-1.46.tar.gz) = 186426 bytes
+SHA1 (Archive-Zip-1.50.tar.gz) = 744ff3d53956a27a81385d84038c19e0abc75879
+RMD160 (Archive-Zip-1.50.tar.gz) = fabc0bf3f9a9eec0c583add6c9510131f802e41e
+Size (Archive-Zip-1.50.tar.gz) = 188086 bytes
--- a/archivers/sarab/Makefile
+++ b/archivers/sarab/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2012/09/11 19:47:01 asau Exp $
+# $NetBSD: Makefile,v 1.6 2015/09/03 02:50:20 dsainty Exp $

 DISTNAME=	sarab-0.2.4
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sarab/}

-MAINTAINER=	dsainty@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sarab.sourceforge.net/
 COMMENT=	Schedule And Rotate Automatic Backups
 #LICENSE=	GPL
--- a/archivers/unarj/distinfo
+++ b/archivers/unarj/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2014/06/26 20:12:43 asau Exp $
+$NetBSD: distinfo,v 1.7 2015/08/11 18:07:55 wiz Exp $

 SHA1 (unarj-2.65.tar.gz) = 56843e95e6b6ac7577dfdfbfee5af166b5e2c74f
 RMD160 (unarj-2.65.tar.gz) = 59984fc428d1fc99aa3e18485f82e9ee45a801ba
 Size (unarj-2.65.tar.gz) = 74911 bytes
 SHA1 (patch-aa) = e64a69fc4f91ba69fc642e6d742a0cc36cfddbb0
 SHA1 (patch-ab) = 15216bc07298ce0956bfbadfaae763622ee88a0c
-SHA1 (patch-ac) = 59245f61d731e2fd6dc101fefe0f62db0c55b55e
+SHA1 (patch-ac) = d3fb016de598f21aefb795259f2a65a9bc65811c
 SHA1 (patch-ad) = 46c469ade1a20da7e3ac633652e4ec926ba2b08f
--- a/archivers/unarj/patches/patch-ac
+++ b/archivers/unarj/patches/patch-ac
@@ -1,30 +1,28 @@
-$NetBSD: patch-ac,v 1.3 1999/05/22 22:07:04 tv Exp $
+$NetBSD: patch-ac,v 1.4 2015/08/11 18:07:55 wiz Exp $

--- environ.c.orig	Mon Sep 29 06:00:24 1997
-+++ environ.c	Sat May 22 18:03:52 1999
-@@ -430,16 +430,17 @@
+--- environ.c.orig	2002-06-05 10:28:06.000000000 +0000
+++ environ.c
+@@ -430,16 +430,10 @@ uint  host;
 
 #define SUBS_DEFINED
 
 +#include <stdlib.h>
 +#include <string.h>
 #include <time.h>
-+#include <sys/types.h>
- 
+-
 -#ifndef time_t
 -#define time_t long
 -#endif
 -
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- extern struct tm *localtime();
- extern time_t time();
- extern char   *strcpy();
- extern voidp  *malloc();
-+#endif
+-extern struct tm *localtime();
+-extern time_t time();
+-extern char   *strcpy();
+-extern voidp  *malloc();
+#include <sys/types.h>
 
 FILE *
 file_open(name, mode)
-@@ -535,8 +536,12 @@
+@@ -535,8 +529,12 @@ uint mode;
 }
 
 long
@@ -38,7 +36,7 @@ $NetBSD: patch-ac,v 1.3 1999/05/22 22:07:04 tv Exp $
 #define NOONOFFSET    43200L
 #define SEC_IN_DAY    (24L * 60L * 60L)
 #define INV_VALUE     (SEC_IN_DAY + 1L)
-@@ -552,6 +557,7 @@
+@@ -552,6 +550,7 @@ gettz()         /* returns the offset fr
     noontm = localtime(&noon);
     retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min);
     return retval;
@@ -46,7 +44,7 @@ $NetBSD: patch-ac,v 1.3 1999/05/22 22:07:04 tv Exp $
 }
 
 long
-@@ -609,7 +615,8 @@
+@@ -609,7 +608,8 @@ uint  host;
     (uint) attribute;
     (uint) host;
 
--- a/archivers/unrar/Makefile.common
+++ b/archivers/unrar/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2015/01/11 13:26:04 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2015/08/13 15:42:05 adam Exp $
 #
 # used by archivers/libunrar/Makefile
 # used by archivers/unrar/Makefile

-DISTNAME=	unrarsrc-5.2.4
+DISTNAME=	unrarsrc-5.3.2
 PKGNAME=	${DISTNAME:S/src//}
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rarlab.com/rar/
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.53 2015/01/11 13:26:04 adam Exp $
+$NetBSD: distinfo,v 1.54 2015/08/13 15:42:05 adam Exp $

-SHA1 (unrarsrc-5.2.4.tar.gz) = 19de7ef93b5b483045f1689eb90834431d90dc1f
-RMD160 (unrarsrc-5.2.4.tar.gz) = 7629544389d3af026807ff7928c749120c8726c4
-Size (unrarsrc-5.2.4.tar.gz) = 217915 bytes
+SHA1 (unrarsrc-5.3.2.tar.gz) = 4940a81febac52e7f1fd0140acc148b09cba864e
+RMD160 (unrarsrc-5.3.2.tar.gz) = 7f1ad8382f465e82cd9ae0e29b6a4544cccf835c
+Size (unrarsrc-5.3.2.tar.gz) = 221786 bytes
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2014/10/09 14:05:55 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2015/08/28 08:17:38 richard Exp $

 DISTNAME=	zip30
 PKGNAME=	zip-3.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/
 EXTRACT_SUFX=	.tgz
@@ -32,7 +32,7 @@ BUILD_TARGET=	generic
 CFLAGS+=	-O
 .endif

-.if !empty(PKGSRC_COMPILER:Msunpro) || ${OPSYS} == "SunOS"
+.if !empty(PKGSRC_COMPILER:Msunpro)
 MAKE_FLAGS+=	DISABLE_ASM=YES
 .endif

--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2013/04/16 10:49:31 adam Exp $
+$NetBSD: distinfo,v 1.15 2015/08/28 08:17:38 richard Exp $

 SHA1 (zip30.tgz) = c9f4099ecf2772b53c2dd4a8e508064ce015d182
 RMD160 (zip30.tgz) = 1fc99daf3e36494ba392c7514a714fe3d258d232
 Size (zip30.tgz) = 1118845 bytes
 SHA1 (patch-aa) = e9fc1d2801cb4e0e193c6378bcf0ffbc8dfb3bd3
-SHA1 (patch-ab) = e294e3a485364c92a1799ea18c9f1cb296e9d09d
+SHA1 (patch-ab) = 9b5e62be5f7e6d2e4640ade5bf8c469681e6246f
--- a/archivers/zip/patches/patch-ab
+++ b/archivers/zip/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2013/04/16 10:49:31 adam Exp $
+$NetBSD: patch-ab,v 1.7 2015/08/28 08:17:38 richard Exp $

 Use CPPFLAGS during configuration.
 Don't force compiler optimization flags.
@@ -26,6 +26,25 @@ Introduce DISABLE_ASM
 
 
 # bzip2
+@@ -221,12 +217,12 @@ echo Check for the C preprocessor
+ # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
+ CPP="${CC} -E"
+ # solaris as(1) needs -P, maybe others as well ?
+-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
+-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
+-[ -f /lib/cpp ] && CPP=/lib/cpp
+-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
+-[ -f /xenix ] && CPP="${CC} -E"
+-[ -f /lynx.os ] && CPP="${CC} -E"
+#[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
+#[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
+#[ -f /lib/cpp ] && CPP=/lib/cpp
+#[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
+#[ -f /xenix ] && CPP="${CC} -E"
+#[ -f /lynx.os ] && CPP="${CC} -E"
+ 
+ echo "#include <stdio.h>" > conftest.c
+ $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
@@ -235,6 +231,7 @@ $CPP conftest.c >/dev/null 2>/dev/null |
 echo Check if we can use asm code
 OBJA=""
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.523 2015/04/24 06:37:34 jnemeth Exp $
+# $NetBSD: Makefile,v 1.524 2015/09/11 12:35:35 wiz Exp $
 #

 COMMENT=	Audio tools
@@ -411,6 +411,7 @@ SUBDIR+=	rsynth
 SUBDIR+=	rtunes
 SUBDIR+=	ruby-mp3info
 SUBDIR+=	ruby-taglib
+SUBDIR+=	schismtracker
 SUBDIR+=	sfxr
 SUBDIR+=	shine
 SUBDIR+=	shntool
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2015/01/08 10:27:24 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2015/08/08 11:44:34 wiz Exp $

-DISTNAME=	abcde-2.6
-PKGREVISION=	1
+DISTNAME=	abcde-2.7
 CATEGORIES=	audio
 MASTER_SITES=	http://abcde.einval.com/download/

-MAINTAINER=	sekiya@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://abcde.einval.com/
 COMMENT=	Command-line utility to rip and encode an audio CD

--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.38 2015/01/08 10:27:24 wiz Exp $
+$NetBSD: distinfo,v 1.39 2015/07/01 09:28:25 wiz Exp $

-SHA1 (abcde-2.6.tar.gz) = a1545fb63673e247c8378e9925505e23ace806dc
-RMD160 (abcde-2.6.tar.gz) = 958f163b33efeda99b16f5ae6bfe35831e9eb652
-Size (abcde-2.6.tar.gz) = 105609 bytes
+SHA1 (abcde-2.7.tar.gz) = 96922c903e6ee77fe0b67cb22f2a68819d63b374
+RMD160 (abcde-2.7.tar.gz) = a675dad88c6df27e11a5d3dc2625e871b0ddec5a
+Size (abcde-2.7.tar.gz) = 140039 bytes
 SHA1 (patch-ab) = eacbb4582c8dc74c6415adbb0af387aacce81ccc
-SHA1 (patch-abcde) = 90454d1fd7a83fce184afa71ce87675b0fdec241
+SHA1 (patch-abcde) = c3cb9e729b795d37c0d46cf13535a444e0cecfac
--- a/audio/abcde/patches/patch-abcde
+++ b/audio/abcde/patches/patch-abcde
@@ -1,13 +1,13 @@
-$NetBSD: patch-abcde,v 1.1 2015/01/08 10:27:24 wiz Exp $
+$NetBSD: patch-abcde,v 1.2 2015/07/01 09:28:25 wiz Exp $

 Default to cdda2wav since icedax is not in pkgsrc.

--- abcde.orig	2014-10-26 20:16:54.000000000 +0000
+--- abcde.orig	2015-06-18 12:26:40.000000000 +0000
 +++ abcde
-@@ -3274,7 +3274,7 @@ AACTAG=faac
- ATOMICPARSLEY=AtomicParsley
+@@ -3441,7 +3441,7 @@ NEROAACTAG=neroAacTag
 
 CDPARANOIA=cdparanoia
+ CD_PARANOIA=cd-paranoia
 -CDDA2WAV=icedax
 +CDDA2WAV=cdda2wav
 DAGRAB=dagrab
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/09/24 11:10:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2015/08/18 07:31:01 wiz Exp $
 #

 DISTNAME=	alsa-utils-1.0.27.2
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/utils/
 MASTER_SITES+=	ftp://gd.tuwien.ac.at/opsys/linux/alsa/utils/
--- a/audio/amarok-kde3/Makefile
+++ b/audio/amarok-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2015/04/25 14:20:18 tnn Exp $
+# $NetBSD: Makefile,v 1.63 2015/06/30 09:57:34 ryoon Exp $

 DISTNAME=		amarok-${VERSION}
 VERSION=		1.4.10
-PKGREVISION=		58
+PKGREVISION=		59
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_KDE:=amarok/${VERSION}/src/}
 EXTRACT_SUFX=		.tar.bz2
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.154 2015/06/12 10:48:22 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2015/06/30 09:57:33 ryoon Exp $

 DISTNAME=	amarok-${VERS}
 VERS=		2.8.0
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	audio multimedia
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/
 EXTRACT_SUFX=	.tar.bz2
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2015/06/07 14:05:57 youri Exp $
+# $NetBSD: Makefile,v 1.51 2015/08/23 14:30:36 wiz Exp $
 #

 DISTNAME=	ario-1.5.1
-PKGREVISION=	33
+PKGREVISION=	34
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ario-player/1.5.1/}

--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,30 +1,39 @@
-# $NetBSD: Makefile,v 1.92 2015/04/25 14:20:18 tnn Exp $
+# $NetBSD: Makefile,v 1.98 2015/09/18 21:19:07 mrg Exp $

 DISTNAME=		audacity-minsrc-2.1.0
 PKGNAME=		${DISTNAME:S/-minsrc//1}
-PKGREVISION=		1
+PKGREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=audacity/}
 EXTRACT_SUFX=		.tar.xz

 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://audacity.sourceforge.net/
+HOMEPAGE=		http://audacityteam.org/
 COMMENT=		Audio editor
 LICENSE=		gnu-gpl-v2 # AND cc-by-v3.0-license

 USE_LIBTOOL=		yes
-USE_TOOLS+=		autoconf gmake intltool msgfmt msgmerge pkg-config
+USE_TOOLS+=		automake autoreconf
+USE_TOOLS+=		gmake intltool msgfmt msgmerge pkg-config
 USE_TOOLS+=		xgettext zip:run
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-expat=system --without-xaudio
-CONFIGURE_ARGS+=	--with-ffmpeg=system --with-libflac=system
-CONFIGURE_ARGS+=	--with-id3tag=system --with-libmad=system
-CONFIGURE_ARGS+=	--with-vorbis=system --with-sbsms=system
-CONFIGURE_ARGS+=	--with-libsamplerate=system --with-soundtouch=system
-CONFIGURE_ARGS+=	--with-twolame=system --with-lv2=system
-CONFIGURE_ARGS+=	--with-libsndfile=system --with-portaudio=local
-CONFIGURE_ARGS+=	--enable-nyquist=yes --with-midi=local
+CONFIGURE_ARGS+=	--enable-nyquist=yes
+CONFIGURE_ARGS+=	--with-expat=system
+CONFIGURE_ARGS+=	--with-ffmpeg=system
+CONFIGURE_ARGS+=	--with-id3tag=system
+CONFIGURE_ARGS+=	--with-libflac=system
+CONFIGURE_ARGS+=	--with-libmad=system
+CONFIGURE_ARGS+=	--with-libsamplerate=system
+CONFIGURE_ARGS+=	--with-libsndfile=system
+CONFIGURE_ARGS+=	--with-lv2=system
+CONFIGURE_ARGS+=	--with-midi=local
+CONFIGURE_ARGS+=	--with-portaudio=local
+CONFIGURE_ARGS+=	--with-sbsms=system
+CONFIGURE_ARGS+=	--with-soundtouch=system
+CONFIGURE_ARGS+=	--with-twolame=system
+CONFIGURE_ARGS+=	--with-vorbis=system
+CONFIGURE_ARGS+=	--without-xaudio

 CONFIG_GUESS_OVERRIDE=		\
 	config.guess */config.guess */*/config.guess */*/*/config.guess
@@ -34,6 +43,13 @@ CONFIG_SUB_OVERRIDE=		\
 PTHREAD_AUTO_VARS=	yes
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}

+# regen Makefile.in to avoid being built as shared libraries
+pre-configure:
+	cd ${WRKSRC}/lib-src/FileDialog && ${PKGSRC_SETENV} autoreconf -fiv
+	cd ${WRKSRC}/lib-src/portaudio-v19 && ${PKGSRC_SETENV} autoreconf -fiv
+	cd ${WRKSRC}/lib-src/portmixer && ${PKGSRC_SETENV} autoreconf -fiv
+	cd ${WRKSRC}/lib-src/lib-widget-extra && autoreconf -fiv
+
 .include "options.mk"

 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
@@ -57,13 +73,8 @@ BUILDLINK_API_DEPENDS.flac+=	flac>=1.3.0
 .include "../../audio/flac/buildlink3.mk"
 .include "../../multimedia/ffmpeg1/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# XXX Internal compiler error with -O2
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS+=	-O
-.endif
--- a/audio/audacity/PLIST
+++ b/audio/audacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/04/20 13:38:23 rodent Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/09/18 21:19:07 mrg Exp $
 bin/audacity
 man/man1/audacity.1
 share/appdata/audacity.appdata.xml
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,14 +1,19 @@
-$NetBSD: distinfo,v 1.27 2015/04/27 23:50:38 joerg Exp $
+$NetBSD: distinfo,v 1.29 2015/09/18 21:19:07 mrg Exp $

 SHA1 (audacity-minsrc-2.1.0.tar.xz) = a53bce0276240bb56f2e3fd1bf235a4ef688caa3
 RMD160 (audacity-minsrc-2.1.0.tar.xz) = 16b0e91222b91b47eeb533d4725b68e5548c057f
 Size (audacity-minsrc-2.1.0.tar.xz) = 5104924 bytes
+SHA1 (patch-Makefile.in) = 8a770c2ab0494359c22d7f8e1b548fb83c2c00ff
 SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
 SHA1 (patch-am) = 23ffc055ee81fad7b3aab8f7dd447e641644be96
+SHA1 (patch-lib-src_FileDialog_Makefile.am) = 234c29402f157000dc3afb0b39e23f107c50eaf3
+SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = afa60d928f9d3de287815b4f7aadd4bbcc700a21
 SHA1 (patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c) = 3724b3e7cdd1f45cd38c76f2da3a3af6048dddb3
 SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = c7a6c6a7f0dbb3828a4d5780ec94908b40d974d2
 SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c) = a55127d6173d3ffb729fde7358bedd7c1320bf09
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = a0d194f7f7f278cfba1f54269e0323990abb73f3
+SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d
+SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c
 SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
 SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb
--- a/audio/audacity/patches/patch-Makefile.in
+++ b/audio/audacity/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2015/09/18 08:46:20 wiz Exp $
+
+Do not install a shell script over the real executable.
+
+--- Makefile.in.orig	2015-03-04 23:58:48.000000000 +0000
+++ Makefile.in
+@@ -414,7 +414,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = help images lib-src po src tests
+ ACLOCAL_AMFLAGS = -I m4
+-bin_SCRIPTS = audacity$(EXEEXT)
+bin_SCRIPTS = 
+ dist_doc_DATA = LICENSE.txt README.txt
+ dist_pkgdata_DATA = presets/EQDefaultCurves.xml
+ nobase_dist_pkgdata_DATA = \
--- a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
+++ b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+
+don't build a shared library of this.
+
+--- lib-src/FileDialog/Makefile.am.orig	2015-03-01 17:07:12.000000000 -0800
+++ lib-src/FileDialog/Makefile.am	2015-09-18 11:28:47.000000000 -0700
+@@ -2,7 +2,7 @@
+ 
+ EXTRA_DIST = FileDialog.vcproj FileDialogPrivate.h.in
+ 
+-lib_LTLIBRARIES = libFileDialog.la
+noinst_LTLIBRARIES = libFileDialog.la
+ 
+ libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS)
+ libFileDialog_la_LIBADD = $(WX_LIBS)
--- a/audio/audacity/patches/patch-lib-src_lib-widget-extra_Makefile.am
+++ b/audio/audacity/patches/patch-lib-src_lib-widget-extra_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib-src_lib-widget-extra_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+
+don't build a shared library of this.
+
+--- lib-src/lib-widget-extra/Makefile.am.orig	2015-03-01 17:07:17.000000000 -0800
+++ lib-src/lib-widget-extra/Makefile.am	2015-09-18 11:29:29.000000000 -0700
+@@ -5,7 +5,7 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libwidgetextra.pc
+ 
+-lib_LTLIBRARIES = libwidgetextra.la
+noinst_LTLIBRARIES = libwidgetextra.la
+ 
+ libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS)
+ libwidgetextra_la_LIBADD = $(WX_LIBS)
--- a/audio/audacity/patches/patch-lib-src_portmixer_src-extra_Makefile.am
+++ b/audio/audacity/patches/patch-lib-src_portmixer_src-extra_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib-src_portmixer_src-extra_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+
+don't build a shared library of this.
+
+--- lib-src/portmixer/src/Makefile.am.orig	2015-03-01 17:07:05.000000000 -0800
+++ lib-src/portmixer/src/Makefile.am	2015-09-18 11:29:08.000000000 -0700
+@@ -1,4 +1,4 @@
+-lib_LTLIBRARIES = libportmixer.la
+noinst_LTLIBRARIES = libportmixer.la
+ 
+ libportmixer_la_CPPFLAGS = -I$(top_srcdir)/include $(PORTAUDIO_CFLAGS)
+ libportmixer_la_SOURCES = \
--- a/audio/audacity/patches/patch-lib-src_sbsms_src-extra_Makefile.am
+++ b/audio/audacity/patches/patch-lib-src_sbsms_src-extra_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib-src_sbsms_src-extra_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+
+don't build a shared library of this.
+
+--- lib-src/sbsms/src/Makefile.am.orig	2015-03-01 17:07:04.000000000 -0800
+++ lib-src/sbsms/src/Makefile.am	2015-09-18 11:29:19.000000000 -0700
+@@ -3,7 +3,7 @@
+ libsbsmsincludedir = $(includedir)
+ libsbsmsinclude_HEADERS = ../include/sbsms.h
+ 
+-lib_LTLIBRARIES = libsbsms.la
+noinst_LTLIBRARIES = libsbsms.la
+ libsbsms_la_SOURCES = \
+ 	sms.cpp \
+ 	track.cpp \
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/10/14 13:02:39 roy Exp $
+# $NetBSD: Makefile,v 1.28 2015/08/18 07:31:01 wiz Exp $

 .include "Makefile.common"
+PKGREVISION=	1

 COMMENT+=	(curses interface only)

--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/10/09 14:05:55 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2015/08/18 07:31:01 wiz Exp $
 #

 DISTNAME=	cam-1.02
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
 EXTRACT_SUFX=	.tgz
--- a/audio/cdparanoia/distinfo
+++ b/audio/cdparanoia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2015/02/21 00:09:08 joerg Exp $
+$NetBSD: distinfo,v 1.33 2015/08/10 21:19:28 khorben Exp $

 SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
 RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
@@ -15,7 +15,7 @@ SHA1 (patch-cc) = e692c8f4a9811123baa6cb25c09dea0004cc9b68
 SHA1 (patch-cd) = c37da19fc99b5aa5682b08cd6ad162687e9b1337
 SHA1 (patch-ce) = b343191fa2e337e2c3c091c585451c726c1f745b
 SHA1 (patch-cf) = 4208e82efd5bba15677dcc0ae5883bd9353624c6
-SHA1 (patch-cg) = fd92ca2b999c4d25ddbe5abe5f384c5c83019624
+SHA1 (patch-cg) = a492f6d2459f75420930d8a6f264bde82119d23e
 SHA1 (patch-ch) = 80672901f4ddbc4f7228cfa1f57ee477c1e1ac28
 SHA1 (patch-ci) = bc0645bf6d2e3841817adb639bfa3ac68cb7f606
 SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
--- a/audio/cdparanoia/patches/patch-cg
+++ b/audio/cdparanoia/patches/patch-cg
@@ -1,7 +1,11 @@
-$NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
+$NetBSD: patch-cg,v 1.13 2015/08/10 21:19:28 khorben Exp $
+
+- fix ripping on NetBSD/amd64
+- build fix on DragonFly
+- build fix on NetBSD with SSP

 --- interface/scsi_interface.c.orig	2008-09-11 20:33:30.000000000 +0000
-+++ interface/scsi_interface.c	2009-09-10 12:02:02.000000000 +0000
+++ interface/scsi_interface.c
@@ -12,7 +12,16 @@
 #include "common_interface.h"
 #include "utils.h"
@@ -20,7 +24,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
   struct timespec tv1;
   struct timespec tv2;
   int ret1=clock_gettime(d->private->clock,&tv1);
-@@ -36,6 +45,7 @@
+@@ -36,6 +45,7 @@ static void tweak_SG_buffer(cdrom_drive 
   int table, reserved, cur, err;
   char buffer[256];
 
@@ -28,7 +32,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
   /* SG_SET_RESERVED_SIZE doesn't actually allocate or reserve anything.
    * what it _does_ do is give you an error if you ask for a value
    * larger than q->max_sectors (the length of the device's bio request
-@@ -54,6 +64,10 @@
+@@ -54,6 +64,10 @@ static void tweak_SG_buffer(cdrom_drive 
      implement working sg lists with SG_IO devices, so who knows... */
   if (ioctl(d->cdda_fd, SG_GET_SG_TABLESIZE, &table) < 0)
     table=1;
@@ -39,7 +43,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 
   sprintf(buffer,"\tDMA scatter/gather table entries: %d\n\t"
 	  "table entry size: %d bytes\n\t"
-@@ -93,6 +107,7 @@
+@@ -93,6 +107,7 @@ static void tweak_SG_buffer(cdrom_drive 
   cdmessage(d,buffer);
 }
 
@@ -47,7 +51,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 static void clear_garbage(cdrom_drive *d){
   fd_set fdset;
   struct timeval tv;
-@@ -123,6 +138,7 @@
+@@ -123,6 +138,7 @@ static void clear_garbage(cdrom_drive *d
     flag=1;
   }
 }
@@ -55,7 +59,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 
 static int check_sbp_error(const unsigned char status,
 			   const unsigned char *sbp) {
-@@ -172,6 +188,7 @@
+@@ -172,6 +188,7 @@ static int check_sbp_error(const unsigne
   return 0;
 }
 
@@ -63,7 +67,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 /* process a complete scsi command. */
 static int sg2_handle_scsi_cmd(cdrom_drive *d,
 			       unsigned char *cmd,
-@@ -356,7 +373,11 @@
+@@ -356,7 +373,11 @@ static int sgio_handle_scsi_cmd(cdrom_dr
   hdr.timeout = 50000;
   hdr.interface_id = 'S';
   hdr.dxferp =  d->private->sg_buffer;
@@ -75,7 +79,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 
   /* scary buffer fill hack */
   if(bytecheck && out_size>in_size)
-@@ -417,6 +438,71 @@
+@@ -417,6 +438,71 @@ static int sgio_handle_scsi_cmd(cdrom_dr
   errno = 0;
   return 0;
 }
@@ -147,7 +151,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 
 static int handle_scsi_cmd(cdrom_drive *d,
 			   unsigned char *cmd,
-@@ -427,9 +513,14 @@
+@@ -427,9 +513,14 @@ static int handle_scsi_cmd(cdrom_drive *
 			   int bytecheck,
 			   unsigned char *sense){
 
@@ -162,7 +166,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 
 }
 
-@@ -453,6 +544,7 @@
+@@ -453,6 +544,7 @@ static int test_unit_ready(cdrom_drive *
   return 1;
 }
 
@@ -170,7 +174,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 static void reset_scsi(cdrom_drive *d){
   int arg,tries=0;
   d->enable_cdda(d,0);
-@@ -471,6 +563,22 @@
+@@ -471,6 +563,22 @@ static void reset_scsi(cdrom_drive *d){
   
   d->enable_cdda(d,1);
 }
@@ -193,7 +197,43 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 
 static int mode_sense_atapi(cdrom_drive *d,int size,int page){ 
   unsigned char sense[SG_MAX_SENSE];
-@@ -1587,6 +1695,7 @@
+@@ -657,6 +765,7 @@ static int scsi_read_toc (cdrom_drive *d
+   /* read the header first */
+   unsigned char sense[SG_MAX_SENSE];
+   unsigned char cmd[10] = { 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0};
+  const char cmd_43[10] = { 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0};
+   cmd[1]=d->lun<<5;
+ 
+   if (handle_scsi_cmd (d,cmd,10, 0, 12,'\377',1,sense)){
+@@ -674,7 +783,7 @@ static int scsi_read_toc (cdrom_drive *d
+   }
+ 
+   for (i = first; i <= last; i++){
+-    memcpy(cmd, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10);
+    memcpy(cmd, cmd_43, sizeof(cmd_43));
+     cmd[1]=d->lun<<5;
+     cmd[6]=i;
+     
+@@ -695,7 +804,7 @@ static int scsi_read_toc (cdrom_drive *d
+     }
+   }
+ 
+-  memcpy(cmd, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10);
+  memcpy(cmd, cmd_43, sizeof(cmd_43));
+   cmd[1]=d->lun<<5;
+   cmd[6]=0xAA;
+     
+@@ -745,7 +854,8 @@ static int scsi_read_toc2 (cdrom_drive *
+   }
+ 
+   for (i = 0; i < tracks; i++){
+-    memcpy(cmd, (char[]){ 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 10);
+    const char cmd_e5[10] = { 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    memcpy(cmd, cmd_e5, sizeof(cmd_e5));
+     cmd[5]=i+1;
+     cmd[8]=255;
+     
+@@ -1587,6 +1697,7 @@ static void check_cache(cdrom_drive *d){
   }
 }
 
@@ -201,7 +241,7 @@ $NetBSD: patch-cg,v 1.12 2009/09/10 19:14:46 wiz Exp $
 static int check_atapi(cdrom_drive *d){
   int atapiret=-1;
   int fd = d->cdda_fd; /* check the device we'll actually be using to read */
-@@ -1616,7 +1725,32 @@
+@@ -1616,7 +1727,32 @@ static int check_atapi(cdrom_drive *d){
 
     return(d->is_atapi);
   }
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2015/01/22 22:45:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/30 09:57:34 ryoon Exp $

 DISTNAME=	chromaprint-1.2
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://bitbucket.org/acoustid/chromaprint/downloads/

--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2013/10/14 13:20:06 roy Exp $
+# $NetBSD: Makefile,v 1.30 2015/09/08 11:57:48 jperkin Exp $
 #

 DISTNAME=	cmp3-2.0pre6
 PKGNAME=	cmp3-2.0.p6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cmp3/}

@@ -16,8 +16,6 @@ DEPENDS+=	vorbis-tools-[0-9]*:../../audio/vorbis-tools

 WRKSRC=			${WRKDIR}/cmp3-kenrevs
 USE_TOOLS+=		gmake
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-H]*-*

 INSTALLATION_DIRS=	bin

--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2015/02/21 23:35:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.57 2015/08/18 07:31:01 wiz Exp $

 DISTNAME=		cmus-2.6.0
-PKGREVISION=		1
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		-https://github.com/cmus/cmus/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}

--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2013/12/23 11:57:02 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/07/04 16:18:28 joerg Exp $

 DISTNAME=	dap-2.1.5
 PKGREVISION=	4
@@ -15,7 +15,7 @@ MAKE_JOBS_SAFE=		no
 USE_LANGUAGES=		c c++
 INSTALLATION_DIRS+=	bin share/doc/dap
 MAKE_FILE=		Makefile.netbsd
-MAKE_ENV+=		X11PREFIX=${X11PREFIX:Q} OTHER_INCLUDE_DIR=.
+MAKE_ENV+=		OTHER_INCLUDE_DIR=.

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${DESTDIR}${PREFIX}/bin/dap
--- a/audio/dap/distinfo
+++ b/audio/dap/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2007/03/24 21:02:18 adam Exp $
+$NetBSD: distinfo,v 1.9 2015/07/04 16:18:28 joerg Exp $

 SHA1 (dap-2.1.5.tgz) = 947b5488bad395d20b88183b024311f7849765b4
 RMD160 (dap-2.1.5.tgz) = 97508843962cc63b670c7248ccc1531e1ee1bb7b
 Size (dap-2.1.5.tgz) = 290439 bytes
-SHA1 (patch-aa) = 22f6b9892f82ef059592b807e9a51c97f72fc2c2
+SHA1 (patch-aa) = 65a9e699e5db0d94dbe8002fcd5eced5473146c0
 SHA1 (patch-ab) = fb89a62566a0e303012b6f3dbd43468fc9bb6ca5
 SHA1 (patch-ad) = 1a9b4aec50cde74262528e62723d91815923df94
 SHA1 (patch-af) = 735a9d8318479987deeecdfad2f77b9916fc24e9
-SHA1 (patch-ao) = 86d132c9dc6c9da42e5efd2a6e12ea8f2740100b
-SHA1 (patch-ap) = 465884660e922feb5c88314f7e878617f559fbb2
+SHA1 (patch-ao) = fe7b582de1e306287d52c4145336e84fe6cc9c87
+SHA1 (patch-ap) = 7874592ccab3a6eeaf0cef91c4d4b270361d9e6d
--- a/audio/dap/patches/patch-aa
+++ b/audio/dap/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2007/03/24 21:02:18 adam Exp $
+$NetBSD: patch-aa,v 1.9 2015/07/04 16:18:28 joerg Exp $

 --- main/Makefile.netbsd.orig	2003-09-10 02:06:24.000000000 +0200
 +++ main/Makefile.netbsd
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.8 2007/03/24 21:02:18 adam Exp $
 -INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
 -LIBDIR  = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
 +X11DIR  = ${X11BASE}
-+INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11 -I${LOCALBASE}/include
-+LIBDIR  = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${LOCALBASE}/include
+LIBDIR  = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 -DEBUG   = -g3
 -OPTIM   = -O1
--- a/audio/dap/patches/patch-ao
+++ b/audio/dap/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.4 2007/03/24 21:02:18 adam Exp $
+$NetBSD: patch-ao,v 1.5 2015/07/04 16:18:28 joerg Exp $

 --- spkit/spkit/Makefile.netbsd.orig	2003-09-16 01:06:28.000000000 +0200
 +++ spkit/spkit/Makefile.netbsd
@@ -9,7 +9,7 @@ $NetBSD: patch-ao,v 1.4 2007/03/24 21:02:18 adam Exp $
 -X11DIR  = /usr/X11R6
 -INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
 +X11DIR  = ${X11BASE}
-+INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR) -I${X11PREFIX}/include -I${X11PREFIX}/include/X11
+INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR) -I${LOCALBASE}/include
 CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 -DEBUG   = -g3
 -OPTIM   = -O2
--- a/audio/dap/patches/patch-ap
+++ b/audio/dap/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.5 2007/03/24 21:02:18 adam Exp $
+$NetBSD: patch-ap,v 1.6 2015/07/04 16:18:28 joerg Exp $

 --- tooltips/Makefile.netbsd.orig	2003-09-16 01:05:51.000000000 +0200
 +++ tooltips/Makefile.netbsd
@@ -8,7 +8,7 @@ $NetBSD: patch-ap,v 1.5 2007/03/24 21:02:18 adam Exp $
 # Define where the X11 include files are.
 -X11_INCLUDE_DIR = /usr/X11R6/include
 +X11_INCLUDE_DIR = ${X11BASE}/include
-+OTHER_INCLUDE_DIR = ${X11PREFIX}/include/X11
+OTHER_INCLUDE_DIR = ${LOCALBASE}/include/X11
 +X11_BASE_INCLUDE= ${X11BASE}/include
 
 # Uncomment out this line if you do not want debug information included.
--- a/audio/deforaos-mixer/Makefile
+++ b/audio/deforaos-mixer/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2015/04/25 14:20:19 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.12 2015/08/30 19:13:18 khorben Exp $

-DISTNAME=	Mixer-0.1.1
-PKGNAME=	deforaos-mixer-0.1.1
-PKGREVISION=	8
+DISTNAME=	Mixer-0.1.2
+PKGNAME=	deforaos-mixer-0.1.2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.defora.org/os/download/download/3705/
+MASTER_SITES=	http://www.defora.org/os/download/download/4369/

 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
@@ -16,8 +14,25 @@ LICENSE=	gnu-gpl-v3
 USE_TOOLS+=	pkg-config
 USE_TOOLS+=	xgettext

+BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+
 MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
+AUTO_MKDIRS=	yes
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${PKGMANDIR} != "share/man"
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/mixer.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/mixer.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/man1/mixer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mixer.1
+	${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
+	${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
+	${RMDIR} ${DESTDIR}${PREFIX}/share/man
+.endif

 .include "options.mk"

--- a/audio/deforaos-mixer/PLIST
+++ b/audio/deforaos-mixer/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2012/12/17 00:38:48 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/08/27 22:31:48 khorben Exp $
 bin/mixer
-share/applications/mixer.desktop
+man/html1/mixer.html
+man/man1/mixer.1
+share/applications/deforaos-mixer.desktop
+share/locale/es/LC_MESSAGES/Mixer.mo
 share/locale/fr/LC_MESSAGES/Mixer.mo
--- a/audio/deforaos-mixer/distinfo
+++ b/audio/deforaos-mixer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2012/12/17 00:38:48 khorben Exp $
+$NetBSD: distinfo,v 1.2 2015/08/27 22:31:48 khorben Exp $

-SHA1 (Mixer-0.1.1.tar.gz) = d64feff33dfcc33754cecc882021491d6274e932
-RMD160 (Mixer-0.1.1.tar.gz) = 462ec9e4c4b74294daa1c7606ce5900c8d3f4edb
-Size (Mixer-0.1.1.tar.gz) = 26329 bytes
+SHA1 (Mixer-0.1.2.tar.gz) = aa4d7b5ccbfc77f06ddb9cd92236783d3dc1d74b
+RMD160 (Mixer-0.1.2.tar.gz) = 1513232efd11ceff3dc9f2d5acb8e88df4adb599
+Size (Mixer-0.1.2.tar.gz) = 31553 bytes
--- a/audio/emixer/Makefile
+++ b/audio/emixer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2013/10/14 13:33:31 roy Exp $
+# $NetBSD: Makefile,v 1.33 2015/08/18 07:31:01 wiz Exp $
 #

 DISTNAME=	emixer-0.05.5
 PKGNAME=	emixer-0.5.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	# http://emixer.linuxbox.com/

--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2015/04/25 14:20:20 tnn Exp $
+# $NetBSD: Makefile,v 1.52 2015/09/08 11:57:48 jperkin Exp $

 DISTNAME=	mp3info-0.8.5a
 PKGNAME=	g${DISTNAME}
-PKGREVISION=	22
+PKGREVISION=	23
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/ \
 		${MASTER_SITE_SUNSITE:=apps/sound/mp3-utils/mp3info/}
@@ -16,9 +16,6 @@ CONFLICTS=	mp3info-[0-9]*

 USE_TOOLS+=	pkg-config

-# wgetnstr()
-INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1

 .include "../../mk/curses.buildlink3.mk"
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2015/04/25 14:20:20 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2015/07/12 00:39:55 wiz Exp $

 DISTNAME=	gmpc-wikipedia-11.8.16
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/11.8/ \
 		${MASTER_SITE_SOURCEFORGE:=musicpd/}
@@ -16,5 +16,5 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	intltool pkg-config xgettext

 .include "../../audio/gmpc/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit24-gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.48 2015/04/25 14:20:21 tnn Exp $
+# $NetBSD: Makefile,v 1.49 2015/08/08 11:44:35 wiz Exp $

 DISTNAME=		gqmpeg-0.91.1
 PKGREVISION=		28
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gqmpeg/}

-MAINTAINER=		sekiya@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://gqmpeg.sourceforge.net/
 COMMENT=		GTK+ front end to mpg123
 LICENSE=		gnu-gpl-v2
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2014/10/09 14:05:56 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/08/18 07:31:01 wiz Exp $
 #

 DISTNAME=	gramofile-1.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.opensourcepartners.nl/~costar/gramofile/

--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2014/02/12 23:17:33 tron Exp $
+# $NetBSD: Makefile,v 1.24 2015/08/18 07:31:02 wiz Exp $
 #

 DISTNAME=	herrie-2.2
-PKGREVISION=	9
+PKGREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	http://herrie.info/distfiles/
 EXTRACT_SUFX=	.tar.bz2
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2015/03/12 19:39:15 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2015/08/18 07:31:02 wiz Exp $
 #

 DISTNAME=	id3ed-1.10.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://users.dakotacom.net/~donut/programs/id3ed/

--- a/audio/ifp-line/Makefile
+++ b/audio/ifp-line/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2012/09/12 00:24:40 asau Exp $
+# $NetBSD: Makefile,v 1.14 2015/08/08 11:44:35 wiz Exp $

 DISTNAME=		ifp-line-0.3
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ifp-driver/}

-MAINTAINER=		sekiya@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://ifp-driver.sourceforge.net/
 COMMENT=		Command-line interface to iRiver MP3 players

--- a/audio/ifp-line/distinfo
+++ b/audio/ifp-line/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2011/07/03 22:04:06 dholland Exp $
+$NetBSD: distinfo,v 1.10 2015/07/09 12:00:13 jperkin Exp $

 SHA1 (ifp-line-0.3.tar.gz) = e511157878a08fbea6a2c702e726e131dd20cb2f
 RMD160 (ifp-line-0.3.tar.gz) = 71fee7e02daeb9b3dc2e7da53236057b9d5a9f63
 Size (ifp-line-0.3.tar.gz) = 138272 bytes
-SHA1 (patch-Makefile_am) = f855283ab54a49c30a08f408a67ffa6c3ac88a72
-SHA1 (patch-Makefile_in) = e196e6d59a3bf8d1af58f4a5f94a3fa16c3af4af
+SHA1 (patch-Makefile_am) = a273f2e813b43b717155a2dcf7bc1372d23b936b
+SHA1 (patch-Makefile_in) = cf64aab56fbf9d7b58535a341c93176a6709b02b
+SHA1 (patch-ifp__routines.c) = 654fbb77f3404e987e7fb777da7cd0e1e92f4b72
--- a/audio/ifp-line/patches/patch-Makefile_am
+++ b/audio/ifp-line/patches/patch-Makefile_am
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile_am,v 1.1 2011/07/03 22:04:51 dholland Exp $
+$NetBSD: patch-Makefile_am,v 1.2 2015/07/09 12:00:14 jperkin Exp $

 Avoid confusing make with multiple paths to the same file.

--- Makefile.am~	2005-12-10 07:35:04.000000000 +0000
+--- Makefile.am.orig	2005-12-10 07:35:04.000000000 +0000
 +++ Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = $(man1_MANS) $(pkgdata_DATA
 bin_PROGRAMS = ifp
--- a/audio/ifp-line/patches/patch-Makefile_in
+++ b/audio/ifp-line/patches/patch-Makefile_in
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile_in,v 1.1 2011/07/03 22:04:51 dholland Exp $
+$NetBSD: patch-Makefile_in,v 1.2 2015/07/09 12:00:14 jperkin Exp $

 Avoid confusing make with multiple paths to the same file.

--- Makefile.in~	2005-12-10 08:35:05.000000000 +0000
+--- Makefile.in.orig	2005-12-10 08:35:05.000000000 +0000
 +++ Makefile.in
@@ -70,7 +70,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
--- a/audio/ifp-line/patches/patch-ifp__routines.c
+++ b/audio/ifp-line/patches/patch-ifp__routines.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-ifp__routines.c,v 1.1 2015/07/09 12:00:14 jperkin Exp $
+
+Use nbcompat.
+
+--- ifp_routines.c.orig	2005-12-03 16:55:06.000000000 +0000
+++ ifp_routines.c
+@@ -8,7 +8,12 @@ static const char rcsid[] = "$Id: ifp_ro
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <errno.h>
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/fts.h>
+#else
+ #include <fts.h>
+#endif
+ #include <unistd.h>
+ 
+ #include "unicodehack.h"
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/01/27 04:37:53 dbj Exp $
+# $NetBSD: Makefile,v 1.31 2015/07/04 16:18:28 joerg Exp $
 #

 DISTNAME=	jack-audio-connection-kit-${JACK_VERSION}
@@ -99,7 +99,7 @@ SUBST_CLASSES+=		jacksrc
 SUBST_FILES.jacksrc=	libjack/unlock.c
 SUBST_MESSAGE.jacksrc=	Peforming substitutions in JACK sources.
 SUBST_STAGE.jacksrc=	pre-build
-SUBST_VARS.jacksrc=	PREFIX JACKD_PROCFS_PATH
+SUBST_VARS.jacksrc=	PREFIX JACKD_PROCFS_PATH X11BASE

 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 PKG_OPTIONS_VAR=	PKG_OPTIONS.jack
--- a/audio/jack/distinfo
+++ b/audio/jack/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2015/01/27 04:37:53 dbj Exp $
+$NetBSD: distinfo,v 1.16 2015/07/04 16:18:28 joerg Exp $

 SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e
 RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705
@@ -9,7 +9,7 @@ SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20
 SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e
 SHA1 (patch-ah) = e70d2783d79c7177b774e8256cd2eb5c803a6488
 SHA1 (patch-aj) = 90b38c6b2c883d21ea0d058f7e4426f3d16c8b07
-SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63
+SHA1 (patch-ak) = 90006096f7c4035edea75ebebeff58c18f04e39e
 SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b
 SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f
 SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859
--- a/audio/jack/patches/patch-ak
+++ b/audio/jack/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2008/11/16 11:22:55 bjs Exp $
+$NetBSD: patch-ak,v 1.3 2015/07/04 16:18:28 joerg Exp $

 Yuck.  At least let's attempt to make this somewhat sane.
 When I have the time and figure out the Right Thing(tm)
@@ -11,7 +11,7 @@ to do, perhaps I'll rewrite some of the shm code.
 	"/lib",
 	"/usr/lib",
 +	"@PREFIX@",	  /* pkgsrc prefix */
-+	"@X11PREFIX@/lib",
+	"@X11BASE@/lib",
 	"/usr/local/lib",
 -	"/usr/X11R6/lib",
 	"/opt/lib",       /* solaris-y */   
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2012/09/12 00:24:40 asau Exp $
+# $NetBSD: Makefile,v 1.16 2015/09/08 11:57:48 jperkin Exp $
 #

 DISTNAME=	juke-0.7
-PKGREVISION=	2
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.moll.no/oyvind/distfiles/

@@ -12,9 +12,6 @@ COMMENT=	Simple ncurses based jukebox

 GNU_CONFIGURE=	YES

-# halfdelay()
-INCOMPAT_CURSES=	NetBSD-1.[45]*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-L]-*
-
 EGDIR=		${PREFIX}/share/examples/juke

 CONF_FILES=	${EGDIR}/juke.conf.default ${PKG_SYSCONFDIR}/juke.conf
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2015/03/11 22:24:00 tnn Exp $
+# $NetBSD: Makefile,v 1.78 2015/08/18 07:31:02 wiz Exp $

 DISTNAME=	lame-3.99.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lame/}

--- a/audio/libgpod/buildlink3.mk
+++ b/audio/libgpod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2015/04/25 14:20:21 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2015/09/13 15:57:15 joerg Exp $

 BUILDLINK_TREE+=	libgpod

@@ -10,6 +10,7 @@ BUILDLINK_ABI_DEPENDS.libgpod+=	libgpod>=0.8.2nb22
 BUILDLINK_PKGSRCDIR.libgpod?=	../../audio/libgpod

 .include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/libplist/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .endif # LIBGPOD_BUILDLINK3_MK

--- a/audio/libgroove/Makefile
+++ b/audio/libgroove/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2015/06/12 10:48:22 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/30 09:57:34 ryoon Exp $

 DISTNAME=	3.1.1
 PKGNAME=	libgroove-${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/andrewrk/libgroove/archive/

--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2014/02/12 23:17:33 tron Exp $
+# $NetBSD: Makefile,v 1.7 2015/09/12 20:03:00 tnn Exp $

 DISTNAME=	libmusicbrainz-5.0.1
 PKGNAME=	${DISTNAME:S/brainz/brainz5/}
 PKGREVISION=	2
 CATEGORIES=	audio
-MASTER_SITES=	http://cloud.github.com/downloads/metabrainz/libmusicbrainz/
+MASTER_SITES=	https://cloud.github.com/downloads/metabrainz/libmusicbrainz/

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://musicbrainz.org/doc/libmusicbrainz
--- a/audio/libopenmpt/Makefile
+++ b/audio/libopenmpt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2015/04/25 14:20:22 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/23 13:44:25 wiz Exp $

-DISTNAME=	libopenmpt-0.2.4954-beta12-autotools
+DISTNAME=	libopenmpt-0.2.5486-beta13-autotools
 PKGNAME=	${DISTNAME:S/-beta/beta/:S/-autotools//}
-PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://lib.openmpt.org/files/libopenmpt/src/

--- a/audio/libopenmpt/distinfo
+++ b/audio/libopenmpt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2015/04/19 18:20:49 wiz Exp $
+$NetBSD: distinfo,v 1.6 2015/08/23 13:44:25 wiz Exp $

-SHA1 (libopenmpt-0.2.4954-beta12-autotools.tar.gz) = bfc8713907c267d8928c8715f3e6e86b5e9e3a9b
-RMD160 (libopenmpt-0.2.4954-beta12-autotools.tar.gz) = cc41cff763df99ec169548ebb487febb0aeefa85
-Size (libopenmpt-0.2.4954-beta12-autotools.tar.gz) = 1067823 bytes
+SHA1 (libopenmpt-0.2.5486-beta13-autotools.tar.gz) = 2e2db88cd3b5aaeb8f7d8f316c04fbebf603f591
+RMD160 (libopenmpt-0.2.5486-beta13-autotools.tar.gz) = 83d090e894b5215e064d26ffb910f1de1050a72b
+Size (libopenmpt-0.2.5486-beta13-autotools.tar.gz) = 1103190 bytes
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2015/01/03 18:43:48 spz Exp $
+# $NetBSD: Makefile,v 1.67 2015/08/17 17:11:19 wiz Exp $

 DISTNAME=	libsndfile-1.0.25
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/files/

--- a/audio/liveice/Makefile
+++ b/audio/liveice/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2012/09/12 00:24:45 asau Exp $
+# $NetBSD: Makefile,v 1.20 2015/08/18 07:31:02 wiz Exp $
 #

 DISTNAME=	liveice
 PKGNAME=	liveice-0.20001121
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://star.arm.ac.uk/~spm/software/

--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2015/02/09 22:25:15 snj Exp $
+# $NetBSD: Makefile,v 1.52 2015/08/18 07:31:02 wiz Exp $

 DISTNAME=	mikmod-3.2.6
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mikmod/}

--- a/audio/mixer.app/distinfo
+++ b/audio/mixer.app/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:49 agc Exp $
+$NetBSD: distinfo,v 1.8 2015/07/04 16:18:28 joerg Exp $

 SHA1 (Mixer.app-1.8.0.tar.gz) = 68b644e2b13fe4a89461cf28ab6aebbcaedc0552
 RMD160 (Mixer.app-1.8.0.tar.gz) = ae29a9b6c4a3d37d48f5e2b936ac62b81cc02c52
 Size (Mixer.app-1.8.0.tar.gz) = 37884 bytes
-SHA1 (patch-aa) = 4bbc4735d3d2075f2e890cdbd6ff48d70c8cc7a5
+SHA1 (patch-aa) = 125ce93748d6f438ed2bcc7994f800db09b07760
 SHA1 (patch-ab) = 9ca9690364e4e42c64b227f58f913848d5f980a4
--- a/audio/mixer.app/patches/patch-aa
+++ b/audio/mixer.app/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2004/05/03 23:18:21 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2015/07/04 16:18:28 joerg Exp $

 --- Makefile.orig	2002-09-15 11:37:33.000000000 -0500
 +++ Makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2004/05/03 23:18:21 minskim Exp $
 -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
 +#CXX=c++
 +CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I${X11BASE}/include
-+LDFLAGS += -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib -L${X11BASE}/lib -lXpm -lXext -lX11 ${LIBOSSAUDIO}
+LDFLAGS += -Wl,-R${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lXpm -lXext -lX11 ${LIBOSSAUDIO}
 
 OBJECTS = Main.o Mixer.o Xpm.o
 
--- a/audio/moc-devel/Makefile
+++ b/audio/moc-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/02/12 23:17:34 tron Exp $
+# $NetBSD: Makefile,v 1.18 2015/08/18 07:31:02 wiz Exp $

 DISTNAME=		moc-2.5.0-beta1
-PKGREVISION=		2
+PKGREVISION=		3
 PKGNAME=		${DISTNAME:S/-beta/b/:moc%=moc-devel%}
 CATEGORIES=		audio
 MASTER_SITES=		http://ftp.daper.net/pub/soft/moc/unstable/
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2014/02/12 23:17:34 tron Exp $
+# $NetBSD: Makefile,v 1.26 2015/08/18 07:31:02 wiz Exp $

 DISTNAME=		moc-2.4.4
-PKGREVISION=		1
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		http://ftp.daper.net/pub/soft/moc/stable/
 EXTRACT_SUFX=		.tar.bz2
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2015/04/25 14:20:22 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2015/08/18 07:31:02 wiz Exp $

 DISTNAME=	mp3blaster-3.2.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mp3blaster/}

--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2014/11/20 13:07:12 mef Exp $
+# $NetBSD: Makefile.common,v 1.39 2015/07/20 17:30:33 adam Exp $
 #
 # used by audio/mpg123-arts/Makefile
 # used by audio/mpg123-esound/Makefile
@@ -7,7 +7,7 @@
 # used by audio/mpg123-pulse/Makefile
 # used by audio/mpg123-sun/Makefile

-DISTNAME=	mpg123-1.21.0
+DISTNAME=	mpg123-1.22.2
 PKGNAME?=	${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpg123/}
@@ -42,6 +42,6 @@ do-install:
 		${DESTDIR}${PREFIX}/lib/mpg123
 .endif

-# .include "../../devel/libltdl/convenience.mk"
+#.include "../../devel/libltdl/convenience.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.37 2014/11/20 13:07:12 mef Exp $
+$NetBSD: distinfo,v 1.38 2015/07/20 17:30:33 adam Exp $

-SHA1 (mpg123-1.21.0.tar.bz2) = a2fd84078632b7ab73ae4cd64c3f941d140167a8
-RMD160 (mpg123-1.21.0.tar.bz2) = 5f5e0c8c482a16d093603845f67bfe733aac3e79
-Size (mpg123-1.21.0.tar.bz2) = 863177 bytes
+SHA1 (mpg123-1.22.2.tar.bz2) = 9125b4eabf6327c71a439e07e16eb39b712085e2
+RMD160 (mpg123-1.22.2.tar.bz2) = 3a44ba823d148db87cdee7be0188d166334426cb
+Size (mpg123-1.22.2.tar.bz2) = 870063 bytes
 SHA1 (patch-aa) = 075f0315f03f42f2bc94db8a827a7c209a61ea6b
 SHA1 (patch-ad) = 1287cc2ec7c718ecd5566ece52608235d76fde11
 SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0
--- a/audio/mserv-irman/Makefile
+++ b/audio/mserv-irman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/06/12 10:48:23 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/07/12 18:56:06 wiz Exp $
 #

 DISTNAME=	mserv-irman-0.21
@@ -16,7 +16,7 @@ SUPERSEDES=	mserv_irman-[0-9]*

 DEPENDS+=	mserv-[0-9]*:../../audio/mserv
 DEPENDS+=	libirman>=0.4.1.2nb3:../../sysutils/libirman
-DEPENDS+=	{perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
+#DEPENDS+=	{perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
 DEPENDS+=	p5-Config-IniFiles-[0-9]*:../../devel/p5-Config-IniFiles

 USE_TOOLS+=	perl:run
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2015/04/25 14:20:22 tnn Exp $
+# $NetBSD: Makefile,v 1.109 2015/07/01 09:23:30 wiz Exp $

-DISTNAME=		mpd-0.19.9
+DISTNAME=		mpd-0.19.10
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		http://www.musicpd.org/download/mpd/0.19/
 #MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.63 2015/04/06 00:08:34 mrg Exp $
+$NetBSD: distinfo,v 1.64 2015/07/01 09:23:30 wiz Exp $

-SHA1 (mpd-0.19.9.tar.xz) = 6683bee5f132eda318c5a61ec14b2df8d9164d60
-RMD160 (mpd-0.19.9.tar.xz) = 1860665c1b75a372b46892df4307ed0346419bbb
-Size (mpd-0.19.9.tar.xz) = 701480 bytes
+SHA1 (mpd-0.19.10.tar.xz) = 4635b33223d3f1e67eed41f6350ef75515153213
+RMD160 (mpd-0.19.10.tar.xz) = 0cdde355667547b236471d9c75f2c3925f56df81
+Size (mpd-0.19.10.tar.xz) = 701668 bytes
 SHA1 (patch-src_output_plugins_httpd_HttpdOutputPlugin.cxx) = b47d79cc49a27d732a7531e23d666bf9df748bec
 SHA1 (patch-src_system_ByteOrder.hxx) = 955af2aacf1c0a98c4c57728e1283eba81b457e7
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2014/10/09 14:05:57 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2015/08/06 22:23:17 khorben Exp $

 DISTNAME=	nas-1.9.4.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -18,6 +18,8 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_TOOLS+=		yacc lex makedepend
 USE_IMAKE=		yes

+MAKE_FLAGS+=		CDEBUGFLAGS=${CFLAGS:Q}
+
 PKG_SYSCONFSUBDIR=	nas

 SUBST_CLASSES+=		sysconf
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/21 13:47:46 mef Exp $
+# $NetBSD: Makefile,v 1.28 2015/08/18 07:31:02 wiz Exp $

 DISTNAME=		ncmpc-0.24
+PKGREVISION=		2
 CATEGORIES=		audio
 #MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 MASTER_SITES=		http://www.musicpd.org/download/ncmpc/0/
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2015/04/25 14:20:23 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2015/08/18 07:31:02 wiz Exp $

 DISTNAME=		ocp-0.1.21
-PKGREVISION=		4
+PKGREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=opencubicplayer/}
 EXTRACT_SUFX=		.tar.bz2
--- a/audio/p5-MP3-Tag/Makefile
+++ b/audio/p5-MP3-Tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/06/12 10:48:24 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/07/12 18:56:06 wiz Exp $

 DISTNAME=	MP3-Tag-1.13
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://search.cpan.org/dist/MP3-Tag/
 COMMENT=	This is a perl module to read/write tags of mp3-files
 LICENSE=	${PERL5_LICENSE}

-DEPENDS+=	{perl>=5.9.3,p5-IO-Compress>=2.017}:../../devel/p5-IO-Compress #Compress::Zlib>=0
+#DEPENDS+=	{perl>=5.9.3,p5-IO-Compress>=2.017}:../../devel/p5-IO-Compress #Compress::Zlib>=0

 PERL5_PACKLIST=		auto/MP3/Tag/.packlist

--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2015/01/06 19:54:39 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2015/06/30 09:57:34 ryoon Exp $

 DISTNAME=	picard-1.3.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/

--- a/Show More
+++ b/Show More