From 1011cb9b04ad99f8ae60cee04a01e247cc482743 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Sat, 21 Feb 2015 00:09:08 +0000
Subject: Use proper format string. Deal with infinite wisdom of authors to not
 call config.guess config.guess. Bump revision.

---
 audio/cdparanoia/Makefile         |  7 +++++--
 audio/cdparanoia/distinfo         |  4 ++--
 audio/cdparanoia/patches/patch-ae | 15 ++++++++++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'audio')

diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index f63c4b6e7fa..ddff7846068 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2015/01/01 08:05:21 dholland Exp $
+# $NetBSD: Makefile,v 1.36 2015/02/21 00:09:08 joerg Exp $
 #
 
 DISTNAME=	cdparanoia-III-10.2
 PKGNAME=	cdparanoia-3.0.10.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/cdparanoia/
 EXTRACT_SUFX=	.src.tgz
@@ -13,6 +13,9 @@ HOMEPAGE=	http://www.xiph.org/paranoia/
 COMMENT=	CDDA reading utility with extra data verification features
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 
+CONFIG_GUESS_OVERRIDE=	configure.guess
+CONFIG_SUB_OVERRIDE=	configure.sub
+
 # If this is not *supportable* on other platforms, please document why here.
 BROKEN_EXCEPT_ON_PLATFORM=	NetBSD-*-* FreeBSD-*-* DragonFly-*-*
 BROKEN_EXCEPT_ON_PLATFORM+=	Linux-*-* Darwin-*-* SunOS-*-*
diff --git a/audio/cdparanoia/distinfo b/audio/cdparanoia/distinfo
index 92e352dc648..91f4b7364aa 100644
--- a/audio/cdparanoia/distinfo
+++ b/audio/cdparanoia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2013/12/12 16:41:32 jperkin Exp $
+$NetBSD: distinfo,v 1.32 2015/02/21 00:09:08 joerg Exp $
 
 SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
 RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = b67a318d4e5c0ca87639645096a41eaeb3fb2d1e
 SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44
 SHA1 (patch-ac) = d47ec9e3ae300cc6fcb4e7377bb8a13ff0c3cacd
 SHA1 (patch-ad) = f0c79049cbc26e9483c410f00cb6df85c280c145
-SHA1 (patch-ae) = b40f156534c7e08dcea617eab980f1be48c4f6b1
+SHA1 (patch-ae) = f12c5aca0b78803e1ab1be8518b032748a45ee0e
 SHA1 (patch-ba) = 0f4f8ddecd9f5f273f7a1687bbb1477fd64500c1
 SHA1 (patch-ca) = 9860c2227f9d359e808c0ee0989020a9a3163a48
 SHA1 (patch-cb) = 880d667b26891beb2c64ebe1937c4a2931dd42d5
diff --git a/audio/cdparanoia/patches/patch-ae b/audio/cdparanoia/patches/patch-ae
index 5ac1e40ca80..b7d44f8e422 100644
--- a/audio/cdparanoia/patches/patch-ae
+++ b/audio/cdparanoia/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.8 2013/12/12 16:41:32 jperkin Exp $
+$NetBSD: patch-ae,v 1.9 2015/02/21 00:09:08 joerg Exp $
 
 --- main.c.orig	2008-09-11 21:11:02.000000000 +0000
 +++ main.c
@@ -89,6 +89,19 @@ $NetBSD: patch-ae,v 1.8 2013/12/12 16:41:32 jperkin Exp $
  
  "OUTPUT SMILIES:\n"
  "  :-)   Normal operation, low/no jitter\n"
+@@ -588,10 +639,10 @@ static void callback(long inpos, int fun
+ 	    buffer[aheadposition+19]='>';
+ 	}
+    
+-	fprintf(stderr,buffer);
++	fprintf(stderr, "%s", buffer);
+        
+ 	if (logfile != NULL && function==-1) {
+-	  fprintf(logfile,buffer+1);
++	  fprintf(logfile, "%s", buffer+1);
+ 	  fprintf(logfile,"\n\n");
+ 	  fflush(logfile);
+ 	}
 @@ -606,6 +657,7 @@ static void callback(long inpos, int fun
  
  const char *optstring = "escCn:o:O:d:g:k:S:prRwafvqVQhZz::YXWBi:Tt:l::L::A";
-- 
cgit v1.2.3