Convert patches to unified output format.

14 files changed, 741 insertions, 664 deletions

diff --git a/audio/xcdplayer/files/patch-sum b/audio/xcdplayer/files/patch-sum
index 9967fdced4c..cfabcf04608 100644
--- a/audio/xcdplayer/files/patch-sum
+++ b/audio/xcdplayer/files/patch-sum
@@ -1,15 +1,15 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:16 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/06 16:36:34 tron Exp $
 
-MD5 (patch-aa) = f823649b840cbc2ecfdb47f42f857891
-MD5 (patch-ab) = be6b51b322fc896c59cbe6ae9c5cdc0e
-MD5 (patch-ac) = f41ec7c310b6706a2b6549ea2630d795
-MD5 (patch-ad) = d7caa7b4db5747d64030eb03ab891fd2
-MD5 (patch-ae) = 4b4b21f77892f75c4500584e7f96810a
-MD5 (patch-af) = f3acc7816dc95f64cd3dfa60bb8a0b0c
-MD5 (patch-ag) = 2bdf941710ff3a599cce875d9150fa47
-MD5 (patch-ah) = d46eba4fea8ad5f7dfdf17345477468d
-MD5 (patch-ai) = 0a1fd7cfe32c3e1ba5ededced579c383
-MD5 (patch-aj) = 92e58ce6e9046d431796e4cce079f77e
-MD5 (patch-ak) = 3bc2ec5e9cbb142f1d9772fb5b742b59
-MD5 (patch-al) = 2fa18dcc753e77532c0d2750042162ad
-MD5 (patch-am) = 3816d073283e116f70293c8cab2402b8
+MD5 (patch-aa) = 92380b7a67c0dd85f9b72bd65e5c6450
+MD5 (patch-ab) = 7be425583167cc0f31cc7b0b5aad93b2
+MD5 (patch-ac) = c636c26084514a3129e614dc5115db17
+MD5 (patch-ad) = 36329cf1ff9df2a116f53638365c3dd2
+MD5 (patch-ae) = b377f5809bed023cac34fb9a0dd7b9a3
+MD5 (patch-af) = fab2f772f6cee99907f81b3e423f8b88
+MD5 (patch-ag) = 082a010dd1e71ec807c9b9085ea81806
+MD5 (patch-ah) = 2c58a340a28aaee04398229a778ad16e
+MD5 (patch-ai) = b69b53e73ff293331cd1d7e4e44e2b6b
+MD5 (patch-aj) = b4c61e12c62882e6a25d897bf7a21824
+MD5 (patch-ak) = 9a6ce83f438646129ea8ecbe7645d322
+MD5 (patch-al) = f55223df452471aaaf3c730f258bea78
+MD5 (patch-am) = db9a265773609559b4ed24d8008fb768
diff --git a/audio/xcdplayer/patches/patch-aa b/audio/xcdplayer/patches/patch-aa
index c58d4d6ed99..043fbe73b20 100644
--- a/audio/xcdplayer/patches/patch-aa
+++ b/audio/xcdplayer/patches/patch-aa
@@ -1,13 +1,16 @@
-$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 @@
+$NetBSD
+
+--- Imakefile.orig	Tue Jan 12 19:59:29 1993
++++ Imakefile	Mon Sep  6 18:22:06 1999
+@@ -15,6 +15,11 @@
  
-+extern AppData app_data;
+ 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 
 +
