Added and fixed patches to allow build on alpha. Closes PR 5815

(Tim Rightnour)

13 files changed, 694 insertions, 441 deletions

diff --git a/audio/xcdplayer/patches/patch-aa b/audio/xcdplayer/patches/patch-aa
index ea7c755c469..c58d4d6ed99 100644
--- a/audio/xcdplayer/patches/patch-aa
+++ b/audio/xcdplayer/patches/patch-aa
@@ -1,173 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:36:19 agc Exp $
-
-*** XCdplayer.ad	Tue Jan 12 10:59:41 1993
---- /users/swallace/work/xcdplayer/XCdplayer.ad	Wed Feb 23 07:36:31 1994
-***************
-*** 19,29 ****
-  
-  XCdplayer*logoLabel.foreground:		Gold
-  XCdplayer*logoLabel.background:		Black
-- XCdplayer*icon*foreground:	Gold
-  
-  XCdplayer*versionLabel.Font:		 -misc-fixed-medium-r-normal--8-*
-  XCdplayer*versionLabel.foreground:	Black
-! XCdplayer*versionLabel.width:		130
-  XCdplayer*versionLabel.fromHoriz:	logoLabel
-  
-  ! replayThreshold is the number of seconds that must be played before the
---- 19,28 ----
-  
-  XCdplayer*logoLabel.foreground:		Gold
-  XCdplayer*logoLabel.background:		Black
-  
-  XCdplayer*versionLabel.Font:		 -misc-fixed-medium-r-normal--8-*
-  XCdplayer*versionLabel.foreground:	Black
-! XCdplayer*versionLabel.width:		110
-  XCdplayer*versionLabel.fromHoriz:	logoLabel
-  
-  ! replayThreshold is the number of seconds that must be played before the
-***************
-*** 33,48 ****
-  
-  ! scanSkipInterval is the number of seconds skipped at each fast-forward or
-  ! reverse.
-! XCdplayer*scanSkipInterval:		3
-  ! pauseSkipInterval is the number of seconds skipped at each fast-forward or
-  ! reverse if the CD is paused.
-! XCdplayer*pauseSkipInterval:		15
-  
-  ! scanPauseInterval is the number of seconds between each fast_forward or
-  ! reverse while holding down the buttons. (Sun CDs have a dreadfully long
-  ! start-up time for the audio to actually become audible, so "hearing the
-  ! track" while scanning isn't very feasible.)
-! XCdplayer*scanPauseInterval:		0.062
-  ! pausePauseInterval does the same thing when the disc is paused.
-  XCdplayer*pausePauseInterval:		0.5
-  
---- 32,47 ----
-  
-  ! scanSkipInterval is the number of seconds skipped at each fast-forward or
-  ! reverse.
-! XCdplayer*scanSkipInterval:		5
-  ! pauseSkipInterval is the number of seconds skipped at each fast-forward or
-  ! reverse if the CD is paused.
-! XCdplayer*pauseSkipInterval:		20
-  
-  ! scanPauseInterval is the number of seconds between each fast_forward or
-  ! reverse while holding down the buttons. (Sun CDs have a dreadfully long
-  ! start-up time for the audio to actually become audible, so "hearing the
-  ! track" while scanning isn't very feasible.)
-! XCdplayer*scanPauseInterval:		0.25
-  ! pausePauseInterval does the same thing when the disc is paused.
-  XCdplayer*pausePauseInterval:		0.5
-  
-***************
-*** 56,62 ****
-  XCdplayer*Viewport.allowHoriz:		True
-  XCdplayer*Viewport.useBottom:		True
-  XCdplayer*Viewport.forceBars:		False
-! XCdplayer*Viewport.width:		188
-  XCdplayer*Viewport.height:		30
-  XCdplayer*Viewport*thickness:		8
-  XCdplayer*Viewport.resizable:		False
---- 55,61 ----
-  XCdplayer*Viewport.allowHoriz:		True
-  XCdplayer*Viewport.useBottom:		True
-  XCdplayer*Viewport.forceBars:		False
-! XCdplayer*Viewport.width:		160
-  XCdplayer*Viewport.height:		30
-  XCdplayer*Viewport*thickness:		8
-  XCdplayer*Viewport.resizable:		False
-***************
-*** 88,98 ****
-  XCdplayer*Toggle.right:			ChainLeft
-  XCdplayer*Toggle.background:		Ivory
-  
-! XCdplayer*ledsLabel.horizDistance:	20
-  XCdplayer*ledsLabel.fromVert:		versionLabel
-  XCdplayer*ledsLabel.fromHoriz:		logoLabel
-  
-! XCdplayer*trackButton.horizDistance:	8
-  XCdplayer*trackButton.fromVert:		versionLabel
-  XCdplayer*trackButton.fromHoriz:	ledsLabel
-  XCdplayer*trackButton.borderWidth:	2
---- 87,97 ----
-  XCdplayer*Toggle.right:			ChainLeft
-  XCdplayer*Toggle.background:		Ivory
-  
-! XCdplayer*ledsLabel.horizDistance:	4
-  XCdplayer*ledsLabel.fromVert:		versionLabel
-  XCdplayer*ledsLabel.fromHoriz:		logoLabel
-  
-! XCdplayer*trackButton.horizDistance:	4
-  XCdplayer*trackButton.fromVert:		versionLabel
-  XCdplayer*trackButton.fromHoriz:	ledsLabel
-  XCdplayer*trackButton.borderWidth:	2
-***************
-*** 108,134 ****
-  XCdplayer*timerButton.left:		ChainRight
-  XCdplayer*timerButton.right:		ChainRight
-  
-! XCdplayer*volumeScrollbar.horizDistance:8
-  XCdplayer*volumeScrollbar.fromHoriz:	logoLabel
-  XCdplayer*volumeScrollbar.fromVert:	trackButton
-  XCdplayer*volumeScrollbar.orientation:	horizontal
-! XCdplayer*volumeScrollbar.length:	120
-  XCdplayer*volumeScrollbar.right:	ChainRight
-  XCdplayer*volumeScrollbar.left:		ChainRight
-  XCdplayer*volumeScrollbar.background:	green
-  XCdplayer*volumeScrollbar.foreground:	white
-! XCdplayer*volumeScrollbar.thumb:	black
-  
-  XCdplayer*titleBarViewport.fromVert:	volumeScrollbar
-- XCdplayer*titleBarViewport.forceBars:	true
-  XCdplayer*titleBar.borderwidth:		0
-  XCdplayer*titleBar.highlightThickness:	1
-  XCdplayer*titleBar.foreground:		Red
-  XCdplayer*titleBar.background:		Ivory
-- 
-- XCdplayer*titleDialog.Text.translations:#override\
-- 	<Key>Return:	done()
-- 
-  XCdplayer*buttonsForm.fromVert:		logoForm
-  XCdplayer*buttonsForm.borderWidth:	1
-  
---- 107,128 ----
-  XCdplayer*timerButton.left:		ChainRight
-  XCdplayer*timerButton.right:		ChainRight
-  
-! XCdplayer*volumeScrollbar.horizDistance:4
-  XCdplayer*volumeScrollbar.fromHoriz:	logoLabel
-  XCdplayer*volumeScrollbar.fromVert:	trackButton
-  XCdplayer*volumeScrollbar.orientation:	horizontal
-! XCdplayer*volumeScrollbar.length:	93
-  XCdplayer*volumeScrollbar.right:	ChainRight
-  XCdplayer*volumeScrollbar.left:		ChainRight
-  XCdplayer*volumeScrollbar.background:	green
-  XCdplayer*volumeScrollbar.foreground:	white
-! XCdplayer*volumeScrollbar.thumb:        black
-  
-  XCdplayer*titleBarViewport.fromVert:	volumeScrollbar
-  XCdplayer*titleBar.borderwidth:		0
-  XCdplayer*titleBar.highlightThickness:	1
-  XCdplayer*titleBar.foreground:		Red
-  XCdplayer*titleBar.background:		Ivory
-  XCdplayer*buttonsForm.fromVert:		logoForm
-  XCdplayer*buttonsForm.borderWidth:	1
-  
-*** Imakefile	Tue Jan 12 10:59:29 1993
---- /users/swallace/work/xcdplayer/Imakefile	Fri Sep 30 17:09:19 1994
-***************
-*** 15,20 ****
---- 15,25 ----
-  
-  LOCAL_LIBRARIES = XawClientLibs
-  LINTLIBS = -lXaw -lXt -lX11
-+            SRCS = main.c top_setup.c logo_setup.c button_setup.c cdrom_callb.c\
-+                   cdrom_freebsd.c internals.c shuffle.c program.c leds.c debug.c 
-+ 
-+            OBJS = main.o top_setup.o logo_setup.o button_setup.o cdrom_callb.o\
-+                   cdrom_freebsd.o internals.o shuffle.o program.o leds.o debug.o
-  #ifdef SunArchitecture
-             SRCS = main.c top_setup.c logo_setup.c button_setup.c cdrom_callb.c\
-                    cdrom_sun.c internals.c shuffle.c program.c leds.c debug.c 
+$NetBSD: patch-aa,v 1.3 1998/08/23 06:49:29 garbled Exp $
+--- main.c.orig	Wed Jul 22 21:41:14 1998
++++ main.c	Wed Jul 22 21:41:47 1998
+@@ -25,2 +25,4 @@
+ 
++extern AppData app_data;
++
+ void
+@@ -68,3 +70,3 @@
+ 		if (strcmp(argv[i], "-debug") == 0) {
+-			debug = True;
++			app_data.debug = True;
+ 			break;
diff --git a/audio/xcdplayer/patches/patch-ab b/audio/xcdplayer/patches/patch-ab
index cc90306120d..f7142706b6f 100644
--- a/audio/xcdplayer/patches/patch-ab
+++ b/audio/xcdplayer/patches/patch-ab
@@ -1,268 +1,15 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:20 agc Exp $
-
-*** button_setup.c	Tue Jan 12 10:59:47 1993
---- /users/swallace/work/xcdplayer/button_setup.c	Wed Feb 23 07:36:36 1994
-***************
-*** 20,25 ****
---- 20,28 ----
-  # include <X11/Xaw/Toggle.h>
-  
-  # include "cdrom_globs.h"
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+ # include "cdrom_freebsd.h"
-+ #endif
-  #ifdef sun
-  # include "cdrom_sun.h"
-  #endif
-***************
-*** 44,49 ****
---- 47,69 ----
-  # include "ff.xbm"
-  # include "pgm.xbm"
-  
-+ void     title_dialog_setup();
-+ static	void     play_button_setup();
-+ static	void     stop_button_setup();
-+ static	void     pause_button_setup();
-+ static	void     prev_button_setup();
-+ static	void     next_button_setup();
-+ static	void     eject_button_setup();
-+ #ifdef sgi
-+ void     audio_button_setup();
-+ #endif
-+ static	void     quit_button_setup();
-+ static	void     cycle_button_setup();
-+ static	void     shuffle_button_setup();
-+ static	void     rew_button_setup();
-+ static	void     ff_button_setup();
-+ static	void     pgm_button_setup();
-+ void     buttons_reset();
-  
-  static Widget	buttons_form_widget;
-  static Widget	play_button_widget;
-***************
-*** 71,95 ****
-  	Widget		parent_widget;
-  {
-  	Arg		args[1];
-- 
-- 	extern void	title_dialog_setup();
-- 	extern void	play_button_setup();
-- 	extern void	stop_button_setup();
-- 	extern void	pause_button_setup();
-- 	extern void	prev_button_setup();
-- 	extern void	next_button_setup();
-- 	extern void	eject_button_setup();
-- #ifdef sgi
-- 	extern void	audio_button_setup();
-- #endif
-- 	extern void	quit_button_setup();
-- 	extern void	cycle_button_setup();
-- 	extern void	shuffle_button_setup();
-- 	extern void	rew_button_setup();
-- 	extern void	ff_button_setup();
-- 	extern void	pgm_button_setup();
-- 	extern void	buttons_reset();
-- 
-  
-  	buttons_form_widget = XtCreateManagedWidget("buttonsForm",
-  						    formWidgetClass,
---- 91,96 ----
-*** cdrom_callb.c	Tue Jan 12 10:59:48 1993
---- /users/swallace/work/xcdplayer/cdrom_callb.c	Wed Feb 23 07:36:41 1994
-***************
-*** 22,27 ****
---- 22,30 ----
-  
-  # include "debug.h"
-  # include "cdrom_globs.h"
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+ # include "cdrom_freebsd.h"
-+ #endif
-  #ifdef sun
-  # include "cdrom_sun.h"
-  #endif
-*** internals.c	Tue Jan 12 10:59:45 1993
---- /users/swallace/work/xcdplayer/internals.c	Wed Feb 23 07:36:47 1994
-***************
-*** 22,27 ****
---- 22,30 ----
-  
-  # include "debug.h"
-  # include "cdrom_globs.h"
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+ # include "cdrom_freebsd.h"
-+ #endif
-  #ifdef sun
-  # include "cdrom_sun.h"
-  #endif
-***************
-*** 29,35 ****
-  # include "cdrom_sgi.h"
-  #endif
-  
-! 
-  static XtIntervalId	ivid			= -1;
-  static XtIntervalId	scanivid		= -1;
-  static XtIntervalId	stativid		= -1;
---- 32,38 ----
-  # include "cdrom_sgi.h"
-  #endif
-  
-! static void     scan_update();
-  static XtIntervalId	ivid			= -1;
-  static XtIntervalId	scanivid		= -1;
-  static XtIntervalId	stativid		= -1;
-***************
-*** 170,176 ****
-  	struct msf	track_start;
-          struct msf	start_addr, end_addr;
-  	int		curtrack;
-- 	extern void 	scan_update();
-  
-  	if (cdrom_get_curmsf(&start_addr) == -1) {
-  		debug_printf(1, "rew: error reading location\n");
---- 173,178 ----
-***************
-*** 304,310 ****
-          struct msf	start_addr, end_addr,  next_start;
-  	char		t;
-  	int		curtrack;
-- 	extern void 	scan_update();
-  
-  	if (cdrom_get_curmsf(&start_addr) == -1) {
-  		debug_printf(1, "ff: error reading location\n");
---- 306,311 ----
-*** logo_setup.c	Tue Jan 12 10:59:46 1993
---- /users/swallace/work/xcdplayer/logo_setup.c	Wed Feb 23 07:36:52 1994
-***************
-*** 28,33 ****
---- 28,36 ----
-  # include <stdio.h>
-  
-  # include "cdrom_globs.h"
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+ # include "cdrom_freebsd.h"
-+ #endif
-  #ifdef sun
-  # include "cdrom_sun.h"
-  #endif
-***************
-*** 55,73 ****
-  Widget		title_done_widget;
-  
-  static int	vol;
-  
-  void
-  logo_setup(parent_widget)
-  	Widget		parent_widget;
-  {
-- 	extern void	leds_label_setup();
-- 	extern void	cb_track_button();
-- 	extern void	cb_timer_button();
-- 	extern void	volume_jump_proc();
-- 	extern void	volume_scroll_proc();
-- 	extern void	popup_title_dialog();
-- 	extern void	popdown_title_dialog();
-- 
-  	Widget		version_label_widget;
-  	char		version_string[80];
-  
---- 58,76 ----
-  Widget		title_done_widget;
-  
-  static int	vol;
-+ extern void     leds_label_setup();
-+ static void     cb_track_button();
-+ static void     cb_timer_button();
-+ static void     volume_jump_proc();
-+ static void     volume_scroll_proc();
-+ static void     popup_title_dialog();
-+ static void     popdown_title_dialog();
-+ 
-  
-  void
-  logo_setup(parent_widget)
-  	Widget		parent_widget;
-  {
-  	Widget		version_label_widget;
-  	char		version_string[80];
-  
-*** program.c	Tue Jan 12 10:59:49 1993
---- /users/swallace/work/xcdplayer/program.c	Wed Feb 23 07:36:55 1994
-***************
-*** 27,36 ****
-  
-  # include <stdio.h>
-  # include <string.h>
-! # include <malloc.h>
-  
-  # include "debug.h"
-  # include "cdrom_globs.h"
-  #ifdef sun
-  # include "cdrom_sun.h"
-  #endif
---- 27,39 ----
-  
-  # include <stdio.h>
-  # include <string.h>
-! # include <sys/malloc.h>
-  
-  # include "debug.h"
-  # include "cdrom_globs.h"
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+ # include "cdrom_freebsd.h"
-+ #endif
-  #ifdef sun
-  # include "cdrom_sun.h"
-  #endif
-***************
-*** 52,57 ****
---- 55,69 ----
-  static	Boolean	adding_to_new_track = False;
-  static	struct	prognode *current_node = NULL;
-  
-+ static	void    cb_move_program_ptr();
-+ static	void    cb_clear_program();
-+ static	void    cb_cancel_program();
-+ static	void    cb_save_program();
-+ static	void    cb_trackbuttons();
-+ static	void    cb_add_10();
-+ static	void    cb_new_track();
-+ static	void    cb_program_all();
-+ 
-  void
-  program_form_setup (parent_widget)
-  	Widget	parent_widget;
-***************
-*** 66,80 ****
-  	Widget	cancel_button;
-  	Widget	save_button;
-  	Widget	all_button;
-- 
-- 	extern	void	cb_move_program_ptr();
-- 	extern	void	cb_clear_program();
-- 	extern	void	cb_cancel_program();
-- 	extern	void	cb_save_program();
-- 	extern	void	cb_trackbuttons();
-- 	extern	void	cb_add_10();
-- 	extern	void	cb_new_track();
-- 	extern	void	cb_program_all();
-  
-  	/* 
-  	 * create program form as a non-managed widget, because this 
---- 78,83 ----
-*** shuffle.c	Tue Jan 12 10:59:38 1993
---- /users/swallace/work/xcdplayer/shuffle.c	Wed Feb 23 07:36:59 1994
-***************
-*** 18,23 ****
---- 18,26 ----
-  
-  # include "debug.h"
-  # include "cdrom_globs.h"
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+ # include "cdrom_freebsd.h"
-+ #endif
-  #ifdef sun
-  # include "cdrom_sun.h"
-  #endif
+$NetBSD: patch-ab,v 1.3 1998/08/23 06:49:29 garbled Exp $
+--- debug.c.orig	Wed Jul 22 23:21:17 1998
++++ debug.c	Wed Jul 22 23:21:54 1998
+@@ -22,2 +22,6 @@
+ 
++#include "app.h"
++
++extern AppData app_data;
++
+ /* VARARGS */
+@@ -35,3 +39,3 @@
+ 	 */
+-	if ((va_arg(args, int) == 0) || (debug == False))
++	if ((va_arg(args, int) == 0) || (app_data.debug == False))
+ 		return;
diff --git a/audio/xcdplayer/patches/patch-ac b/audio/xcdplayer/patches/patch-ac
new file mode 100644
index 00000000000..208ec2ac6ac
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1 1998/08/23 06:49:29 garbled Exp $
+--- cdrom_globs.h.orig	Tue Jan 12 11:59:31 1993
++++ cdrom_globs.h	Wed Jul 22 21:48:44 1998
+@@ -101,9 +101,6 @@
+ 
+-
+-extern Boolean		display_timer;
+-
+ extern XtAppContext	appc;
+ 
+-extern char		*file;
+-extern char		*device;
++#include "app.h"
++
+ extern char             info_filename[];
+@@ -111,10 +108 @@
+ extern unsigned int     timer_fsecs;
+-
+-
+-extern float		volbase;
+-extern float		volpcent;
+-extern int		replayThreshold;
+-extern float    	scanPauseInterval;
+-extern int      	scanSkipInterval;
+-extern float      	pausePauseInterval;
+-extern int      	pauseSkipInterval;
diff --git a/audio/xcdplayer/patches/patch-ad b/audio/xcdplayer/patches/patch-ad
new file mode 100644
index 00000000000..d7698affe26
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-ad
@@ -0,0 +1,84 @@
+$NetBSD: patch-ad,v 1.1 1998/08/23 06:49:29 garbled Exp $
+--- top_setup.c.orig	Tue Jan 12 11:59:40 1993
++++ top_setup.c	Thu Jul 23 00:03:38 1998
+@@ -28,14 +28,4 @@
+ XtAppContext	appc;
+-char		*file;
+-char		*device;
+-Boolean		debug		= False;
+-Boolean		display_timer	= True;
+-float		volbase		= 187.0;
+-float		volpcent	= .267;
+-int		replayThreshold	= 4;
+-int		pauseSkipInterval	= 15;
+-int		scanSkipInterval	= 1;
+-float		scanPauseInterval	= .062;
+-float		pausePauseInterval	= .500;
+-char		*cdInfoDir = NULL;
++
++AppData app_data;
+ 
+@@ -57,32 +47,32 @@
+ static XtResource	resources[] = {
+-	{ "file", "File", XtRString, sizeof(String), (Cardinal) &file,
++	{ "file", "File", XtRString, sizeof(String), XtOffsetOf(AppData,file),
+ 		  XtRString, (caddr_t) NULL },
+-	{ "device", "Device", XtRString, sizeof(String), (Cardinal) &device,
++	{ "device", "Device", XtRString, sizeof(String), XtOffsetOf(AppData,device),
+ 		  XtRString, (caddr_t) NULL },
+-	{ "debug", "Debug", XtRBoolean, sizeof(Boolean), (Cardinal) &debug,
+-		  XtRBoolean, (caddr_t) &debug },
++	{ "debug", "Debug", XtRBoolean, sizeof(Boolean), XtOffsetOf(AppData,debug),
++		  XtRBoolean, "False" },
+ 	{ "displayTimer", "DisplayTimer", XtRBoolean, sizeof(Boolean),
+-		  (Cardinal) &display_timer, XtRBoolean,
+-		  (caddr_t) &display_timer },
++		  XtOffsetOf(AppData,display_timer), XtRBoolean,
++		  "True" },
+ 	{ "volBase", "VolBase", XtRFloat, sizeof(float),
+-		  (Cardinal) &volbase, XtRFloat, (caddr_t) &volbase },
++		  XtOffsetOf(AppData,volbase), XtRFloat, "187.0" },
+ 	{ "volPcent", "VolPcent", XtRFloat, sizeof(float),
+-		  (Cardinal) &volpcent, XtRFloat, (caddr_t) &volpcent },
++		  XtOffsetOf(AppData,volpcent), XtRFloat, ".267" },
+ 	{ "replayThreshold", "replayThreshold", XtRInt, sizeof(int),
+-		  (Cardinal) &replayThreshold, XtRInt, 
+-		  (caddr_t) &replayThreshold },
++		  XtOffsetOf(AppData,replayThreshold), XtRInt, 
++		  "4" },
+ 	{ "scanSkipInterval", "scanSkipInterval", XtRInt, sizeof(int),
+-		  (Cardinal) &scanSkipInterval, XtRInt, 
+-		  (caddr_t) &scanSkipInterval },
++		  XtOffsetOf(AppData,scanSkipInterval), XtRInt, 
++		  "1" },
+ 	{ "scanPauseInterval", "scanPauseInterval", XtRFloat, sizeof(float),
+-		  (Cardinal) &scanPauseInterval, XtRFloat, 
+-		  (caddr_t) &scanPauseInterval },
++		  XtOffsetOf(AppData,scanPauseInterval), XtRFloat, 
++		  ".062" },
+ 	{ "pauseSkipInterval", "pauseSkipInterval", XtRInt, sizeof(int),
+-		  (Cardinal) &pauseSkipInterval, XtRInt, 
+-		  (caddr_t) &pauseSkipInterval },
++		  XtOffsetOf(AppData,pauseSkipInterval), XtRInt, 
++		  "15" },
+ 	{ "pausePauseInterval", "pausePauseInterval", XtRFloat, sizeof(float),
+-		  (Cardinal) &pausePauseInterval, XtRFloat, 
+-		  (caddr_t) &pausePauseInterval },
++		  XtOffsetOf(AppData,pausePauseInterval), XtRFloat, 
++		  ".500" },
+ 	{ "cdInfoDir", "cdInfoDir", XtRString, sizeof(String), 
+-		  (Cardinal) &cdInfoDir, XtRString, (caddr_t) NULL },
++		  XtOffsetOf(AppData,cdInfoDir), XtRString, (caddr_t) NULL },
+ };
+@@ -125,3 +115,3 @@
+ 
+-	(void) XtGetApplicationResources(top_shell, (caddr_t) NULL,
++	(void) XtGetApplicationResources(top_shell, (caddr_t) &app_data,
+ 					 resources, XtNumber(resources),
+@@ -129,4 +119,4 @@
+ 
+-	if ((cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL))
+-	    cdInfoDir = strdup(s);
++	if ((app_data.cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL))
++	    app_data.cdInfoDir = strdup(s);
+ 
diff --git a/audio/xcdplayer/patches/patch-ae b/audio/xcdplayer/patches/patch-ae
new file mode 100644
index 00000000000..4cca78807ac
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-ae
@@ -0,0 +1,156 @@
+$NetBSD: patch-ae,v 1.1 1998/08/23 06:49:29 garbled Exp $
+*** XCdplayer.ad	Tue Jan 12 10:59:41 1993
+--- /users/swallace/work/xcdplayer/XCdplayer.ad	Wed Feb 23 07:36:31 1994
+***************
+*** 19,29 ****
+  
+  XCdplayer*logoLabel.foreground:		Gold
+  XCdplayer*logoLabel.background:		Black
+- XCdplayer*icon*foreground:	Gold
+  
+  XCdplayer*versionLabel.Font:		 -misc-fixed-medium-r-normal--8-*
+  XCdplayer*versionLabel.foreground:	Black
+! XCdplayer*versionLabel.width:		130
+  XCdplayer*versionLabel.fromHoriz:	logoLabel
+  
+  ! replayThreshold is the number of seconds that must be played before the
+--- 19,28 ----
+  
+  XCdplayer*logoLabel.foreground:		Gold
+  XCdplayer*logoLabel.background:		Black
+  
+  XCdplayer*versionLabel.Font:		 -misc-fixed-medium-r-normal--8-*
+  XCdplayer*versionLabel.foreground:	Black
+! XCdplayer*versionLabel.width:		110
+  XCdplayer*versionLabel.fromHoriz:	logoLabel
+  
+  ! replayThreshold is the number of seconds that must be played before the
+***************
+*** 33,48 ****
+  
+  ! scanSkipInterval is the number of seconds skipped at each fast-forward or
+  ! reverse.
+! XCdplayer*scanSkipInterval:		3
+  ! pauseSkipInterval is the number of seconds skipped at each fast-forward or
+  ! reverse if the CD is paused.
+! XCdplayer*pauseSkipInterval:		15
+  
+  ! scanPauseInterval is the number of seconds between each fast_forward or
+  ! reverse while holding down the buttons. (Sun CDs have a dreadfully long
+  ! start-up time for the audio to actually become audible, so "hearing the
+  ! track" while scanning isn't very feasible.)
+! XCdplayer*scanPauseInterval:		0.062
+  ! pausePauseInterval does the same thing when the disc is paused.
+  XCdplayer*pausePauseInterval:		0.5
+  
+--- 32,47 ----
+  
+  ! scanSkipInterval is the number of seconds skipped at each fast-forward or
+  ! reverse.
+! XCdplayer*scanSkipInterval:		5
+  ! pauseSkipInterval is the number of seconds skipped at each fast-forward or
+  ! reverse if the CD is paused.
+! XCdplayer*pauseSkipInterval:		20
+  
+  ! scanPauseInterval is the number of seconds between each fast_forward or
+  ! reverse while holding down the buttons. (Sun CDs have a dreadfully long
+  ! start-up time for the audio to actually become audible, so "hearing the
+  ! track" while scanning isn't very feasible.)
+! XCdplayer*scanPauseInterval:		0.25
+  ! pausePauseInterval does the same thing when the disc is paused.
+  XCdplayer*pausePauseInterval:		0.5
+  
+***************
+*** 56,62 ****
+  XCdplayer*Viewport.allowHoriz:		True
+  XCdplayer*Viewport.useBottom:		True
+  XCdplayer*Viewport.forceBars:		False
+! XCdplayer*Viewport.width:		188
+  XCdplayer*Viewport.height:		30
+  XCdplayer*Viewport*thickness:		8
+  XCdplayer*Viewport.resizable:		False
+--- 55,61 ----
+  XCdplayer*Viewport.allowHoriz:		True
+  XCdplayer*Viewport.useBottom:		True
+  XCdplayer*Viewport.forceBars:		False
+! XCdplayer*Viewport.width:		160
+  XCdplayer*Viewport.height:		30
+  XCdplayer*Viewport*thickness:		8
+  XCdplayer*Viewport.resizable:		False
+***************
+*** 88,98 ****
+  XCdplayer*Toggle.right:			ChainLeft
+  XCdplayer*Toggle.background:		Ivory
+  
+! XCdplayer*ledsLabel.horizDistance:	20
+  XCdplayer*ledsLabel.fromVert:		versionLabel
+  XCdplayer*ledsLabel.fromHoriz:		logoLabel
+  
+! XCdplayer*trackButton.horizDistance:	8
+  XCdplayer*trackButton.fromVert:		versionLabel
+  XCdplayer*trackButton.fromHoriz:	ledsLabel
+  XCdplayer*trackButton.borderWidth:	2
+--- 87,97 ----
+  XCdplayer*Toggle.right:			ChainLeft
+  XCdplayer*Toggle.background:		Ivory
+  
+! XCdplayer*ledsLabel.horizDistance:	4
+  XCdplayer*ledsLabel.fromVert:		versionLabel
+  XCdplayer*ledsLabel.fromHoriz:		logoLabel
+  
+! XCdplayer*trackButton.horizDistance:	4
+  XCdplayer*trackButton.fromVert:		versionLabel
+  XCdplayer*trackButton.fromHoriz:	ledsLabel
+  XCdplayer*trackButton.borderWidth:	2
+***************
+*** 108,134 ****
+  XCdplayer*timerButton.left:		ChainRight
+  XCdplayer*timerButton.right:		ChainRight
+  
+! XCdplayer*volumeScrollbar.horizDistance:8
+  XCdplayer*volumeScrollbar.fromHoriz:	logoLabel
+  XCdplayer*volumeScrollbar.fromVert:	trackButton
+  XCdplayer*volumeScrollbar.orientation:	horizontal
+! XCdplayer*volumeScrollbar.length:	120
+  XCdplayer*volumeScrollbar.right:	ChainRight
+  XCdplayer*volumeScrollbar.left:		ChainRight
+  XCdplayer*volumeScrollbar.background:	green
+  XCdplayer*volumeScrollbar.foreground:	white
+! XCdplayer*volumeScrollbar.thumb:	black
+  
+  XCdplayer*titleBarViewport.fromVert:	volumeScrollbar
+- XCdplayer*titleBarViewport.forceBars:	true
+  XCdplayer*titleBar.borderwidth:		0
+  XCdplayer*titleBar.highlightThickness:	1
+  XCdplayer*titleBar.foreground:		Red
+  XCdplayer*titleBar.background:		Ivory
+- 
+- XCdplayer*titleDialog.Text.translations:#override\
+- 	<Key>Return:	done()
+- 
+  XCdplayer*buttonsForm.fromVert:		logoForm
+  XCdplayer*buttonsForm.borderWidth:	1
+  
+--- 107,128 ----
+  XCdplayer*timerButton.left:		ChainRight
+  XCdplayer*timerButton.right:		ChainRight
+  
+! XCdplayer*volumeScrollbar.horizDistance:4
+  XCdplayer*volumeScrollbar.fromHoriz:	logoLabel
+  XCdplayer*volumeScrollbar.fromVert:	trackButton
+  XCdplayer*volumeScrollbar.orientation:	horizontal
+! XCdplayer*volumeScrollbar.length:	93
+  XCdplayer*volumeScrollbar.right:	ChainRight
+  XCdplayer*volumeScrollbar.left:		ChainRight
+  XCdplayer*volumeScrollbar.background:	green
+  XCdplayer*volumeScrollbar.foreground:	white
+! XCdplayer*volumeScrollbar.thumb:        black
+  
+  XCdplayer*titleBarViewport.fromVert:	volumeScrollbar
+  XCdplayer*titleBar.borderwidth:		0
+  XCdplayer*titleBar.highlightThickness:	1
+  XCdplayer*titleBar.foreground:		Red
+  XCdplayer*titleBar.background:		Ivory
+  XCdplayer*buttonsForm.fromVert:		logoForm
+  XCdplayer*buttonsForm.borderWidth:	1
+  
diff --git a/audio/xcdplayer/patches/patch-af b/audio/xcdplayer/patches/patch-af
new file mode 100644
index 00000000000..7a834cfef5f
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1 1998/08/23 06:49:29 garbled Exp $
+*** Imakefile	Tue Jan 12 10:59:29 1993
+--- /users/swallace/work/xcdplayer/Imakefile	Fri Sep 30 17:09:19 1994
+***************
+*** 15,20 ****
+--- 15,25 ----
+  
+  LOCAL_LIBRARIES = XawClientLibs
+  LINTLIBS = -lXaw -lXt -lX11
++            SRCS = main.c top_setup.c logo_setup.c button_setup.c cdrom_callb.c\
++                   cdrom_freebsd.c internals.c shuffle.c program.c leds.c debug.c 
++ 
++            OBJS = main.o top_setup.o logo_setup.o button_setup.o cdrom_callb.o\
++                   cdrom_freebsd.o internals.o shuffle.o program.o leds.o debug.o
+  #ifdef SunArchitecture
+             SRCS = main.c top_setup.c logo_setup.c button_setup.c cdrom_callb.c\
+                    cdrom_sun.c internals.c shuffle.c program.c leds.c debug.c 
diff --git a/audio/xcdplayer/patches/patch-ag b/audio/xcdplayer/patches/patch-ag
new file mode 100644
index 00000000000..1ed2f044052
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-ag
@@ -0,0 +1,69 @@
+$NetBSD: patch-ag,v 1.1 1998/08/23 06:49:29 garbled Exp $
+*** button_setup.c	Tue Jan 12 10:59:47 1993
+--- /users/swallace/work/xcdplayer/button_setup.c	Wed Feb 23 07:36:36 1994
+***************
+*** 20,25 ****
+--- 20,28 ----
+  # include <X11/Xaw/Toggle.h>
+  
+  # include "cdrom_globs.h"
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++ # include "cdrom_freebsd.h"
++ #endif
+  #ifdef sun
+  # include "cdrom_sun.h"
+  #endif
+***************
+*** 44,49 ****
+--- 47,69 ----
+  # include "ff.xbm"
+  # include "pgm.xbm"
+  
++ void     title_dialog_setup();
++ static	void     play_button_setup();
++ static	void     stop_button_setup();
++ static	void     pause_button_setup();
++ static	void     prev_button_setup();
++ static	void     next_button_setup();
++ static	void     eject_button_setup();
++ #ifdef sgi
++ void     audio_button_setup();
++ #endif
++ static	void     quit_button_setup();
++ static	void     cycle_button_setup();
++ static	void     shuffle_button_setup();
++ static	void     rew_button_setup();
++ static	void     ff_button_setup();
++ static	void     pgm_button_setup();
++ void     buttons_reset();
+  
+  static Widget	buttons_form_widget;
+  static Widget	play_button_widget;
+***************
+*** 71,95 ****
+  	Widget		parent_widget;
+  {
+  	Arg		args[1];
+- 
+- 	extern void	title_dialog_setup();
+- 	extern void	play_button_setup();
+- 	extern void	stop_button_setup();
+- 	extern void	pause_button_setup();
+- 	extern void	prev_button_setup();
+- 	extern void	next_button_setup();
+- 	extern void	eject_button_setup();
+- #ifdef sgi
+- 	extern void	audio_button_setup();
+- #endif
+- 	extern void	quit_button_setup();
+- 	extern void	cycle_button_setup();
+- 	extern void	shuffle_button_setup();
+- 	extern void	rew_button_setup();
+- 	extern void	ff_button_setup();
+- 	extern void	pgm_button_setup();
+- 	extern void	buttons_reset();
+- 
+  
+  	buttons_form_widget = XtCreateManagedWidget("buttonsForm",
+  						    formWidgetClass,
+--- 91,96 ----
diff --git a/audio/xcdplayer/patches/patch-ah b/audio/xcdplayer/patches/patch-ah
new file mode 100644
index 00000000000..4b61cdfe6d1
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-ah
@@ -0,0 +1,19 @@
+$NetBSD: patch-ah,v 1.1 1998/08/23 06:49:29 garbled Exp $
+--- cdrom_callb.c.orig	Tue Jan 12 11:59:48 1993
++++ cdrom_callb.c	Wed Jul 22 21:25:45 1998
+@@ -24,2 +24,5 @@
+ # include "cdrom_globs.h"
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++# include "cdrom_freebsd.h"
++#endif
+ #ifdef sun
+@@ -31,2 +34,4 @@
+ 
++extern AppData app_data;
++
+ void		cdrom_new_disc();
+@@ -289,3 +294,3 @@
+ 	 */
+-	if (cdi.duration < replayThreshold)
++	if (cdi.duration < app_data.replayThreshold)
+ 	{
diff --git a/audio/xcdplayer/patches/patch-ai b/audio/xcdplayer/patches/patch-ai
new file mode 100644
index 00000000000..b0008acc610
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-ai
@@ -0,0 +1,108 @@
+$NetBSD: patch-ai,v 1.1 1998/08/23 06:49:29 garbled Exp $
+--- internals.c.orig	Tue Jan 12 11:59:45 1993
++++ internals.c	Wed Jul 22 21:35:54 1998
+@@ -24,2 +24,5 @@
+ # include "cdrom_globs.h"
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++# include "cdrom_freebsd.h"
++#endif
+ #ifdef sun
+@@ -31,3 +34,3 @@
+ 
+-
++static void     scan_update();
+ static XtIntervalId	ivid			= -1;
+@@ -38,2 +41,3 @@
+ 
++extern AppData app_data;
+ 
+@@ -172,3 +176,2 @@
+ 	int		curtrack;
+-	extern void 	scan_update();
+ 
+@@ -198,3 +201,3 @@
+ 		 ((start_addr.minute * 60) + start_addr.second - 
+-		  scanSkipInterval)) ||
++		  app_data.scanSkipInterval)) ||
+ 		((cdi.state & CDROM_STATE_PAUSE) &&
+@@ -202,3 +205,3 @@
+ 		 ((start_addr.minute * 60) + start_addr.second -
+-		  pauseSkipInterval)))
++		  app_data.pauseSkipInterval)))
+ 	    {
+@@ -210,5 +213,5 @@
+ 		if (cdi.state & CDROM_STATE_PAUSE) {
+-			start_addr.second -= pauseSkipInterval; 
++			start_addr.second -= app_data.pauseSkipInterval; 
+ 		} else if (cdi.state & CDROM_STATE_PLAY) {
+-			start_addr.second -= scanSkipInterval; 
++			start_addr.second -= app_data.scanSkipInterval; 
+ 		}
+@@ -225,5 +228,5 @@
+ 		if (cdi.state & CDROM_STATE_PAUSE) {
+-			start_addr.second -= pauseSkipInterval; 
++			start_addr.second -= app_data.pauseSkipInterval; 
+ 		} else if (cdi.state & CDROM_STATE_PLAY) {
+-			start_addr.second -= scanSkipInterval; 
++			start_addr.second -= app_data.scanSkipInterval; 
+ 		}
+@@ -276,3 +279,3 @@
+ 		scanivid = XtAppAddTimeOut(appc, 
+-			(int)(pausePauseInterval * 1000.0), 
++			(int)(app_data.pausePauseInterval * 1000.0), 
+ 			scan_update, NULL);
+@@ -306,3 +309,2 @@
+ 	int		curtrack;
+-	extern void 	scan_update();
+ 
+@@ -334,3 +336,3 @@
+ 		 ((start_addr.minute * 60) + start_addr.second +
+-		  scanSkipInterval)) ||
++		  app_data.scanSkipInterval)) ||
+ 		((cdi.state & CDROM_STATE_PAUSE) &&
+@@ -338,3 +340,3 @@
+ 		 ((start_addr.minute * 60) + start_addr.second +
+-		  pauseSkipInterval)))
++		  app_data.pauseSkipInterval)))
+ 	    {
+@@ -348,5 +350,5 @@
+ 		    if (cdi.state & CDROM_STATE_PAUSE) {
+-			    start_addr.second += pauseSkipInterval; 
++			    start_addr.second += app_data.pauseSkipInterval; 
+ 		    } else if (cdi.state & CDROM_STATE_PLAY) {
+-			    start_addr.second += scanSkipInterval; 
++			    start_addr.second += app_data.scanSkipInterval; 
+ 		    }
+@@ -362,5 +364,5 @@
+ 	    if (cdi.state & CDROM_STATE_PAUSE) {
+-		start_addr.second += pauseSkipInterval; 
++		start_addr.second += app_data.pauseSkipInterval; 
+ 	    } else if (cdi.state & CDROM_STATE_PLAY) {
+-		start_addr.second += scanSkipInterval; 
++		start_addr.second += app_data.scanSkipInterval; 
+ 	    }
+@@ -415,3 +417,3 @@
+ 		scanivid = XtAppAddTimeOut(appc, 
+-			(int)(pausePauseInterval * 1000.0), 
++			(int)(app_data.pausePauseInterval * 1000.0), 
+ 			scan_update, NULL);
+@@ -559,3 +561,3 @@
+ 	        ivid = XtAppAddTimeOut(appc, 
+-			(int)(scanPauseInterval * 1000.0), 
++			(int)(app_data.scanPauseInterval * 1000.0), 
+ 			scan_update, NULL);
+@@ -576,3 +578,3 @@
+ 			ivid = XtAppAddTimeOut(appc,
+-				(int)(scanPauseInterval * 1000.0),
++				(int)(app_data.scanPauseInterval * 1000.0),
+ 				scan_update, NULL);
+@@ -664,3 +666,3 @@
+ 	        ivid = XtAppAddTimeOut(appc, 
+-			(int)(scanPauseInterval * 1000.0), 
++			(int)(app_data.scanPauseInterval * 1000.0), 
+ 			update_track, NULL);
+@@ -681,3 +683,3 @@
+ 			ivid = XtAppAddTimeOut(appc,
+-				(int)(scanPauseInterval * 1000.0),
++				(int)(app_data.scanPauseInterval * 1000.0),
+ 				update_track, NULL);
diff --git a/audio/xcdplayer/patches/patch-aj b/audio/xcdplayer/patches/patch-aj
new file mode 100644
index 00000000000..76bd3124b8d
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-aj
@@ -0,0 +1,70 @@
+$NetBSD: patch-aj,v 1.1 1998/08/23 06:49:29 garbled Exp $
+--- logo_setup.c.orig	Tue Jan 12 11:59:46 1993
++++ logo_setup.c	Thu Jul 23 00:08:28 1998
+@@ -30,2 +30,5 @@
+ # include "cdrom_globs.h"
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++# include "cdrom_freebsd.h"
++#endif
+ #ifdef sun
+@@ -45,2 +48,4 @@
+ 
++extern AppData app_data;
++
+ static Widget	track_button_widget;
+@@ -57,2 +62,10 @@
+ static int	vol;
++extern void     leds_label_setup();
++static void     cb_track_button();
++static void     cb_timer_button();
++static void     volume_jump_proc();
++static void     volume_scroll_proc();
++static void     popup_title_dialog();
++static void     popdown_title_dialog();
++
+ 
+@@ -62,10 +75,2 @@
+ {
+-	extern void	leds_label_setup();
+-	extern void	cb_track_button();
+-	extern void	cb_timer_button();
+-	extern void	volume_jump_proc();
+-	extern void	volume_scroll_proc();
+-	extern void	popup_title_dialog();
+-	extern void	popdown_title_dialog();
+-
+ 	Widget		version_label_widget;
+@@ -128,3 +133,3 @@
+ 
+-	if (display_timer == True)
++	if (app_data.display_timer == True) {
+ 		timer_button_widget = XtCreateManagedWidget("timerButton",
+@@ -134,5 +139,6 @@
+ 
+-	XtAddCallback(timer_button_widget, XtNcallback, cb_timer_button, 0);
+-
+-	timer_button_update();
++		XtAddCallback(timer_button_widget, XtNcallback, 
++			     cb_timer_button, 0);
++		timer_button_update();
++	}
+ 	thumb_pixmap = XCreateBitmapFromData(XtDisplay(logo_form_widget),
+@@ -173,6 +179,6 @@
+ 	if ((vol = cdrom_get_volume()) == 0) {
+-		vol = (int) ((MAXVOL - volbase) * 0.75) + volbase;
++		vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase;
+ 	}
+ #else
+-	vol = (int) ((MAXVOL - volbase) * 0.75) + volbase;
++	vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase;
+ #endif
+@@ -358,3 +364,3 @@
+ 
+-	if (display_timer == False)
++	if (app_data.display_timer == False)
+ 		return;
+@@ -415,3 +421,3 @@
+ 	vol = (*(float *) percent) * MAXVOL;
+-	vol = (vol * volpcent) + volbase;
++	vol = (vol * app_data.volpcent) + app_data.volbase;
+ #endif
diff --git a/audio/xcdplayer/patches/patch-ak b/audio/xcdplayer/patches/patch-ak
new file mode 100644
index 00000000000..09e7fef4efe
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-ak
@@ -0,0 +1,65 @@
+$NetBSD: patch-ak,v 1.1 1998/08/23 06:49:30 garbled Exp $
+*** program.c	Tue Jan 12 10:59:49 1993
+--- /users/swallace/work/xcdplayer/program.c	Wed Feb 23 07:36:55 1994
+***************
+*** 27,36 ****
+  
+  # include <stdio.h>
+  # include <string.h>
+! # include <malloc.h>
+  
+  # include "debug.h"
+  # include "cdrom_globs.h"
+  #ifdef sun
+  # include "cdrom_sun.h"
+  #endif
+--- 27,39 ----
+  
+  # include <stdio.h>
+  # include <string.h>
+! # include <sys/malloc.h>
+  
+  # include "debug.h"
+  # include "cdrom_globs.h"
++ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++ # include "cdrom_freebsd.h"
++ #endif
+  #ifdef sun
+  # include "cdrom_sun.h"
+  #endif
+***************
+*** 52,57 ****
+--- 55,69 ----
+  static	Boolean	adding_to_new_track = False;
+  static	struct	prognode *current_node = NULL;
+  
++ static	void    cb_move_program_ptr();
++ static	void    cb_clear_program();
++ static	void    cb_cancel_program();
++ static	void    cb_save_program();
++ static	void    cb_trackbuttons();
++ static	void    cb_add_10();
++ static	void    cb_new_track();
++ static	void    cb_program_all();
++ 
+  void
+  program_form_setup (parent_widget)
+  	Widget	parent_widget;
+***************
+*** 66,80 ****
+  	Widget	cancel_button;
+  	Widget	save_button;
+  	Widget	all_button;
+- 
+- 	extern	void	cb_move_program_ptr();
+- 	extern	void	cb_clear_program();
+- 	extern	void	cb_cancel_program();
+- 	extern	void	cb_save_program();
+- 	extern	void	cb_trackbuttons();
+- 	extern	void	cb_add_10();
+- 	extern	void	cb_new_track();
+- 	extern	void	cb_program_all();
+  
+  	/* 
+  	 * create program form as a non-managed widget, because this 
+--- 78,83 ----
diff --git a/audio/xcdplayer/patches/patch-al b/audio/xcdplayer/patches/patch-al
new file mode 100644
index 00000000000..a5370463ba0
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-al
@@ -0,0 +1,19 @@
+$NetBSD: patch-al,v 1.1 1998/08/23 06:49:30 garbled Exp $
+--- shuffle.c.orig	Tue Jan 12 11:59:38 1993
++++ shuffle.c	Wed Jul 22 21:53:16 1998
+@@ -20,2 +20,5 @@
+ # include "cdrom_globs.h"
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++# include "cdrom_freebsd.h"
++#endif
+ #ifdef sun
+@@ -31,2 +34,4 @@
+ 
++extern AppData app_data;
++
+ void
+@@ -99,3 +104,3 @@
+ 
+-	if (debug == True) {
++	if (app_data.debug == True) {
+ 		debug_printf(1, "shuffle_setup: ");
diff --git a/audio/xcdplayer/patches/patch-am b/audio/xcdplayer/patches/patch-am
new file mode 100644
index 00000000000..0029a4bf86b
--- /dev/null
+++ b/audio/xcdplayer/patches/patch-am
@@ -0,0 +1,33 @@
+$NetBSD: patch-am,v 1.1 1998/08/23 06:49:30 garbled Exp $
+--- /dev/null	Wed Jul 22 17:15:57 1998
++++ app.h	Wed Jul 22 21:48:17 1998
+@@ -0,0 +1,29 @@
++/*
++ * Copyright (C) 1990 Regents of the University of California.
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and
++ * its documentation for any purpose is hereby granted without fee,
++ * provided that the above copyright notice appear in all copies and that
++ * both that copyright notice and this permission notice appear in
++ * supporting documentation, and that the name of the University of
++ * California not be used in advertising or publicity pertaining to
++ * distribution of the software without specific, written prior
++ * permission.  the University of California makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ */
++
++typedef struct {
++  char            *file;
++  char            *device;
++  Boolean         debug;
++  Boolean         display_timer;
++  float           volbase;
++  float           volpcent;
++  int             replayThreshold;
++  int             pauseSkipInterval;
++  int             scanSkipInterval;
++  float           scanPauseInterval;
++  float           pausePauseInterval;
++  char            *cdInfoDir;
++} AppData;