From e522eecf37088932ab3993b83b0684a4bec328e5 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 29 Aug 2011 13:11:39 +0000
Subject: Fix quoting mess. Add include to get Strcmp.

---
 audio/cmp3/distinfo         |  5 +++--
 audio/cmp3/patches/patch-aa | 16 ++++++++++++----
 audio/cmp3/patches/patch-ai | 12 ++++++++++++
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 audio/cmp3/patches/patch-ai

(limited to 'audio/cmp3')

diff --git a/audio/cmp3/distinfo b/audio/cmp3/distinfo
index d618f02fd69..18f2c503087 100644
--- a/audio/cmp3/distinfo
+++ b/audio/cmp3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2010/10/24 11:28:42 plunky Exp $
+$NetBSD: distinfo,v 1.9 2011/08/29 13:11:39 joerg Exp $
 
 SHA1 (cmp3-2.0pre6.tar.gz) = 5c1454117be282cf673de7a701f8d08f6224d2f8
 RMD160 (cmp3-2.0pre6.tar.gz) = c7d5f774c05734e8fca8ec8d536b2843cb99ad80
 Size (cmp3-2.0pre6.tar.gz) = 183749 bytes
-SHA1 (patch-aa) = 3881ea3b11f4949e0704ee13414ede93e23a7c50
+SHA1 (patch-aa) = 548d88ed8c8132f2362984ef4ed76ef4a36209ef
 SHA1 (patch-ab) = 9a4a87691727a2ee4b63961415d137da08502edb
 SHA1 (patch-ac) = 03a9b0660a6167dd2b8ef3c58f16ec0c95a9921a
 SHA1 (patch-ad) = a50d87140e557eb3bef1a5d68ad3e18bba73e03e
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 4ddb74587d34dc2698c2a49ca7c476b5b90540d9
 SHA1 (patch-af) = 7e86121df7b5145a9dc8b62f4905c5dae24caea3
 SHA1 (patch-ag) = 820e507fca1519399e541e9621ae2ad7575b8e25
 SHA1 (patch-ah) = 0ade664826997324bc42875748a0abf9b84bbb9f
+SHA1 (patch-ai) = 483f14ccf1cf3318b42be641f95225cf5eef94b7
diff --git a/audio/cmp3/patches/patch-aa b/audio/cmp3/patches/patch-aa
index b1341dcf099..5ee418cc4bb 100644
--- a/audio/cmp3/patches/patch-aa
+++ b/audio/cmp3/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2005/03/02 17:50:18 rxg Exp $
+$NetBSD: patch-aa,v 1.4 2011/08/29 13:11:39 joerg Exp $
 
---- Makefile.orig	2001-07-29 13:43:49.000000000 +0800
+--- Makefile.orig	2001-07-29 05:43:49.000000000 +0000
 +++ Makefile
 @@ -4,25 +4,25 @@
  #  Set these variables
@@ -35,7 +35,15 @@ $NetBSD: patch-aa,v 1.3 2005/03/02 17:50:18 rxg Exp $
  
  # You need debugging info? Uncomment this and check /tmp/cmp3log
  #debugging := 1
-@@ -42,9 +42,9 @@ RNMP3PARAMS= -DVERSION="\$(VERSION)\"
+@@ -36,15 +36,15 @@ ogg123_params := -d oss
+ 
+ VERSION="2.0pre6"
+ WKGDIR=cmp3-kenrevs
+-PARAMS= -DCMP3_VER="\$(VERSION)\" -DEXEC_LOC="\$(mpg123_location)\" \
+-    -DCMP3_CONFIG="\$(config_file)\" -DOGG_LOC="\$(ogg123_location)\"
++PARAMS= -DCMP3_VER=\"$(VERSION)\" -DEXEC_LOC=\"$(mpg123_location)\" \
++    -DCMP3_CONFIG=\"$(config_file)\" -DOGG_LOC=\"$(ogg123_location)\"
+ RNMP3PARAMS= -DVERSION="\$(VERSION)\"
  # Something for me and my cd changer, you definately don't want it as it
  # stands. Change the code to do something else you want it to do...
  #PARAMS +=-DMY_CD
@@ -44,7 +52,7 @@ $NetBSD: patch-aa,v 1.3 2005/03/02 17:50:18 rxg Exp $
 -CC= gcc
 +LIBS= $(LDFLAGS) -lform -lncurses
 +CFLAGS+= -Inevlib
-+CC?= gcc
++CC?= clang
  OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \
        cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \
        cmp3general.o cmp3id3.o
diff --git a/audio/cmp3/patches/patch-ai b/audio/cmp3/patches/patch-ai
new file mode 100644
index 00000000000..63b6ce305f7
--- /dev/null
+++ b/audio/cmp3/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2011/08/29 13:11:39 joerg Exp $
+
+--- cmp3manager.c.orig	2011-08-29 11:31:12.000000000 +0000
++++ cmp3manager.c
+@@ -4,6 +4,7 @@
+     This file contains the manager process.
+ */
+ 
++#include"cmp3funcs.h"
+ #include"cmp3manager.h"
+ 
+ FILE *debugfile;
-- 
cgit v1.2.3