From c7f8abeb60f9695d57eefc69d4b18139ea676ec0 Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Sun, 4 Sep 2011 21:38:03 +0000
Subject: Fix void main, caught by clang.

While here, fix other problems caught by gcc:
 - casting malloc instead of including <stdlib.h>
 - casting strdup instead of including <string.h>
 - failing to include <time.h> with bad consequences for -current.

PKGREVISION -> 3.
---
 audio/wmmp3/Makefile                   |  4 ++--
 audio/wmmp3/distinfo                   |  5 ++++-
 audio/wmmp3/patches/patch-main_c       | 15 +++++++++++++++
 audio/wmmp3/patches/patch-mpg123ctl_c  | 12 ++++++++++++
 audio/wmmp3/patches/patch-song__hash_c | 12 ++++++++++++
 5 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 audio/wmmp3/patches/patch-main_c
 create mode 100644 audio/wmmp3/patches/patch-mpg123ctl_c
 create mode 100644 audio/wmmp3/patches/patch-song__hash_c

diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 630f91a6617..b536c06b3c5 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/12/17 22:04:17 abs Exp $
+# $NetBSD: Makefile,v 1.17 2011/09/04 21:38:03 dholland Exp $
 
 DISTNAME=	wmmp3-0.12
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.dotfiles.com/software/wmmp3/
 
diff --git a/audio/wmmp3/distinfo b/audio/wmmp3/distinfo
index 64097b6f0f2..242f6800fc6 100644
--- a/audio/wmmp3/distinfo
+++ b/audio/wmmp3/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2011/09/04 21:38:03 dholland Exp $
 
 SHA1 (wmmp3-0.12.tar.gz) = 439e19550c58fe31db8c1bcf2985c56f62d7bc1f
 RMD160 (wmmp3-0.12.tar.gz) = 14fe7a9725449d179e09912e1dc6e34a37c0222b
 Size (wmmp3-0.12.tar.gz) = 43977 bytes
+SHA1 (patch-main_c) = c4866e0300834010bee03e1d5dac7f486346b193
+SHA1 (patch-mpg123ctl_c) = 847e66865ceef4a6d86eb5753f823a03cf5515fb
+SHA1 (patch-song__hash_c) = 332e9a8d8c36a0458e6438629999fb031297343a
diff --git a/audio/wmmp3/patches/patch-main_c b/audio/wmmp3/patches/patch-main_c
new file mode 100644
index 00000000000..30ddcb92b96
--- /dev/null
+++ b/audio/wmmp3/patches/patch-main_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-main_c,v 1.1 2011/09/04 21:38:03 dholland Exp $
+
+- fix void main
+
+--- main.c~	2000-04-03 00:11:46.000000000 +0000
++++ main.c
+@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[]
+     return option_entered;
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     struct coord pos[] = {
+ 	{35, 34, 12, 11},	/* stop */
diff --git a/audio/wmmp3/patches/patch-mpg123ctl_c b/audio/wmmp3/patches/patch-mpg123ctl_c
new file mode 100644
index 00000000000..b86bc881b77
--- /dev/null
+++ b/audio/wmmp3/patches/patch-mpg123ctl_c
@@ -0,0 +1,12 @@
+$NetBSD: patch-mpg123ctl_c,v 1.1 2011/09/04 21:38:03 dholland Exp $
+
+- add needed standard headers
+
+--- mpg123ctl.c~	2000-04-03 00:18:43.000000000 +0000
++++ mpg123ctl.c
+@@ -15,4 +15,5 @@
+  */
+ 
++#include <time.h>
+ #include "mpg123ctl.h"
+ 
diff --git a/audio/wmmp3/patches/patch-song__hash_c b/audio/wmmp3/patches/patch-song__hash_c
new file mode 100644
index 00000000000..a36fcca732e
--- /dev/null
+++ b/audio/wmmp3/patches/patch-song__hash_c
@@ -0,0 +1,12 @@
+$NetBSD: patch-song__hash_c,v 1.1 2011/09/04 21:38:03 dholland Exp $
+
+- add needed standard headers
+
+--- song_hash.c~	2000-04-03 00:17:22.000000000 +0000
++++ song_hash.c
+@@ -1,3 +1,5 @@
++#include <stdlib.h>
++#include <string.h>
+ #include "song_hash.h"
+ 
+ #define HASH_TABLE_SIZE 11
-- 
cgit v1.2.3