- void
-@@ -68,3 +70,3 @@
- 		if (strcmp(argv[i], "-debug") == 0) {
--			debug = True;
-+			app_data.debug = True;
- 			break;
++           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-ab b/audio/xcdplayer/patches/patch-ab
index f7142706b6f..ef01782afc7 100644
--- a/audio/xcdplayer/patches/patch-ab
+++ b/audio/xcdplayer/patches/patch-ab
@@ -1,15 +1,91 @@
-$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;
+$NetBSD
+
+--- XCdplayer.ad.orig	Tue Jan 12 19:59:41 1993
++++ XCdplayer.ad	Mon Sep  6 18:22:06 1999
+@@ -19,11 +19,10 @@
+ 
+ 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.width:		110
+ XCdplayer*versionLabel.fromHoriz:	logoLabel
+ 
+ ! replayThreshold is the number of seconds that must be played before the
+@@ -33,16 +32,16 @@
+ 
+ ! scanSkipInterval is the number of seconds skipped at each fast-forward or
+ ! reverse.
+-XCdplayer*scanSkipInterval:		3
++XCdplayer*scanSkipInterval:		5
+ ! pauseSkipInterval is the number of seconds skipped at each fast-forward or
+ ! reverse if the CD is paused.
+-XCdplayer*pauseSkipInterval:		15
++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.062
++XCdplayer*scanPauseInterval:		0.25
+ ! pausePauseInterval does the same thing when the disc is paused.
+ XCdplayer*pausePauseInterval:		0.5
+ 
+@@ -56,7 +55,7 @@
+ XCdplayer*Viewport.allowHoriz:		True
+ XCdplayer*Viewport.useBottom:		True
+ XCdplayer*Viewport.forceBars:		False
+-XCdplayer*Viewport.width:		188
++XCdplayer*Viewport.width:		160
+ XCdplayer*Viewport.height:		30
+ XCdplayer*Viewport*thickness:		8
+ XCdplayer*Viewport.resizable:		False
+@@ -88,11 +87,11 @@
+ XCdplayer*Toggle.right:			ChainLeft
+ XCdplayer*Toggle.background:		Ivory
+ 
+-XCdplayer*ledsLabel.horizDistance:	20
++XCdplayer*ledsLabel.horizDistance:	4
+ XCdplayer*ledsLabel.fromVert:		versionLabel
+ XCdplayer*ledsLabel.fromHoriz:		logoLabel
+ 
+-XCdplayer*trackButton.horizDistance:	8
++XCdplayer*trackButton.horizDistance:	4
+ XCdplayer*trackButton.fromVert:		versionLabel
+ XCdplayer*trackButton.fromHoriz:	ledsLabel
+ XCdplayer*trackButton.borderWidth:	2
+@@ -108,27 +107,22 @@
+ XCdplayer*timerButton.left:		ChainRight
+ XCdplayer*timerButton.right:		ChainRight
+ 
+-XCdplayer*volumeScrollbar.horizDistance:8
++XCdplayer*volumeScrollbar.horizDistance:4
+ XCdplayer*volumeScrollbar.fromHoriz:	logoLabel
+ XCdplayer*volumeScrollbar.fromVert:	trackButton
+ XCdplayer*volumeScrollbar.orientation:	horizontal
+-XCdplayer*volumeScrollbar.length:	120
++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*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
+ 
diff --git a/audio/xcdplayer/patches/patch-ac b/audio/xcdplayer/patches/patch-ac
index 208ec2ac6ac..1e982410fea 100644
--- a/audio/xcdplayer/patches/patch-ac
+++ b/audio/xcdplayer/patches/patch-ac
@@ -1,26 +1,34 @@
-$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"
+$NetBSD
+
+--- app.h.orig	Mon Sep  6 18:22:07 1999
++++ app.h	Mon Sep  6 18:22:07 1999
+@@ -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.
++ */
 +
- 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;
++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;
diff --git a/audio/xcdplayer/patches/patch-ad b/audio/xcdplayer/patches/patch-ad
index d7698affe26..99bcf4a7e6a 100644
--- a/audio/xcdplayer/patches/patch-ad
+++ b/audio/xcdplayer/patches/patch-ad
@@ -1,84 +1,64 @@
-$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;
+$NetBSD
+
+--- button_setup.c.orig	Tue Jan 12 19:59:47 1993
++++ button_setup.c	Mon Sep  6 18:22:06 1999
+@@ -20,6 +20,9 @@
+ # include <X11/Xaw/Toggle.h>
  
-@@ -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 @@
+ # include "cdrom_globs.h"
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++# include "cdrom_freebsd.h"
++#endif
+ #ifdef sun
+ # include "cdrom_sun.h"
+ #endif
+@@ -44,6 +47,23 @@
+ # include "ff.xbm"
+ # include "pgm.xbm"
  
--	(void) XtGetApplicationResources(top_shell, (caddr_t) NULL,
-+	(void) XtGetApplicationResources(top_shell, (caddr_t) &app_data,
- 					 resources, XtNumber(resources),
-@@ -129,4 +119,4 @@
++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();
  
--	if ((cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL))
--	    cdInfoDir = strdup(s);
-+	if ((app_data.cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL))
-+	    app_data.cdInfoDir = strdup(s);
+ static Widget	buttons_form_widget;
+ static Widget	play_button_widget;
+@@ -71,25 +91,6 @@
+ 	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,
diff --git a/audio/xcdplayer/patches/patch-ae b/audio/xcdplayer/patches/patch-ae
index 4cca78807ac..3cf9810da68 100644
--- a/audio/xcdplayer/patches/patch-ae
+++ b/audio/xcdplayer/patches/patch-ae
@@ -1,156 +1,32 @@
-$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
-  
+$NetBSD
+
+--- cdrom_callb.c.orig	Tue Jan 12 19:59:48 1993
++++ cdrom_callb.c	Mon Sep  6 18:22:06 1999
+@@ -22,6 +22,9 @@
+ 
+ # 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,6 +32,8 @@
+ # include "cdrom_sgi.h"
+ #endif
+ 
++extern AppData app_data;
++
+ void		cdrom_new_disc();
+ 
+ /*
+@@ -287,7 +292,7 @@
+ 	 * if playing less than replayThreshold seconds, back up to 
+ 	 * previous track; otherwise start at beginning of current track:
+ 	 */
+-	if (cdi.duration < replayThreshold)
++	if (cdi.duration < app_data.replayThreshold)
+ 	{
+ 	    if ((cdi.program != NULL) &&
+ 	    	 (cdi.state & CDROM_STATE_PLAY) &&
diff --git a/audio/xcdplayer/patches/patch-af b/audio/xcdplayer/patches/patch-af
index 7a834cfef5f..b29ba614a9b 100644
--- a/audio/xcdplayer/patches/patch-af
+++ b/audio/xcdplayer/patches/patch-af
@@ -1,17 +1,29 @@
-$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 
+$NetBSD
+
+--- cdrom_globs.h.orig	Tue Jan 12 19:59:31 1993
++++ cdrom_globs.h	Mon Sep  6 18:22:06 1999
+@@ -99,22 +99,10 @@
+ extern int		cdrom_open();
+ extern int		cdrom_init();
+ 
+-
+-extern Boolean		display_timer;
+-
+ extern XtAppContext	appc;
+ 
+-extern char		*file;
+-extern char		*device;
++#include "app.h"
++
+ extern char             info_filename[];
+ extern char     	*disc_title;
+ 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-ag b/audio/xcdplayer/patches/patch-ag
index 1ed2f044052..bd6a0126d62 100644
--- a/audio/xcdplayer/patches/patch-ag
+++ b/audio/xcdplayer/patches/patch-ag
@@ -1,69 +1,24 @@
-$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 ----
+$NetBSD
+
+--- debug.c.orig	Tue Jan 12 19:59:35 1993
++++ debug.c	Mon Sep  6 18:22:06 1999
+@@ -20,6 +20,10 @@
+ 
+ # include "debug.h"
+ 
++#include "app.h"
++
++extern AppData app_data;
++
+ /* VARARGS */
+ void
+ debug_printf(va_alist)
+@@ -33,7 +37,7 @@
+ 	/*
+ 	 * first arg is whether or not to print.
+ 	 */
+-	if ((va_arg(args, int) == 0) || (debug == False))
++	if ((va_arg(args, int) == 0) || (app_data.debug == False))
+ 		return;
+ 
+ 	fmt = va_arg(args, char *);
diff --git a/audio/xcdplayer/patches/patch-ah b/audio/xcdplayer/patches/patch-ah
index 4b61cdfe6d1..8c4c5e36df5 100644
--- a/audio/xcdplayer/patches/patch-ah
+++ b/audio/xcdplayer/patches/patch-ah
@@ -1,19 +1,176 @@
-$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 @@
+$NetBSD
+
+--- internals.c.orig	Tue Jan 12 19:59:45 1993
++++ internals.c	Mon Sep  6 18:22:06 1999
+@@ -22,6 +22,9 @@
+ 
+ # include "debug.h"
  # include "cdrom_globs.h"
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +# include "cdrom_freebsd.h"
 +#endif
  #ifdef sun
-@@ -31,2 +34,4 @@
+ # include "cdrom_sun.h"
+ #endif
+@@ -29,13 +32,14 @@
+ # include "cdrom_sgi.h"
+ #endif
+ 
+-
++static void     scan_update();
+ static XtIntervalId	ivid			= -1;
+ static XtIntervalId	scanivid		= -1;
+ static XtIntervalId	stativid		= -1;
+ static unsigned int	timer_mod		= 1000 / TIMER_PERIOD;
+ unsigned int		timer_fsecs;
  
 +extern AppData app_data;
-+
- void		cdrom_new_disc();
-@@ -289,3 +294,3 @@
- 	 */
--	if (cdi.duration < replayThreshold)
-+	if (cdi.duration < app_data.replayThreshold)
+ 
+ int
+ cdrom_get_curtime() {
+@@ -170,7 +174,6 @@
+ 	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");
+@@ -196,11 +199,11 @@
+ 	    if (((cdi.state & CDROM_STATE_PLAY) && 
+ 		 ((track_start.minute * 60) + track_start.second) >=
+ 		 ((start_addr.minute * 60) + start_addr.second - 
+-		  scanSkipInterval)) ||
++		  app_data.scanSkipInterval)) ||
+ 		((cdi.state & CDROM_STATE_PAUSE) &&
+ 		 ((track_start.minute * 60) + track_start.second) >=
+ 		 ((start_addr.minute * 60) + start_addr.second -
+-		  pauseSkipInterval)))
++		  app_data.pauseSkipInterval)))
+ 	    {
+ 	        start_addr = track_start;
+ 	        start_addr.second++; /* guarantee we never back up too far */
+@@ -208,9 +211,9 @@
+ 	    else
+ 	    {
+ 		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; 
+ 		}
+ 	        if ((char) start_addr.second < 0)
+ 	        {
+@@ -223,9 +226,9 @@
+ 	else /* normal case */
+ 	{
+ 		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; 
+ 		}
+ 		if ((char) start_addr.second < 0)
+ 		{
+@@ -274,7 +277,7 @@
+ 	{
+ 	    if (scanivid == -1)
+ 		scanivid = XtAppAddTimeOut(appc, 
+-			(int)(pausePauseInterval * 1000.0), 
++			(int)(app_data.pausePauseInterval * 1000.0), 
+ 			scan_update, NULL);
+ 
+ 	    cdi.state &= ~CDROM_STATE_PAUSE;	/* allow timer to change */
+@@ -304,7 +307,6 @@
+         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");
+@@ -332,11 +334,11 @@
+ 	    if (((cdi.state & CDROM_STATE_PLAY) && 
+ 		 ((next_start.minute * 60) + next_start.second) <=
+ 		 ((start_addr.minute * 60) + start_addr.second +
+-		  scanSkipInterval)) ||
++		  app_data.scanSkipInterval)) ||
+ 		((cdi.state & CDROM_STATE_PAUSE) &&
+ 		 ((next_start.minute * 60) + next_start.second) <=
+ 		 ((start_addr.minute * 60) + start_addr.second +
+-		  pauseSkipInterval)))
++		  app_data.pauseSkipInterval)))
+ 	    {
+ 	    
+ 	        /* start at end of current track */
+@@ -346,9 +348,9 @@
+ 	    else
+ 	    {
+ 		    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; 
+ 		    }
+ 		    if (start_addr.second >= 60)
+ 		    {
+@@ -360,9 +362,9 @@
+ 	else
+ 	{
+ 	    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; 
+ 	    }
+ 	    if (start_addr.second >= 60)
+ 	    {
+@@ -413,7 +415,7 @@
  	{
+ 	    if (scanivid == -1)
+ 		scanivid = XtAppAddTimeOut(appc, 
+-			(int)(pausePauseInterval * 1000.0), 
++			(int)(app_data.pausePauseInterval * 1000.0), 
+ 			scan_update, NULL);
+ 
+ 	    cdi.state &= ~CDROM_STATE_PAUSE;	/* allow timer to change */
+@@ -557,7 +559,7 @@
+ 				 cdi.state &= ~CDROM_STATE_STOP;
+ 		}
+ 	        ivid = XtAppAddTimeOut(appc, 
+-			(int)(scanPauseInterval * 1000.0), 
++			(int)(app_data.scanPauseInterval * 1000.0), 
+ 			scan_update, NULL);
+ 	}
+ 	else
+@@ -574,7 +576,7 @@
+ 			}
+ 
+ 			ivid = XtAppAddTimeOut(appc,
+-				(int)(scanPauseInterval * 1000.0),
++				(int)(app_data.scanPauseInterval * 1000.0),
+ 				scan_update, NULL);
+ 		}
+ 		else if (scanivid != -1) {
+@@ -662,7 +664,7 @@
+ 				 cdi.state &= ~CDROM_STATE_STOP;
+ 		}
+ 	        ivid = XtAppAddTimeOut(appc, 
+-			(int)(scanPauseInterval * 1000.0), 
++			(int)(app_data.scanPauseInterval * 1000.0), 
+ 			update_track, NULL);
+ 	}
+ 	else
+@@ -679,7 +681,7 @@
+ 			}
+ 
+ 			ivid = XtAppAddTimeOut(appc,
+-				(int)(scanPauseInterval * 1000.0),
++				(int)(app_data.scanPauseInterval * 1000.0),
+ 				update_track, NULL);
+ 		}
+ 		else
diff --git a/audio/xcdplayer/patches/patch-ai b/audio/xcdplayer/patches/patch-ai
index b0008acc610..57ec56c0448 100644
--- a/audio/xcdplayer/patches/patch-ai
+++ b/audio/xcdplayer/patches/patch-ai
@@ -1,108 +1,103 @@
-$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 @@
+$NetBSD
+
+--- logo_setup.c.orig	Tue Jan 12 19:59:46 1993
++++ logo_setup.c	Mon Sep  6 18:22:07 1999
+@@ -28,6 +28,9 @@
+ # include <stdio.h>
+ 
  # include "cdrom_globs.h"
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +# include "cdrom_freebsd.h"
 +#endif
  #ifdef sun
