Upgrade to version 1.4.2.

15 files changed, 8 insertions, 1076 deletions

diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index 25f19723e2ab..c94a129fc5ab 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cd-write
-PORTVERSION=	1.4.1
-PORTREVISION=	2
+PORTVERSION=	1.4.2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jmz
@@ -27,11 +26,13 @@ IGNORE=		"FreeBSD 3.X or greater is required to support this port"
 .endif
 
 pre-build:
-	@cd ${WRKSRC}; ${MV} Makefile Makefile~; \
-		${SED} -e s:/usr/local:${PREFIX}:g -e s/CFL/CXXFL/ <Makefile~ >Makefile;\
-		${ECHO_CMD} all: cd-write >> Makefile
+	@cd ${WRKSRC}; ${ECHO_CMD} all: cd-write >> Makefile
 	@cd ${WRKSRC}/c++tk; ${MV} Makefile Makefile~; \
-		${SED} -e s:/usr/local:${PREFIX}:g <Makefile~ >Makefile
+		${SED} -e s:/usr/local:${PREFIX}:g \
+		-e s:/usr/X11R6:${X11BASE}:g <Makefile~ >Makefile
+	@cd ${WRKSRC}; ${MV} Makefile Makefile~; \
+		${SED} -e s:/usr/local:${PREFIX}:g \
+		-e s:/usr/X11R6:${X11BASE}:g <Makefile~ >Makefile
 
 post-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/sysutils/cd-write/distinfo b/sysutils/cd-write/distinfo
