From df9c4b7c02d731da5e6c0948196b6c8b338870ba Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Sun, 4 Sep 2011 23:41:52 +0000
Subject: Implicit int return type is not valid in C++. (clang objects, and
 then the whole configure script fails.)

---
 audio/mp3info/distinfo                |  3 ++-
 audio/mp3info/patches/patch-configure | 15 +++++++++++++++
 audio/splay/distinfo                  |  3 ++-
 audio/splay/patches/patch-configure   | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 audio/mp3info/patches/patch-configure
 create mode 100644 audio/splay/patches/patch-configure

diff --git a/audio/mp3info/distinfo b/audio/mp3info/distinfo
index 2d444028728..46487adbe3b 100644
--- a/audio/mp3info/distinfo
+++ b/audio/mp3info/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:49 agc Exp $
+$NetBSD: distinfo,v 1.5 2011/09/04 23:41:52 dholland Exp $
 
 SHA1 (mp3info-0.2.16.tar.gz) = b4cb7feb0b2c52ce1c2a23b919f4ab3c3012b11f
 RMD160 (mp3info-0.2.16.tar.gz) = 61810736aff11e1e241d78f572acd4890f795851
 Size (mp3info-0.2.16.tar.gz) = 42950 bytes
 SHA1 (patch-aa) = 4b036972514390c517eed0d1a86acf871c7d2730
+SHA1 (patch-configure) = 995088079b05571d545eae85e0d22a574799b3b0
diff --git a/audio/mp3info/patches/patch-configure b/audio/mp3info/patches/patch-configure
new file mode 100644
index 00000000000..cbfa362ba12
--- /dev/null
+++ b/audio/mp3info/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2011/09/04 23:41:52 dholland Exp $
+
+Fix test program; implicit int return type is not valid in C++.
+
+--- configure~	1999-03-19 21:04:21.000000000 +0000
++++ configure
+@@ -818,7 +818,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 820 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cxx_works=yes
diff --git a/audio/splay/distinfo b/audio/splay/distinfo
index 6c7a785af1b..d2a50935faf 100644
--- a/audio/splay/distinfo
+++ b/audio/splay/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/07/07 16:49:05 joerg Exp $
+$NetBSD: distinfo,v 1.8 2011/09/04 23:49:57 dholland Exp $
 
 SHA1 (splay-0.8.2.tar.gz) = 25288afa1b52bf25be8f9c4ceb44325c50fa00c8
 RMD160 (splay-0.8.2.tar.gz) = f1a99ad9e7e70f5e0000aede05966cc5a0b36ad3
@@ -12,3 +12,4 @@ SHA1 (patch-af) = dfe6c6fba890fb0b413b6b73a42904d3ca6b7d66
 SHA1 (patch-ai) = 9ac8c7aa7a7d341585e57dec4ddba4e285db7b34
 SHA1 (patch-aj) = 840793d18ed577dea15108a3c56d9a66e0a8e9e5
 SHA1 (patch-ak) = dd0b54d9323102d92add8cc0e4b020c37b70b615
+SHA1 (patch-configure) = ae29732a586a19c7f85367391b19e5bf81c33e75
diff --git a/audio/splay/patches/patch-configure b/audio/splay/patches/patch-configure
new file mode 100644
index 00000000000..ed78434a745
--- /dev/null
+++ b/audio/splay/patches/patch-configure
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure,v 1.1 2011/09/04 23:49:57 dholland Exp $
+
+Fix test programs; implicit int return type is not valid in C++.
+
+--- configure~	1998-03-07 21:04:19.000000000 +0000
++++ configure
+@@ -856,7 +856,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 858 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
+@@ -982,7 +982,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 984 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cxx_works=yes
+@@ -1688,7 +1688,7 @@ else
+   cat > conftest.$ac_ext <<EOF
+ #line 1690 "configure"
+ #include "confdefs.h"
+-main () {
++int main () {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+   union
+   {
-- 
cgit v1.2.3