7 files changed, 821 insertions, 6 deletions

diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index 4dd2ffd926df..47166e0a8f9f 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cd-write
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jmz
@@ -25,10 +26,6 @@ WRKSRC=		${WRKDIR}/cd-write
 BROKEN=		CAM
 .endif
 
-.if ${OSVERSION} >= 501000
-BROKEN=         "Does not compile"
-.endif
-
 pre-build:
 	@cd ${WRKSRC}; ${MV} Makefile Makefile~; \
 		${SED} -e s:/usr/local:${PREFIX}:g -e s/CFL/CXXFL/ <Makefile~ >Makefile;\
diff --git a/sysutils/cd-write/files/patch-2 b/sysutils/cd-write/files/patch-2
index 528fadf42693..0551f43a6a5d 100644
--- a/sysutils/cd-write/files/patch-2
+++ b/sysutils/cd-write/files/patch-2
@@ -1,5 +1,16 @@
---- copy.cc.orig	Sun Nov 28 19:29:05 1999
-+++ copy.cc	Sun Nov 28 19:29:25 1999
+--- 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++) {
@@ -9,3 +20,51 @@
  	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-iso9660.cc b/sysutils/cd-write/files/patch-iso9660.cc
new file mode 100644
index 000000000000..16a199f2eb48
--- /dev/null
+++ b/sysutils/cd-write/files/patch-iso9660.cc
@@ -0,0 +1,110 @@
+--- 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
new file mode 100644
index 000000000000..135d7055e619
--- /dev/null
+++ b/sysutils/cd-write/files/patch-iso9660.h
@@ -0,0 +1,177 @@
+--- 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
new file mode 100644
index 000000000000..edb1f1395115
--- /dev/null
+++ b/sysutils/cd-write/files/patch-main.cc
@@ -0,0 +1,58 @@
+--- 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
new file mode 100644
index 000000000000..0127cc2606e9
--- /dev/null
+++ b/sysutils/cd-write/files/patch-pixmaps.h
@@ -0,0 +1,379 @@
+--- 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
new file mode 100644
index 000000000000..54b6ecf8d9a3
--- /dev/null
+++ b/sysutils/cd-write/files/patch-write.cc
@@ -0,0 +1,35 @@
+--- 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");