-@@ -31,3 +34,3 @@
+ # include "cdrom_sun.h"
+ #endif
+@@ -43,6 +46,8 @@
  
--
-+static void     scan_update();
- static XtIntervalId	ivid			= -1;
-@@ -38,2 +41,3 @@
+ void	Done();
  
 +extern AppData app_data;
++
+ static Widget	track_button_widget;
+ static Widget	timer_button_widget;
+ static Widget	volume_scroll_widget;
+@@ -55,19 +60,19 @@
+ 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;
+ {
+-	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];
+ 
+@@ -126,15 +131,16 @@
+ 
+ 	track_button_update();
+ 
+-	if (display_timer == True)
++	if (app_data.display_timer == True) {
+ 		timer_button_widget = XtCreateManagedWidget("timerButton",
+ 						    	   toggleWidgetClass,
+ 							   logo_form_widget,
+ 							   (ArgList) NULL, 0);
+ 
+-	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),
+ 						  rootwin(logo_form_widget),
+ 						  thumb_bits,
+@@ -171,10 +177,10 @@
+ 
+ #ifdef sgi
+ 	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
+ 	cdrom_volume(vol, vol); 
+ #ifdef sgi
+@@ -356,7 +362,7 @@
+ 	Arg		args[1];
+ 	Boolean		state;
  
