From 19a1a1e2e687755e58592bd4306eaa24fc46a38d Mon Sep 17 00:00:00 2001
From: Tilman Keskinoz <arved@FreeBSD.org>
Date: Wed, 30 May 2007 17:22:06 +0000
Subject: [PATCH] Fix build with gcc4

---
 audio/xcdplayer/files/patch-internals.c | 21 +++++++++++++++++----
 audio/xcdplayer/files/patch-main.c      | 16 ++++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/audio/xcdplayer/files/patch-internals.c b/audio/xcdplayer/files/patch-internals.c
index 39be5c703b93..8cc4f70e914b 100644
--- a/audio/xcdplayer/files/patch-internals.c
+++ b/audio/xcdplayer/files/patch-internals.c
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
 --- internals.c.orig	Tue Jan 12 19:59:45 1993
-+++ internals.c	Mon Aug 25 00:38:35 2003
++++ internals.c	Wed May 30 19:20:48 2007
 @@ -22,6 +22,9 @@
  
  # include "debug.h"
@@ -29,6 +26,22 @@ $FreeBSD$
  
  int
  cdrom_get_curtime() {
+@@ -76,6 +80,7 @@
+ 	}
+ }
+ 
++static void	update_track();
+ 
+ /*
+  * we poll the cd-rom drive every TIMER_PERIOD milliseconds to see where 
+@@ -83,7 +88,6 @@
+  */
+ void
+ cdrom_timer_on() {
+-	static void	update_track();
+ 
+ 	if (cdi.state & CDROM_STATE_PLAY)
+ 		ivid = XtAppAddTimeOut(appc, TIMER_PERIOD, update_track, NULL);
 @@ -170,7 +174,6 @@
  	struct msf	track_start;
          struct msf	start_addr, end_addr;
diff --git a/audio/xcdplayer/files/patch-main.c b/audio/xcdplayer/files/patch-main.c
index 07d4facdacaf..a7c1a7d5bc49 100644
--- a/audio/xcdplayer/files/patch-main.c
+++ b/audio/xcdplayer/files/patch-main.c
@@ -1,20 +1,24 @@
-
-$FreeBSD$
-
 --- main.c.orig	Tue Jan 12 19:59:36 1993
-+++ main.c	Mon Aug 25 00:38:35 2003
-@@ -23,7 +23,9 @@
++++ main.c	Wed May 30 19:19:53 2007
+@@ -23,12 +23,15 @@
  
  Widget		top_form;
  
 -void
 +extern AppData app_data;
 +
++static void	chk_debug();
++
 +int
  main(argc, argv)
  	int		argc;
  	char		**argv;
-@@ -66,7 +68,7 @@
+ {
+-	static void	chk_debug();
+ 
+ 	chk_debug(argc, argv);
+ 
+@@ -66,7 +69,7 @@
  	/* ugly hack */
  	for (i = 1; i < argc; i++) {
  		if (strcmp(argv[i], "-debug") == 0) {