index f4f70fac569b..2e917cf925da 100644
--- a/sysutils/cd-write/distinfo
+++ b/sysutils/cd-write/distinfo
@@ -1 +1 @@
-MD5 (cd-write-1.4.1.tar.gz) = a4617ad27201a29a2234cd7ab483448a
+MD5 (cd-write-1.4.2.tar.gz) = afb154d993292769f005cf2be669b799
diff --git a/sysutils/cd-write/files/patch-1 b/sysutils/cd-write/files/patch-1
deleted file mode 100644
index 7c6c45d63059..000000000000
--- a/sysutils/cd-write/files/patch-1
+++ /dev/null
@@ -1,115 +0,0 @@
---- c++tk/tk.tcl.orig	Thu Sep 25 03:43:23 1997
-+++ c++tk/tk.tcl	Mon May  3 23:16:51 1999
-@@ -3,7 +3,7 @@
- # Initialization script normally executed in the interpreter for each
- # Tk-based application.  Arranges class bindings for widgets.
- #
--# SCCS: @(#) tk.tcl 1.87 96/09/30 09:28:02
-+# RCS: @(#) $Id: patch-1,v 1.1 1999/05/03 22:49:45 jmz Exp $
- #
- # Copyright (c) 1992-1994 The Regents of the University of California.
- # Copyright (c) 1994-1996 Sun Microsystems, Inc.
-@@ -13,8 +13,8 @@
- 
- # Insist on running with compatible versions of Tcl and Tk.
- 
--package require -exact Tk 4.2
--package require -exact Tcl 7.6
-+package require -exact Tk 8.2
-+package require -exact Tcl 8.2
- 
- 
- # Turn off strict Motif look and feel as a default.
-@@ -32,13 +32,23 @@
- # screen -		The name of the new screen.
- 
- proc tkScreenChanged screen {
--    set disp [file rootname $screen]
-+    set x [string last . $screen]
-+    if {$x > 0} {
-+	set disp [string range $screen 0 [expr {$x - 1}]]
-+    } else {
-+	set disp $screen
-+    }
-+
-     uplevel #0 upvar #0 tkPriv.$disp tkPriv
-     global tkPriv
--    if [info exists tkPriv] {
-+    global tcl_platform
-+
-+    if {[info exists tkPriv]} {
- 	set tkPriv(screen) $screen
- 	return
-     }
-+    set tkPriv(activeMenu) {}
-+    set tkPriv(activeItem) {}
-     set tkPriv(afterId) {}
-     set tkPriv(buttons) 0
-     set tkPriv(buttonWindow) {}
-@@ -48,14 +58,17 @@
-     set tkPriv(initPos) {}
-     set tkPriv(inMenubutton) {}
-     set tkPriv(listboxPrev) {}
-+    set tkPriv(menuBar) {}
-     set tkPriv(mouseMoved) 0
-     set tkPriv(oldGrab) {}
-     set tkPriv(popup) {}
-     set tkPriv(postedMb) {}
-     set tkPriv(pressX) 0
-     set tkPriv(pressY) 0
-+    set tkPriv(prevPos) 0
-     set tkPriv(screen) $screen
-     set tkPriv(selectMode) char
-+    set tkPriv(tearoff) 1
-     set tkPriv(window) {}
- }
- 
-@@ -76,7 +89,7 @@
- proc tkEventMotifBindings {n1 dummy dummy} {
-     upvar $n1 name
-     
--    if $name {
-+    if {$name} {
- 	set op delete
-     } else {
- 	set op add
-@@ -94,15 +107,17 @@
- 	event add <<Cut>> <Control-Key-x> <Key-F20> 
- 	event add <<Copy>> <Control-Key-c> <Key-F16>
- 	event add <<Paste>> <Control-Key-v> <Key-F18>
-+	event add <<PasteSelection>> <ButtonRelease-2>
- 	trace variable tk_strictMotif w tkEventMotifBindings
- 	set tk_strictMotif $tk_strictMotif
- 
-+
- # ----------------------------------------------------------------------
- # Default bindings for keyboard traversal.
- # ----------------------------------------------------------------------
- 
--bind all <Tab> {focus [tk_focusNext %W]}
--bind all <Shift-Tab> {focus [tk_focusPrev %W]}
-+bind all <Tab> {tkTabToWindow [tk_focusNext %W]}
-+bind all <Shift-Tab> {tkTabToWindow [tk_focusPrev %W]}
- 
- # tkCancelRepeat --
- # This procedure is invoked to cancel an auto-repeat action described
-@@ -117,4 +132,19 @@
-     global tkPriv
-     after cancel $tkPriv(afterId)
-     set tkPriv(afterId) {}
-+}
-+
-+# tkTabToWindow --
-+# This procedure moves the focus to the given widget.  If the widget
-+# is an entry, it selects the entire contents of the widget.
-+#
-+# Arguments:
-+# w - Window to which focus should be set.
-+
-+proc tkTabToWindow {w} {
-+    if {"[winfo class $w]" == "Entry"} {
-+	$w select range 0 end
-+	$w icur end
-+    }
-+    focus $w
- }
diff --git a/sysutils/cd-write/files/patch-2 b/sysutils/cd-write/files/patch-2
deleted file mode 100644
index 0551f43a6a5d..000000000000
--- a/sysutils/cd-write/files/patch-2
+++ /dev/null
@@ -1,70 +0,0 @@
---- copy.cc.orig	Thu Jan 21 14:19:42 1999
-+++ copy.cc	Wed Oct 15 15:47:58 2003
-@@ -40,8 +40,8 @@
- #include "cd-write.h"
- #include "copy.h"
- 
--static char *help_copy = "{
--
-+static char *help_copy = "{\n\
-+\n\
- }";
- 
- static struct dev_struct dev[] = {
-@@ -397,7 +397,7 @@
-     hlist.subwidget ("hlist", "delete all");
-     for (i = 0; t[i].track != 0xaa; i++) {
- 	state = (t[i].type & T_AUDIO && !ops->read_audio_blocks) ? 
--	    "disabled" : "normal";
-+	    (char *)"disabled" : (char *)"normal";
- 	sprintf (s, "add %d -itemtype imagetext -image %s -state %s", i, 
- 		 t[i].type & T_AUDIO ? (t[i].type & T_PREEMP ? "note_p" : "note") : "data",
- 		 state);
-@@ -467,12 +467,12 @@
-     label = TkLabel (".copy.label -text { } -bd 2 -width 25 -height 1 -relief sunken");
-     TkPack (".copy.label", "-side top -pady 8 -fill x -expand 1");
-     
--    hlist = tixScrolledHList (".copy.f", "-relief flat -bd 2 -options {
--                    hlist.columns 3
--                    hlist.gap 0
--                    hlist.selectMode extended
--                    hlist.header false
--                    hlist.width 40 hlist.height 15
-+    hlist = tixScrolledHList (".copy.f", "-relief flat -bd 2 -options {\n\
-+                    hlist.columns 3\n\
-+                    hlist.gap 0\n\
-+                    hlist.selectMode extended\n\
-+                    hlist.header false\n\
-+                    hlist.width 40 hlist.height 15\n\
-              }");
-     TkPack (".copy.f" , "-side top -pady 10");
-     hlist.subwidget ("hlist")->command (dbclick);
-@@ -498,8 +498,8 @@
- 
-     TkFrame (".copy.d");
-     E_out = tixLabelEntry (".copy.d.e", "-label {Destination directory:} \
--            -labelside top -options {
--	    entry.width 35
-+            -labelside top -options {\n\
-+	    entry.width 35\n\
- 	    label.anchor w }");
-     if (!*dir)
- 	getcwd (dir, 1024);
-@@ -511,12 +511,12 @@
-     TkPack (".copy.d", "-side top -pady 2m -fill x");
- 
-     E_prefix = tixLabelEntry (".copy.p", "-label {file prefix: } \
--            -labelside left -options {
--	    entry.width 20
-+            -labelside left -options {\n\
-+	    entry.width 20\n\
- 	    label.anchor w }");
--    balloon.bind (".copy.p -balloonmsg", "{File names will be 
--   <file prefix>_NN.data,
--   <file prefix>_NN.audio,
-+    balloon.bind (".copy.p -balloonmsg", "{File names will be \n\
-+   <file prefix>_NN.data,\n\
-+   <file prefix>_NN.audio,\n\
- or <file prefix>_NN.audio+}");
-     E_prefix.subwidget ("entry insert 0", prefix);
-     TkPack (".copy.p", "-side top -pady 2m ");
diff --git a/sysutils/cd-write/files/patch-3 b/sysutils/cd-write/files/patch-3
deleted file mode 100644
index 00935fd3199a..000000000000
--- a/sysutils/cd-write/files/patch-3
+++ /dev/null
@@ -1,21 +0,0 @@
---- c++tk/Makefile.orig	Tue Nov 17 23:34:37 1998
-+++ c++tk/Makefile	Sat Apr 29 23:38:40 2000
-@@ -1,7 +1,7 @@
--CFLAGS=-g -O -I/usr/local/include/tcl8.0
-+CXXFLAGS=-g -O -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include -I${PREFIX}/include/tk8.2 -I${X11BASE}/include
- OBJS = c++tk.o
- 
--TK_LIB=	/usr/local/lib/tk8.0
-+TK_LIB=	${PREFIX}/lib/tk8.2
- TCL_SCRIPTS= bgerror button dialog entry focus listbox menu obsolete \
- 	 	optMenu palette text scale scrlbar tearoff 
- 
-@@ -9,7 +9,7 @@
- 
- .if defined(TIX)
- DEPS+= tix_scripts.h
--CFLAGS+= -DTIX
-+CXXFLAGS+= -DTIX
- .endif
- 
- c++tk.o: ${DEPS}
diff --git a/sysutils/cd-write/files/patch-4 b/sysutils/cd-write/files/patch-4
deleted file mode 100644
index 400f538396d2..000000000000
--- a/sysutils/cd-write/files/patch-4
+++ /dev/null
@@ -1,49 +0,0 @@
---- c++tk/c++tk.cc.orig	Thu Sep 25 03:43:24 1997
-+++ c++tk/c++tk.cc	Sat Apr 29 23:40:59 2000
-@@ -28,6 +28,9 @@
- //  $Id: c++tk.cc,v 1.22 1997/05/19 04:06:12 jmz Exp $
- //
- #include <tcl.h>
-+#ifdef TIX
-+#include <tix.h>
-+#endif
- #include <string.h>
- #include <stdlib.h>
- #include <limits.h>
-@@ -38,7 +41,9 @@
- 
- extern "C" {
-     int Tk_Init (Tcl_Interp *);
--    ClientData Tk_MainWindow (Tcl_Interp *);
-+#ifdef TIX
-+    int Tixsam_Init (Tcl_Interp *);
-+#endif
- }
- 
- #include "c++tk.h"
-@@ -80,7 +85,7 @@
-     add_tvar (v)
- #define VARIABLE \
-     sprintf (xstr, "%s%x", VARNAME, v);\
--    Tcl_SetVar (interp, xstr, *v? "1":"0", TCL_GLOBAL_ONLY);\
-+    Tcl_SetVar (interp, xstr, *v? (char *)"1":(char*)"0", TCL_GLOBAL_ONLY);\
-     sprintf (xstr, "%s configure -variable %s%x", pname, VARNAME, v);\
-     TkError = Tcl_GlobalEval (interp, xstr);\
-     sprintf (xstr, "%s%x", VARNAME, v);\
-@@ -270,7 +275,6 @@
-     }
-     return 0;
- }
--
- static void
- initialize ()
- {
-@@ -302,7 +306,7 @@
- #endif
-     Tcl_CreateCommand (interp, JMPNAME, 
- 		   (Tcl_CmdProc *) Proc_Handler, 
--		   Tk_MainWindow (interp), 0);
-+		   (void *)Tk_MainWindow (interp), 0);
-     i_vars = new int * [VAR_SIZE];
-     I_vars = new int [VAR_SIZE];
-     t_vars = new char * [VAR_SIZE];
diff --git a/sysutils/cd-write/files/patch-5 b/sysutils/cd-write/files/patch-5
deleted file mode 100644
index 2e9743d29363..000000000000
--- a/sysutils/cd-write/files/patch-5
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Thu Jan 21 22:31:25 1999
-+++ Makefile	Sat Dec 28 22:43:03 2002
-@@ -1,10 +1,10 @@
- OBJS=	main.o iso9660.o copy.o write.o misc.o generic.o specific.o worm.o dao.o
- 
--CFLAGS = -g -O -Ic++tk -DTIX -DMKISOFS='"/usr/local/bin/mkisofs"'
-+CFLAGS = -g -O -Ic++tk -DTIX -DMKISOFS='"${PREFIX}/bin/mkisofs"'
- 
- cd-write: $(OBJS) subdir
--	$(CC) -o  cd-write $(OBJS) c++tk/c++tk.o\
--		-L/usr/local/lib -L/usr/X11R6/lib -ltixsam4180 -ltk80 -ltcl80 -lX11 -lm -lcam
-+	$(CXX) -o  cd-write $(OBJS) c++tk/c++tk.o\
-+		-L${PREFIX}/lib -L${X11BASE}/lib -ltixsam8184 -ltk82 -ltcl82 -lX11 -lm -lcam
- 
- subdir:
- 	cd c++tk && make TIX=1
-@@ -16,5 +16,6 @@
- 	makedepend  ${CFLAGS} ${OBJS:S/.o/.cc/g}
- 
- install:
--	install -c cd-write  /usr/local/bin
-+	install -c cd-write  ${PREFIX}/bin
- 
-+all: cd-write
diff --git a/sysutils/cd-write/files/patch-6 b/sysutils/cd-write/files/patch-6
deleted file mode 100644
index a8a5c7b3b77c..000000000000
--- a/sysutils/cd-write/files/patch-6
+++ /dev/null
@@ -1,11 +0,0 @@
---- worm.cc~	Fri Jan 22 00:30:15 1999
-+++ worm.cc	Wed Dec 26 02:31:17 2001
-@@ -141,7 +141,7 @@
- 	return strerror (errno);
- #else
-     shmptr = (char *)mmap (0, shm_size, PROT_READ|PROT_WRITE, 
--		   MAP_ANON|MAP_INHERIT|MAP_SHARED, -1, 0);
-+		   MAP_ANON|MAP_SHARED, -1, 0);
-     if (shmptr == MAP_FAILED)
- 	return strerror (errno);
- #if 0 // I always get ``Resource temporarily unavailable'' :-(
diff --git a/sysutils/cd-write/files/patch-7 b/sysutils/cd-write/files/patch-7
deleted file mode 100644
index 5c3d31367cb1..000000000000
--- a/sysutils/cd-write/files/patch-7
+++ /dev/null
@@ -1,10 +0,0 @@
---- c++tk/c++tk.h~	Thu Sep 25 03:43:24 1997
-+++ c++tk/c++tk.h	Tue Nov 19 01:14:24 2002
-@@ -31,6 +31,7 @@
- #define __CXXTK_H__
- 
- #include <stdlib.h> // for free()
-+#include <string.h>
- 
- extern int TkError;
- 
diff --git a/sysutils/cd-write/files/patch-8 b/sysutils/cd-write/files/patch-8
deleted file mode 100644
index 6ae1ed2dc7f1..000000000000
--- a/sysutils/cd-write/files/patch-8
+++ /dev/null
@@ -1,10 +0,0 @@
---- generic.cc~	Sat Jan 23 00:31:38 1999
-+++ generic.cc	Sat Dec 28 16:48:21 2002
-@@ -32,6 +32,7 @@
- #include <cam/scsi/scsi_message.h>
- #include <string.h>
- #include <sys/cdio.h>
-+#include <arpa/inet.h>
- #include <machine/endian.h>
- 
- #include "cd-write.h"
diff --git a/sysutils/cd-write/files/patch-iso9660.cc b/sysutils/cd-write/files/patch-iso9660.cc
deleted file mode 100644
index 16a199f2eb48..000000000000
--- a/sysutils/cd-write/files/patch-iso9660.cc
+++ /dev/null
@@ -1,110 +0,0 @@
---- iso9660.cc.orig	Wed Oct 15 15:42:23 2003
-+++ iso9660.cc	Wed Oct 15 15:44:37 2003
-@@ -307,7 +307,7 @@
- 	return;
-     }
-     if ((boot_catalog && !boot_image) || (!boot_catalog && boot_image)) {
--	Error ("You must specify a boot image AND
-+	Error ("You must specify a boot image AND\n\
- a boot catalog to make a bootable CD.");
- 	return;
-     }
-@@ -375,8 +375,8 @@
-     button = -1;
- 
-     TkToplevel (".mkisofs");
--    TkLabel (".mkisofs.l", "-wraplength 6i -justify left -text {
--I don't know where is ``mkisofs'' and MKISOFS is not set in your environment.
-+    TkLabel (".mkisofs.l", "-wraplength 6i -justify left -text {\n\
-+I don't know where is ``mkisofs'' and MKISOFS is not set in your environment.\n\
- }");
-     ExFileSelectBox2 B = tixExFileSelectBox2 (".mkisofs.sel");
-     B.command (fileselect);
-@@ -419,8 +419,8 @@
- 
-     Balloon balloon = tixBalloon (".iso9660.balloon");
-     TkFrame (".iso9660.d -border 1 -relief raised");
--    E_out = tixLabelEntry (".iso9660.d.e", "-label {Output file:} -labelside top -options {
--	    entry.width 55
-+    E_out = tixLabelEntry (".iso9660.d.e", "-label {Output file:} -labelside top -options {\n\
-+	    entry.width 55\n\
- 	    label.anchor w }");
-     Button B = TkButton (".iso9660.d.browse", "-text {Browse...}");
-     B.command (browse, "F");
-@@ -429,8 +429,8 @@
-     TkPack (".iso9660.d", "-side top -fill x -pady 8");
- 
-     TkFrame (".iso9660.t -border 1 -relief raised");
--    E_tree = tixLabelEntry (".iso9660.t.e", "-label {Path:} -labelside top -options {
--	    entry.width 55
-+    E_tree = tixLabelEntry (".iso9660.t.e", "-label {Path:} -labelside top -options {\n\
-+	    entry.width 55\n\
- 	    label.anchor w }");
-     B = TkButton (".iso9660.t.browse", "-text {Browse ...}");
-     B.command (browse, "D");
-@@ -438,26 +438,26 @@
-     TkPack (".iso9660.t.browse -side left -anchor s -padx 4 -pady 1");
-     TkPack (".iso9660.t", "-side top -fill x -pady 8");
- 
--    E_app = tixLabelEntry (".iso9660.app", "-label {Application ID:} -labelside top -options {
--	    entry.width 55
-+    E_app = tixLabelEntry (".iso9660.app", "-label {Application ID:} -labelside top -options {\n\
-+	    entry.width 55\n\
- 	    label.anchor w }");
-     balloon.bind (".iso9660.app -balloonmsg", app_help);
-     TkPack (".iso9660.app", "-side top -fill x");
- 
--    E_vol = tixLabelEntry (".iso9660.vol", "-label {Volume ID:} -labelside top -options {
--	    entry.width 55
-+    E_vol = tixLabelEntry (".iso9660.vol", "-label {Volume ID:} -labelside top -options {\n\
-+	    entry.width 55\n\
- 	    label.anchor w }");
-     balloon.bind (".iso9660.vol -balloonmsg", vol_help);
-     TkPack (".iso9660.vol", "-side top -fill x");
- 
--    E_prep = tixLabelEntry (".iso9660.prep", "-label {Preparer:} -labelside top -options {
--	    entry.width 55
-+    E_prep = tixLabelEntry (".iso9660.prep", "-label {Preparer:} -labelside top -options {\n\
-+	    entry.width 55\n\
- 	    label.anchor w }");
-     balloon.bind (".iso9660.prep -balloonmsg", prep_help);
-     TkPack (".iso9660.prep", "-side top -fill x");
- 
--    E_pub = tixLabelEntry (".iso9660.pub", "-label {Publisher:} -labelside top -options {
--	    entry.width 55
-+    E_pub = tixLabelEntry (".iso9660.pub", "-label {Publisher:} -labelside top -options {\n\
-+	    entry.width 55\n\
- 	    label.anchor w }");
-     balloon.bind (".iso9660.pub -balloonmsg", pub_help);
-     TkPack (".iso9660.pub", "-side top -fill x");
-@@ -468,15 +468,15 @@
-     balloon.bind (".iso9660.excl -balloonmsg", x_help);
-     TkPack (".iso9660.excl", "-side top -fill x");
- 
--    E_excl = tixLabelEntry (".iso9660.glob", "-label {Exclude patterns:} -labelside top -options {
--	    entry.width 55
-+    E_excl = tixLabelEntry (".iso9660.glob", "-label {Exclude patterns:} -labelside top -options {\n\
-+	    entry.width 55\n\
- 	    label.anchor w }");
-     balloon.bind (".iso9660.glob -balloonmsg", m_help);
-     TkPack (".iso9660.glob", "-side top -fill x");
- 
-     TkFrame (".iso9660.bopt -border 1 -relief raised");
--    E_BootImage = tixLabelEntry (".iso9660.bopt.e", "-label {Boot image:} -labelside top -options {
--	    entry.width 55
-+    E_BootImage = tixLabelEntry (".iso9660.bopt.e", "-label {Boot image:} -labelside top -options {\n\
-+	    entry.width 55\n\
- 	    label.anchor w }");
-     B = TkButton (".iso9660.bopt.browse", "-text {Browse ...}");
-     B.command (browse, "I");
-@@ -486,8 +486,8 @@
-     balloon.bind (".iso9660.bopt.e -balloonmsg", b_help);
- 
-     TkFrame (".iso9660.c -border 1 -relief raised");
--    E_BootCatalog = tixLabelEntry (".iso9660.c.e", "-label {Boot catalog:} -labelside top -options {
--	    entry.width 55
-+    E_BootCatalog = tixLabelEntry (".iso9660.c.e", "-label {Boot catalog:} -labelside top -options {\n\
-+	    entry.width 55\n\
- 	    label.anchor w }");
-     B = TkButton (".iso9660.c.browse", "-text {Browse ...}");
-     B.command (browse, "C");
diff --git a/sysutils/cd-write/files/patch-iso9660.h b/sysutils/cd-write/files/patch-iso9660.h
deleted file mode 100644
index 135d7055e619..000000000000
--- a/sysutils/cd-write/files/patch-iso9660.h
+++ /dev/null
@@ -1,177 +0,0 @@
---- iso9660.h.orig	Wed Oct 15 15:37:41 2003
-+++ iso9660.h	Wed Oct 15 15:41:13 2003
-@@ -13,98 +13,98 @@
- #define ISO9660_r 1
- #define ISO9660_T 1
- 
--static char *app_help = "{Specifies  a  text string that will be written into the
--volume header.  This should describe the application
--that will be on the disc.  There is space on the disc
-+static char *app_help = "{Specifies  a  text string that will be written into the\n\
-+volume header.  This should describe the application\n\
-+that will be on the disc.  There is space on the disc\n\
- for 128 characters of  information.}";
--static char *vol_help =  "{Specifies the volume ID to be written into the master 
--block.There is space on the disc for 32 characters of
-+static char *vol_help =  "{Specifies the volume ID to be written into the master \n\
-+block.There is space on the disc for 32 characters of\n\
- information.}";
--static char *prep_help = "{Specifies  a  text string that will be written into
--the volume header.  This should describe  the  preparer
--of the CDROM, usually with a mailing address
--and phone number.  There is space on the  disc  for
-+static char *prep_help = "{Specifies  a  text string that will be written into\n\
-+the volume header.  This should describe  the  preparer\n\
-+of the CDROM, usually with a mailing address\n\
-+and phone number.  There is space on the  disc  for\n\
- 128  characters of information.}";
--static char *pub_help = "{Specifies a text string that will be  written  into
--the  volume  header.  This should describe the 
--publisher of the CDROM, usually with a mailing address
--and  phone  number.  There is space on the disc for
-+static char *pub_help = "{Specifies a text string that will be  written  into\n\
-+the  volume  header.  This should describe the \n\
-+publisher of the CDROM, usually with a mailing address\n\
-+and  phone  number.  There is space on the disc for\n\
- 128 characters of information.}";
--static char *a_help = "{Normally  files that contain the characters '~' or '#'
--will not be included (these  are  typically  backup
-+static char *a_help = "{Normally  files that contain the characters '~' or '#'\n\
-+will not be included (these  are  typically  backup\n\
- files for editors under unix).}";
--static char *b_help = "{Specifies  the  path and filename of the boot image
--to be used when making an \"El Torito\"  bootable  CD.
--This option is required to  make a bootable CD.  The
--boot image must be exactly the size of either a 1.2,
--1.44,  or a  2.88  meg floppy,  and mkisofs will use
--this size when creating the output iso9660 filesystem.
--It is assumed that  the first 512 byte sector should
--be  read  from the  boot image  (it  is  essentially
-+static char *b_help = "{Specifies  the  path and filename of the boot image\n\
-+to be used when making an \"El Torito\"  bootable  CD.\n\
-+This option is required to  make a bootable CD.  The\n\
-+boot image must be exactly the size of either a 1.2,\n\
-+1.44,  or a  2.88  meg floppy,  and mkisofs will use\n\
-+this size when creating the output iso9660 filesystem.\n\
-+It is assumed that  the first 512 byte sector should\n\
-+be  read  from the  boot image  (it  is  essentially\n\
- emulating a  normal floppy drive).}";
--static char *c_help = "{Specifies the path and filename of the boot catalog
--to  be used when making an \"El Torito\" bootable CD.
--This option is required to make a bootable CD. This
--file  will be  created  by mkisofs  in  the  source
--filesystem,  so be sure the specified filename does
--not conflict with an existing  file,  as it will be
--quietly overwritten! 
-+static char *c_help = "{Specifies the path and filename of the boot catalog\n\
-+to  be used when making an \"El Torito\" bootable CD.\n\
-+This option is required to make a bootable CD. This\n\
-+file  will be  created  by mkisofs  in  the  source\n\
-+filesystem,  so be sure the specified filename does\n\
-+not conflict with an existing  file,  as it will be\n\
-+quietly overwritten! \n\
- Usually a name like \"boot.catalog\" is chosen.}";
--static char *d_help = "{Omit  trailing period from files that do not have a
--period.  This violates the ISO9660 standard, but it
-+static char *d_help = "{Omit  trailing period from files that do not have a\n\
-+period.  This violates the ISO9660 standard, but it\n\
- happens to work on many systems.  Use with caution.}";
--static char *D_help = "{Do not use deep directory relocation,  and  instead
--just  pack  them in the way we see them.  This violates
--the ISO9660 standard, but it  works  on  many
-+static char *D_help = "{Do not use deep directory relocation,  and  instead\n\
-+just  pack  them in the way we see them.  This violates\n\
-+the ISO9660 standard, but it  works  on  many\n\
- systems.  Use with caution.}";
--static char *f_help = "{Follow  symbolic links when generating the filesystem.
--When this option  is  not  in  use,  symbolic links
--will be entered using Rock Ridge if enabled, otherwise
-+static char *f_help = "{Follow  symbolic links when generating the filesystem.\n\
-+When this option  is  not  in  use,  symbolic links\n\
-+will be entered using Rock Ridge if enabled, otherwise\n\
- the file will be ignored.}";
--static char *l_help = "{Allow full 32 character  filenames.   Normally  the
--ISO9660  filename will be in an 8.3 format which is
--compatible with MS-DOS,  even  though  the  ISO9660
--standard  allows  filenames of up to 32 characters.
--If you use this option, the disc may  be  difficult
--to  use on a MS-DOS system, but this comes in handy
--on some other systems (such  as  the  Amiga).   Use
-+static char *l_help = "{Allow full 32 character  filenames.   Normally  the\n\
-+ISO9660  filename will be in an 8.3 format which is\n\
-+compatible with MS-DOS,  even  though  the  ISO9660\n\
-+standard  allows  filenames of up to 32 characters.\n\
-+If you use this option, the disc may  be  difficult\n\
-+to  use on a MS-DOS system, but this comes in handy\n\
-+on some other systems (such  as  the  Amiga).   Use\n\
- with caution.}";
--static char *L_help = "{Allow filenames to begin with a period.  Usually, a
--leading dot is replaced with an underscore in order
-+static char *L_help = "{Allow filenames to begin with a period.  Usually, a\n\
-+leading dot is replaced with an underscore in order\n\
- to maintain MS-DOS compatibility.}";
--static char *m_help = "{Exclude  glob from being written to CDROM.  glob is
--a shell wild-card-style  pattern  that  must  match
-+static char *m_help = "{Exclude  glob from being written to CDROM.  glob is\n\
-+a shell wild-card-style  pattern  that  must  match\n\
- part  of  the filename.}";
--static char *N_help = "{Omit version numbers from ISO9660 file names.  This
--may violate the ISO9660 standard, but no one really
-+static char *N_help = "{Omit version numbers from ISO9660 file names.  This\n\
-+may violate the ISO9660 standard, but no one really\n\
- uses the version numbers anyway.  Use with caution.}";
--static char *R_help = "{Generate SUSP and RR records using the  Rock  Ridge
--protocol  to  further  describe  the  files  on the
-+static char *R_help = "{Generate SUSP and RR records using the  Rock  Ridge\n\
-+protocol  to  further  describe  the  files  on the\n\
- iso9660 filesystem.}";
--static char *r_help = "{The uid and gid of files are set to zero,  all the 
--file  read bits are  set  true,  so that files  and
--directories are globally readable on the client. If
--any execute bit  is  set for a file, set all of the
--execute  bits,  so  that executables  are  globally
--executable on the client. If any search  bit is set
--for a  directory,  set all of the search  bits,  so
--that  directories  are  globally searchable on  the
--client.   All  write  bits are cleared, because the
--CD-Rom will be  mounted  readonly  in any case.  If
--any of the  special mode  bits are set, clear them,
--because file locks  are  not useful  on a read-only
--file system,  and set-id bits are not desirable for
-+static char *r_help = "{The uid and gid of files are set to zero,  all the \n\
-+file  read bits are  set  true,  so that files  and\n\
-+directories are globally readable on the client. If\n\
-+any execute bit  is  set for a file, set all of the\n\
-+execute  bits,  so  that executables  are  globally\n\
-+executable on the client. If any search  bit is set\n\
-+for a  directory,  set all of the search  bits,  so\n\
-+that  directories  are  globally searchable on  the\n\
-+client.   All  write  bits are cleared, because the\n\
-+CD-Rom will be  mounted  readonly  in any case.  If\n\
-+any of the  special mode  bits are set, clear them,\n\
-+because file locks  are  not useful  on a read-only\n\
-+file system,  and set-id bits are not desirable for\n\
- uid 0 or gid 0.}";
--static char *T_help = "{Generate a file TRANS.TBL in each directory on  the
--CDROM,  which can be used on non-Rock Ridge capable
--systems to help establish the correct  file  names.
--There  is also information present in the file that
--indicates the major and minor numbers for block and
--character devices, and each symlink has the name of
-+static char *T_help = "{Generate a file TRANS.TBL in each directory on  the\n\
-+CDROM,  which can be used on non-Rock Ridge capable\n\
-+systems to help establish the correct  file  names.\n\
-+There  is also information present in the file that\n\
-+indicates the major and minor numbers for block and\n\
-+character devices, and each symlink has the name of\n\
- the link file given.}";
--static char *x_help = "{Exclude path from being  written  to  CDROM.   path
--must  be  the  complete  pathname that results from
--concatenating the pathname given  as  command  line
--argument  and  the path relative to this directory.
-+static char *x_help = "{Exclude path from being  written  to  CDROM.   path\n\
-+must  be  the  complete  pathname that results from\n\
-+concatenating the pathname given  as  command  line\n\
-+argument  and  the path relative to this directory.\n\
- Multiple paths may be excluded (up to 1000).}";
- 
diff --git a/sysutils/cd-write/files/patch-main.cc b/sysutils/cd-write/files/patch-main.cc
deleted file mode 100644
index edb1f1395115..000000000000
--- a/sysutils/cd-write/files/patch-main.cc
+++ /dev/null
@@ -1,58 +0,0 @@
---- main.cc.orig	Wed Oct 15 15:30:10 2003
-+++ main.cc	Wed Oct 15 15:30:44 2003
-@@ -1,29 +1,29 @@
--static char *copyright = "{
--Copyright (c) 1997 Jean-Marc Zucconi
--All rights reserved.
--
--Redistribution and use in source and binary forms, with or without
--modification, are permitted provided that the following conditions
--are met:
--1. Redistributions of source code must retain the above copyright
--   notice, this list of conditions and the following disclaimer
--   in this position and unchanged.
--2. Redistributions in binary form must reproduce the above copyright
--   notice, this list of conditions and the following disclaimer in the
--   documentation and/or other materials provided with the distribution.
--3. The name of the author may not be used to endorse or promote products
--   derived from this software withough specific prior written permission
--
--THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+static char *copyright = "{\n\
-+Copyright (c) 1997 Jean-Marc Zucconi\n\
-+All rights reserved.\n\
-+\n\
-+Redistribution and use in source and binary forms, with or without\n\
-+modification, are permitted provided that the following conditions\n\
-+are met:\n\
-+1. Redistributions of source code must retain the above copyright\n\
-+   notice, this list of conditions and the following disclaimer\n\
-+   in this position and unchanged.\n\
-+2. Redistributions in binary form must reproduce the above copyright\n\
-+   notice, this list of conditions and the following disclaimer in the\n\
-+   documentation and/or other materials provided with the distribution.\n\
-+3. The name of the author may not be used to endorse or promote products\n\
-+   derived from this software withough specific prior written permission\n\
-+\n\
-+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n\
-+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n\
-+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n\
-+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n\
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n\
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n\
-+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n\
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n\
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n\
-+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\
- }";
- 
- #include <stdio.h>
diff --git a/sysutils/cd-write/files/patch-pixmaps.h b/sysutils/cd-write/files/patch-pixmaps.h
deleted file mode 100644
index 0127cc2606e9..000000000000
--- a/sysutils/cd-write/files/patch-pixmaps.h
+++ /dev/null
@@ -1,379 +0,0 @@
---- pixmaps.h.orig	Wed Oct 15 15:34:38 2003
-+++ pixmaps.h	Wed Oct 15 15:36:51 2003
-@@ -1,191 +1,191 @@
--char *data_xpm = "{
--/* XPM */
--static char * data_xpm[] = {
--/* width height num_colors chars_per_pixel */
--\"20 26 10 1\",
--/* colors */
--\" 	c white\",
--\".	c #bbbbbb\",
--\"X	c #555555\",
--\"o	c #999999\",
--\"O	c #444444\",
--\"+	c #cccccc\",
--\"@	c #777777\",
--\"#	c #aaaaaa\",
--\"$	c #333333\",
--\"%	c #eeeeee\",
--/* pixels */
--\"                    \",
--\"                    \",
--\"                    \",
--\"  .X   o.o  .X   o.o\",
--\"   O  +o o+  O  +o o\",
--\"   O  @. .@  O  @. .\",
--\"   O  @. .@  O  @. .\",
--\"   O  @. .@  O  @. .\",
--\"   O  ## ##  O  ## o\",
--\"  .$.% @ @  .$.% @ @\",
--\"       %.%       %.%\",
--\"                    \",
--\"                    \",
--\"                    \",
--\"                    \",
--\"                    \",
--\"  o.o  .X   o.o  o+o\",
--\" +o o+  O  +o o++o o\",
--\" @. .@  O  @. .@@. .\",
--\" @. .@  O  @. .@@. .\",
--\" @. .@  O  @. .@@. .\",
--\" ## ##  O  ## #### #\",
--\"  @ @  .$.% @ @  @ @\",
--\"  %.%       %.%  %.%\",
--\"                    \",
--\"                    \"};
-+char *data_xpm = "{\n\
-+/* XPM */\n\
-+static char * data_xpm[] = {\n\
-+/* width height num_colors chars_per_pixel */\n\
-+\"20 26 10 1\",\n\
-+/* colors */\n\
-+\" 	c white\",\n\
-+\".	c #bbbbbb\",\n\
-+\"X	c #555555\",\n\
-+\"o	c #999999\",\n\
-+\"O	c #444444\",\n\
-+\"+	c #cccccc\",\n\
-+\"@	c #777777\",\n\
-+\"#	c #aaaaaa\",\n\
-+\"$	c #333333\",\n\
-+\"%	c #eeeeee\",\n\
-+/* pixels */\n\
-+\"                    \",\n\
-+\"                    \",\n\
-+\"                    \",\n\
-+\"  .X   o.o  .X   o.o\",\n\
-+\"   O  +o o+  O  +o o\",\n\
-+\"   O  @. .@  O  @. .\",\n\
-+\"   O  @. .@  O  @. .\",\n\
-+\"   O  @. .@  O  @. .\",\n\
-+\"   O  ## ##  O  ## o\",\n\
-+\"  .$.% @ @  .$.% @ @\",\n\
-+\"       %.%       %.%\",\n\
-+\"                    \",\n\
-+\"                    \",\n\
-+\"                    \",\n\
-+\"                    \",\n\
-+\"                    \",\n\
-+\"  o.o  .X   o.o  o+o\",\n\
-+\" +o o+  O  +o o++o o\",\n\
-+\" @. .@  O  @. .@@. .\",\n\
-+\" @. .@  O  @. .@@. .\",\n\
-+\" @. .@  O  @. .@@. .\",\n\
-+\" ## ##  O  ## #### #\",\n\
-+\"  @ @  .$.% @ @  @ @\",\n\
-+\"  %.%       %.%  %.%\",\n\
-+\"                    \",\n\
-+\"                    \"};\n\
- }";
- 
--char *note_xpm = "{
--/* XPM */
--static char *n[] = {
--/* width height num_colors chars_per_pixel */
--\"    16    25       14            1\",
--/* colors */
--\". c #ffffff\",
--\"# c #eeeeee\",
--\"a c #dddddd\",
--\"b c #cccccc\",
--\"c c #bbbbbb\",
--\"d c #aaaaaa\",
--\"e c #999999\",
--\"f c #888888\",
--\"g c #777777\",
--\"h c #666666\",
--\"i c #444444\",
--\"j c #333333\",
--\"k c #111111\",
--\"l c #000000\",
--/* pixels */
--\"................\",
--\"................\",
--\"........e.......\",
--\"llllllllllllllll\",
--\"........lg......\",
--\"........llb.....\",
--\"........llj.....\",
--\"........lglg....\",
--\"llllllllllllllll\",
--\"........l..gf...\",
--\"........l..#j...\",
--\"........l...j...\",
--\"........l...i...\",
--\"........l...h...\",
--\"llllllllllllllll\",
--\"........l..d#...\",
--\"........l.#c....\",
--\"....bggbl.#.....\",
--\"..#illlll.......\",
--\"llllllllllllllll\",
--\"..lllllla.......\",
--\"..illlke........\",
--\"..#ege#.........\",
--\"................\",
--\"llllllllllllllll\"
--};
-+char *note_xpm = "{\n\
-+/* XPM */\n\
-+static char *n[] = {\n\
-+/* width height num_colors chars_per_pixel */\n\
-+\"    16    25       14            1\",\n\
-+/* colors */\n\
-+\". c #ffffff\",\n\
-+\"# c #eeeeee\",\n\
-+\"a c #dddddd\",\n\
-+\"b c #cccccc\",\n\
-+\"c c #bbbbbb\",\n\
-+\"d c #aaaaaa\",\n\
-+\"e c #999999\",\n\
-+\"f c #888888\",\n\
-+\"g c #777777\",\n\
-+\"h c #666666\",\n\
-+\"i c #444444\",\n\
-+\"j c #333333\",\n\
-+\"k c #111111\",\n\
-+\"l c #000000\",\n\
-+/* pixels */\n\
-+\"................\",\n\
-+\"................\",\n\
-+\"........e.......\",\n\
-+\"llllllllllllllll\",\n\
-+\"........lg......\",\n\
-+\"........llb.....\",\n\
-+\"........llj.....\",\n\
-+\"........lglg....\",\n\
-+\"llllllllllllllll\",\n\
-+\"........l..gf...\",\n\
-+\"........l..#j...\",\n\
-+\"........l...j...\",\n\
-+\"........l...i...\",\n\
-+\"........l...h...\",\n\
-+\"llllllllllllllll\",\n\
-+\"........l..d#...\",\n\
-+\"........l.#c....\",\n\
-+\"....bggbl.#.....\",\n\
-+\"..#illlll.......\",\n\
-+\"llllllllllllllll\",\n\
-+\"..lllllla.......\",\n\
-+\"..illlke........\",\n\
-+\"..#ege#.........\",\n\
-+\"................\",\n\
-+\"llllllllllllllll\"\n\
-+};\n\
- }";
- 
--char *note_p_xpm = "{
--/* XPM */
--static char *note_p[] = {
--/* width height num_colors chars_per_pixel */
--\"    16    25       14            1\",
--/* colors */
--\". c #ffffff\",
--\"# c #eeeefc\",
--\"a c #ddddf9\",
--\"b c #ccccf5\",
--\"c c #bbbbf2\",
--\"d c #aaaaef\",
--\"e c #9999eb\",
--\"f c #8888e8\",
--\"g c #7777e5\",
--\"h c #6666e1\",
--\"i c #4444db\",
--\"j c #3333d7\",
--\"k c #1111d1\",
--\"l c #0000cd\",
--/* pixels */
--\"................\",
--\"................\",
--\"........e.......\",
--\"llllllllllllllll\",
--\"........lg......\",
--\"........llb.....\",
--\"........llj.....\",
--\"........lglg....\",
--\"llllllllllllllll\",
--\"........l..gf...\",
--\"........l..#j...\",
--\"........l...j...\",
--\"........l...i...\",
--\"........l...h...\",
--\"llllllllllllllll\",
--\"........l..d#...\",
--\"........l.#c....\",
--\"....bggbl.#.....\",
--\"..#illlll.......\",
--\"llllllllllllllll\",
--\"..lllllla.......\",
--\"..illlke........\",
--\"..#ege#.........\",
--\"................\",
--\"llllllllllllllll\"
--};
-+char *note_p_xpm = "{\
-+/* XPM */\n\
-+static char *note_p[] = {\n\
-+/* width height num_colors chars_per_pixel */\n\
-+\"    16    25       14            1\",\n\
-+/* colors */\n\
-+\". c #ffffff\",\n\
-+\"# c #eeeefc\",\n\
-+\"a c #ddddf9\",\n\
-+\"b c #ccccf5\",\n\
-+\"c c #bbbbf2\",\n\
-+\"d c #aaaaef\",\n\
-+\"e c #9999eb\",\n\
-+\"f c #8888e8\",\n\
-+\"g c #7777e5\",\n\
-+\"h c #6666e1\",\n\
-+\"i c #4444db\",\n\
-+\"j c #3333d7\",\n\
-+\"k c #1111d1\",\n\
-+\"l c #0000cd\",\n\
-+/* pixels */\n\
-+\"................\",\n\
-+\"................\",\n\
-+\"........e.......\",\n\
-+\"llllllllllllllll\",\n\
-+\"........lg......\",\n\
-+\"........llb.....\",\n\
-+\"........llj.....\",\n\
-+\"........lglg....\",\n\
-+\"llllllllllllllll\",\n\
-+\"........l..gf...\",\n\
-+\"........l..#j...\",\n\
-+\"........l...j...\",\n\
-+\"........l...i...\",\n\
-+\"........l...h...\",\n\
-+\"llllllllllllllll\",\n\
-+\"........l..d#...\",\n\
-+\"........l.#c....\",\n\
-+\"....bggbl.#.....\",\n\
-+\"..#illlll.......\",\n\
-+\"llllllllllllllll\",\n\
-+\"..lllllla.......\",\n\
-+\"..illlke........\",\n\
-+\"..#ege#.........\",\n\
-+\"................\",\n\
-+\"llllllllllllllll\"\n\
-+};\n\
- }";
--char *qm_xpm = "{
--/* XPM */
--static char *qm[] = {
--/* width height num_colors chars_per_pixel */
--\"    16    24       16            1\",
--/* colors */
--\". c #ffffff\",
--\"# c #eeeeee\",
--\"a c #dddddd\",
--\"b c #cccccc\",
--\"c c #bbbbbb\",
--\"d c #aaaaaa\",
--\"e c #999999\",
--\"f c #888888\",
--\"g c #777777\",
--\"h c #666666\",
--\"i c #555555\",
--\"j c #444444\",
--\"k c #333333\",
--\"l c #222222\",
--\"m c #111111\",
--\"n c #000000\",
--/* pixels */
--\"................\",
--\"................\",
--\"................\",
--\"....ejjjklhb....\",
--\"...hh#...dnnd...\",
--\"..ennc....nnl...\",
--\"..fnnf....nnn...\",
--\"..#hh#...bnnh...\",
--\"........#kni#...\",
--\"........jmd.....\",
--\".......emb......\",
--\".......ig.......\",
--\".......n#.......\",
--\".......n........\",
--\".......n........\",
--\".......b........\",
--\"................\",
--\"......gjd.......\",
--\".....ennna......\",
--\".....fnnnb......\",
--\".....#jng.......\",
--\"................\",
--\"................\",
--\".................\"
--};
-+char *qm_xpm = "{\n\
-+/* XPM */\n\
-+static char *qm[] = {\n\
-+/* width height num_colors chars_per_pixel */\n\
-+\"    16    24       16            1\",\n\
-+/* colors */\n\
-+\". c #ffffff\",\n\
-+\"# c #eeeeee\",\n\
-+\"a c #dddddd\",\n\
-+\"b c #cccccc\",\n\
-+\"c c #bbbbbb\",\n\
-+\"d c #aaaaaa\",\n\
-+\"e c #999999\",\n\
-+\"f c #888888\",\n\
-+\"g c #777777\",\n\
-+\"h c #666666\",\n\
-+\"i c #555555\",\n\
-+\"j c #444444\",\n\
-+\"k c #333333\",\n\
-+\"l c #222222\",\n\
-+\"m c #111111\",\n\
-+\"n c #000000\",\n\
-+/* pixels */\n\
-+\"................\",\n\
-+\"................\",\n\
-+\"................\",\n\
-+\"....ejjjklhb....\",\n\
-+\"...hh#...dnnd...\",\n\
-+\"..ennc....nnl...\",\n\
-+\"..fnnf....nnn...\",\n\
-+\"..#hh#...bnnh...\",\n\
-+\"........#kni#...\",\n\
-+\"........jmd.....\",\n\
-+\".......emb......\",\n\
-+\".......ig.......\",\n\
-+\".......n#.......\",\n\
-+\".......n........\",\n\
-+\".......n........\",\n\
-+\".......b........\",\n\
-+\"................\",\n\
-+\"......gjd.......\",\n\
-+\".....ennna......\",\n\
-+\".....fnnnb......\",\n\
-+\".....#jng.......\",\n\
-+\"................\",\n\
-+\"................\",\n\
-+\".................\"\n\
-+};\n\
- }";
diff --git a/sysutils/cd-write/files/patch-write.cc b/sysutils/cd-write/files/patch-write.cc
deleted file mode 100644
index 54b6ecf8d9a3..000000000000
--- a/sysutils/cd-write/files/patch-write.cc
+++ /dev/null
@@ -1,35 +0,0 @@
---- write.cc.orig	Wed Oct 15 15:48:59 2003
-+++ write.cc	Wed Oct 15 15:49:52 2003
-@@ -97,11 +97,11 @@
- 
-     TkToplevel (".tray -class Dialog");
-     TkWm ("title .tray", "{Open/Close tray}");
--    TkLabel (".tray.msg -wraplength 4i -justify center -text {
-+    TkLabel (".tray.msg -wraplength 4i -justify center -text {\n\
-  It is advised to open and close the tray if you already did a dummy write,\
-  in order to avoid an End Of Medium error. \
-  If you just inserted a blank in the drive click on the \"Continue\" button.\
-- Click on the \"Open/CLose\" button to open and close the tray.
-+ Click on the \"Open/CLose\" button to open and close the tray.\n\
- }");
-     button = -1;
-     TkPack (".tray.msg -side top -padx 1c -pady 1c");
-@@ -693,12 +693,12 @@
-     bsel = TkButton (".write.f.bs", "-text {Select >>>} -state disabled");
-     bsel.command (mfilesel);
-     TkFrame (".write.f.f");
--    hlist = tixScrolledHList (".write.f.f.l", "-relief flat -options {
--                    hlist.columns 4
--                    hlist.gap 0
--                    hlist.header  true
--                    hlist.selectMode single
--                    hlist.width 40 hlist.height 15
-+    hlist = tixScrolledHList (".write.f.f.l", "-relief flat -options {\n\
-+                    hlist.columns 4\n\
-+                    hlist.gap 0\n\
-+                    hlist.header  true\n\
-+                    hlist.selectMode single\n\
-+                    hlist.width 40 hlist.height 15\n\
-              }");
-     hlist.subwidget ("hlist")->browsecmd (hlistcmd); 
-     bb = tixButtonBox (".write.f.f.b", "-relief flat -orientation horizontal -padx 0");