details: https://anonhg.NetBSD.org/pkgsrc/rev/349f1af510be
branches: trunk
changeset: 526344:349f1af510be
user: rillig <rillig%pkgsrc.org@localhost>
date: Thu Mar 08 15:01:50 2007 +0000
description:
Fixed these gcc error messages from PR 35948:
Sun.c:8: error: static declaration of 'op' follows non-static declaration
Sun.h:40: error: previous declaration of 'op' was here
While here, also fixed the pkglint errors.
diffstat:
audio/xmms/distinfo | 5 +++--
audio/xmms/patches/patch-am | 17 +----------------
audio/xmms/patches/patch-ap | 17 +++++++++++++++++
3 files changed, 21 insertions(+), 18 deletions(-)
diffs (67 lines):
diff -r 326d8bc8611c -r 349f1af510be audio/xmms/distinfo
--- a/audio/xmms/distinfo Thu Mar 08 14:38:31 2007 +0000
+++ b/audio/xmms/distinfo Thu Mar 08 15:01:50 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2007/02/01 16:55:58 drochner Exp $
+$NetBSD: distinfo,v 1.30 2007/03/08 15:01:50 rillig Exp $
SHA1 (xmms-1.2.10.tar.bz2) = a3c3d3756d5263183c27b3c50a7f5404cba8bfaf
RMD160 (xmms-1.2.10.tar.bz2) = 0360cbb8c326b3325bd8ebb3343c69a9788d7084
@@ -15,6 +15,7 @@
SHA1 (patch-aj) = 67a69e2a05f343a5d7c22b3f1f1cf0c25d9aeb6d
SHA1 (patch-ak) = b49316325c6f778b0d3e85007b141699cf338238
SHA1 (patch-al) = 1457ca7b5e4e1084623207d042a8ff349eb31aaa
-SHA1 (patch-am) = 38e339a7f21921eedbed36ffe4c3ec0b1148c1e2
+SHA1 (patch-am) = 6474ef355b194189345008e35a4efc9648c26397
SHA1 (patch-an) = 3abc68bd37018800dc70b151a5b419211a727a02
SHA1 (patch-ao) = 2cadee08e6db7b802d1b700559705a8fe591f2dd
+SHA1 (patch-ap) = 101c54e2ce0e575893b8d3880ca54a021e89a8dd
diff -r 326d8bc8611c -r 349f1af510be audio/xmms/patches/patch-am
--- a/audio/xmms/patches/patch-am Thu Mar 08 14:38:31 2007 +0000
+++ b/audio/xmms/patches/patch-am Thu Mar 08 15:01:50 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.6 2006/08/28 05:09:05 ben Exp $
+$NetBSD: patch-am,v 1.7 2007/03/08 15:01:50 rillig Exp $
--- configure.orig 2004-02-23 13:44:32.000000000 -0800
+++ configure
@@ -25,18 +25,3 @@
;;
*)
ARCH_DEFINES="-DI386_ASSEM"
-@@ -19778,6 +19771,14 @@ do
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+ : Avoid regenerating within pkgsrc
-+ exit 0
-+ : Avoid regenerating within pkgsrc
-+ exit 0
-+ : Avoid regenerating within pkgsrc
-+ exit 0
-+ : Avoid regenerating within pkgsrc
-+ exit 0
- ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
diff -r 326d8bc8611c -r 349f1af510be audio/xmms/patches/patch-ap
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmms/patches/patch-ap Thu Mar 08 15:01:50 2007 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ap,v 1.3 2007/03/08 15:01:51 rillig Exp $
+
+gcc 4.1.2 says:
+Sun.c:8: error: static declaration of 'op' follows non-static declaration
+Sun.h:40: error: previous declaration of 'op' was here
+
+--- Output/solaris/Sun.c.orig 2001-04-27 00:31:34.000000000 +0200
++++ Output/solaris/Sun.c 2007-03-08 16:07:29.000000000 +0100
+@@ -5,7 +5,7 @@
+ #include "config.h"
+ #include "xmms/i18n.h"
+
+-static OutputPlugin op =
++OutputPlugin op =
+ {
+ NULL,
+ NULL,