-@@ -172,3 +176,2 @@
- 	int		curtrack;
--	extern void 	scan_update();
+-	if (display_timer == False)
++	if (app_data.display_timer == False)
+ 		return;
  
-@@ -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();
+ 	    if ((cdi.state & CDROM_STATE_PAUSE) == 0)
+@@ -413,7 +419,7 @@
+ 	vol = PCT2VAL(*(float *)percent);
+ #else
+ 	vol = (*(float *) percent) * MAXVOL;
+-	vol = (vol * volpcent) + volbase;
++	vol = (vol * app_data.volpcent) + app_data.volbase;
+ #endif
  
-@@ -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);
+ 	if (vol > MAXVOL)
diff --git a/audio/xcdplayer/patches/patch-aj b/audio/xcdplayer/patches/patch-aj
index 76bd3124b8d..94671899fd6 100644
--- a/audio/xcdplayer/patches/patch-aj
+++ b/audio/xcdplayer/patches/patch-aj
@@ -1,70 +1,22 @@
-$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 @@
+$NetBSD
+
+--- main.c.orig	Tue Jan 12 19:59:36 1993
++++ main.c	Mon Sep  6 18:22:06 1999
+@@ -23,6 +23,8 @@
+ 
+ Widget		top_form;
  
 +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;
+ void
+ main(argc, argv)
+ 	int		argc;
+@@ -66,7 +68,7 @@
+ 	/* ugly hack */
+ 	for (i = 1; i < argc; i++) {
+ 		if (strcmp(argv[i], "-debug") == 0) {
+-			debug = True;
++			app_data.debug = True;
+ 			break;
+ 		}
  	}
- #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
index 09e7fef4efe..daac3e2f800 100644
--- a/audio/xcdplayer/patches/patch-ak
+++ b/audio/xcdplayer/patches/patch-ak
@@ -1,65 +1,51 @@
-$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 ----
+$NetBSD
+
+--- program.c.orig	Tue Jan 12 19:59:49 1993
++++ program.c	Mon Sep  6 18:22:07 1999
+@@ -27,10 +27,13 @@
+ 
+ # include <stdio.h>
+ # include <string.h>
+-# include <malloc.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,6 +55,15 @@
+ 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,15 +78,6 @@
+ 	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 
diff --git a/audio/xcdplayer/patches/patch-al b/audio/xcdplayer/patches/patch-al
index a5370463ba0..d35025ca82e 100644
--- a/audio/xcdplayer/patches/patch-al
+++ b/audio/xcdplayer/patches/patch-al
@@ -1,19 +1,32 @@
-$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 @@
+$NetBSD
+
+--- shuffle.c.orig	Tue Jan 12 19:59:38 1993
++++ shuffle.c	Mon Sep  6 18:22:07 1999
+@@ -18,6 +18,9 @@
+ 
+ # include "debug.h"
  # include "cdrom_globs.h"
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +# include "cdrom_freebsd.h"
 +#endif
  #ifdef sun
-@@ -31,2 +34,4 @@
+ # include "cdrom_sun.h"
+ #endif
+@@ -29,6 +32,8 @@
+ 
+ static unsigned char	*random_tracks;
  
 +extern AppData app_data;
 +
  void
-@@ -99,3 +104,3 @@
+ shuffle_setup() {
+ 	extern char	*malloc();
+@@ -97,7 +102,7 @@
+ 		random_tracks[i] = try;
+ 	}
  
 -	if (debug == True) {
 +	if (app_data.debug == True) {
  		debug_printf(1, "shuffle_setup: ");
+ 		for (i = 0; i < cdi.ntracks; i++)
+ 			debug_printf(1, "%d ", random_tracks[i]);
diff --git a/audio/xcdplayer/patches/patch-am b/audio/xcdplayer/patches/patch-am
index 0029a4bf86b..0320aa644d1 100644
--- a/audio/xcdplayer/patches/patch-am
+++ b/audio/xcdplayer/patches/patch-am
@@ -1,33 +1,97 @@
-$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.
-+ */
+$NetBSD
+
+--- top_setup.c.orig	Tue Jan 12 19:59:40 1993
++++ top_setup.c	Mon Sep  6 18:22:06 1999
+@@ -26,18 +26,8 @@
+ # include "logo.xbm"
+ 
+ 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;
 +
-+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;
++AppData app_data;
+ 
+ extern char	*getenv();
+ 
+@@ -55,36 +45,36 @@
+ };
+ 
+ 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 },
+ };
+ 
+ Widget
+@@ -123,12 +113,12 @@
+ 	XtSetValues(top_shell, &arg, 1);
+ 	
+ 
+-	(void) XtGetApplicationResources(top_shell, (caddr_t) NULL,
++	(void) XtGetApplicationResources(top_shell, (caddr_t) &app_data,
+ 					 resources, XtNumber(resources),
+ 					 (ArgList) NULL, 0);
+ 
+-	if ((cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL))
+-	    cdInfoDir = strdup(s);
++	if ((app_data.cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL))
++	    app_data.cdInfoDir = strdup(s);
+ 
+ 	top_form_widget = XtCreateWidget("mainForm", formWidgetClass,
+ 						 top_shell,