5 files changed, 34 insertions, 73 deletions

diff --git a/sysutils/cdrdao/files/patch-configure b/sysutils/cdrdao/files/patch-configure
new file mode 100644
index 000000000000..15320fa0e453
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure.orig	Mon Oct  7 03:53:55 2002
++++ configure	Sat Oct 12 18:06:18 2002
+@@ -10250,7 +10250,7 @@
+     *-freebsd2*)
+ 			       scsilib_libs="$scsilib_libs"
+ 			       ;;
+-    *-freebsd[3456]*)
++    *-freebsd[34567]*)
+ 			       scsilib_libs="$scsilib_libs -lcam"
+ 			       ;;
+   esac
+@@ -10268,7 +10268,7 @@
+ 	       scsilib_objs="ScsiIf-linux.o sg_err.o"
+ 	       ;;
+ 
+-    *-freebsd[3456]*)
++    *-freebsd[34567]*)
+ 	       scsilib_libs="-lcam"
+ 	       scsilib_objs="ScsiIf-freebsd-cam.o"
+ 	       ;;
+@@ -10514,7 +10514,7 @@
+ esac
+ 
+ case "$host" in
+-  *-linux-* | *-freebsd[456]* | *-solaris*)
++  *-linux-* | *-freebsd[4567]* | *-solaris*)
+ 	     sound_if_obj=SoundIF-ao.o
+ 	     ;;
+ 
diff --git a/sysutils/cdrdao/files/patch-dao::dao.cc b/sysutils/cdrdao/files/patch-dao::dao.cc
deleted file mode 100644
index a96d0e6251b3..000000000000
--- a/sysutils/cdrdao/files/patch-dao::dao.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- dao/dao.cc.orig	Thu Feb 12 02:13:31 2004
-+++ dao/dao.cc	Tue Mar  2 17:22:11 2004
-@@ -703,7 +703,7 @@
- 
-     setsid(); // detach from controlling terminal
- 
--#ifdef HAVE_MLOCKALL
-+#if defined(HAVE_MLOCKALL) && !defined(__FreeBSD__)
-     if (geteuid() == 0) {
-       if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0) {
- 	message(-1, "Cannot lock memory pages: %s", strerror(errno));
-@@ -737,7 +737,7 @@
-     break;
-   }
- 
--#ifdef HAVE_MLOCKALL
-+#if defined(HAVE_MLOCKALL) && !defined(__FreeBSD__)
-   if (geteuid() == 0) {
-     if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0) {
-       message(-1, "Cannot lock memory pages: %s", strerror(errno));
-@@ -762,7 +762,7 @@
-     cdr->abortDao(); // abort writing process
- 
-  fail:
--#ifdef HAVE_MUNLOCKALL
-+#if defined(HAVE_MUNLOCKALL) && !defined(__FreeBSD__)
-   munlockall();
- #endif
- 
diff --git a/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul b/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
index 4f398a59d5bd..e63ce76c6b21 100644
--- a/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
+++ b/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
@@ -10,7 +10,7 @@
  
  CPPOPTS=	-I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
  COPTS=
-@@ -57,14 +58,13 @@
+@@ -57,14 +58,14 @@
  
  FLOAT_OPTIONS=	
  
@@ -18,8 +18,9 @@
 -LDCC=		@echo "	==> LINKING \"$@\""; gcc
 -DYNLD=		@echo "	==> LINKING dynamic library \"$@\""; gcc
 -RANLIB=		@echo "	==> RANDOMIZING ARCHIVE \"$@\""; ranlib
-+LDCC=		$(CCOM)
-+DYNLD=		$(CCOM)
++CCCOM=		$(CC)
++LDCC=		$(CCCOM)
++DYNLD=		$(CCCOM)
 +RANLIB=		ranlib
  ARFLAGS=	cr
  LORDER=		lorder
@@ -27,5 +28,5 @@
  
  RMDEP=		:
 -MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
-+MKDEP=		$(CCOM) -M
++MKDEP=		$(CCCOM) -M
  MKDEP_OUT=
diff --git a/sysutils/cdrdao/files/patch-scsilib::RULES::rules.cnf b/sysutils/cdrdao/files/patch-scsilib::RULES::rules.cnf
deleted file mode 100644
index 270cb234a215..000000000000
--- a/sysutils/cdrdao/files/patch-scsilib::RULES::rules.cnf
+++ /dev/null
@@ -1,12 +0,0 @@
---- scsilib/RULES/rules.cnf.orig	Sun Jan 27 16:11:31 2002
-+++ scsilib/RULES/rules.cnf	Sun Jun  1 18:58:37 2003
-@@ -33,8 +33,7 @@
- #
- # Hack until the <mach>-<os>-*cc.rul files are updated
- #
--_HCCCOM=	$(OARCH:%-gcc=gcc)
--HCCCOM=		$(_HCCCOM:%-cc=cc)
-+HCCCOM=		$(C_ARCH)
- 
- _CCCOM=		$(_UNIQ)$(CCCOM)
- __CCCOM=	$(_CCCOM:$(_UNIQ)=$(HCCCOM))
diff --git a/sysutils/cdrdao/files/patch-xdao::Project.h b/sysutils/cdrdao/files/patch-xdao::Project.h
deleted file mode 100644
index 69819b19d3f6..000000000000
--- a/sysutils/cdrdao/files/patch-xdao::Project.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- xdao/Project.h.orig	12 Feb 2004 01:13:32 -0000	1.11
-+++ xdao/Project.h	4 Jun 2004 21:52:40 -0000	1.11.2.1
-@@ -51,14 +51,12 @@
-   virtual void createToolbar() = 0;
-   virtual void createStatusbar();
-   void updateWindowTitle();
--  void saveProject();
-   void saveAsProject();
-   Gtk::FileSelection *saveFileSelector_;
-   void saveFileSelectorOKCB();
-   void saveFileSelectorCancelCB();
- 
-   virtual bool on_delete_event(GdkEventAny *event);
--  virtual void recordToc2CD() = 0;
-   virtual void projectInfo() = 0;
- 
- public:
-@@ -67,7 +65,9 @@
-   void readToc(char *name);
-   void statusMessage(const char *fmt, ...);
-   void tocBlockedMsg(const char *);
--  virtual bool closeProject() = 0;
-+  virtual bool closeProject() = 0; 
-+  virtual void saveProject();
-+  virtual void recordToc2CD() = 0;
-   int projectNumber();
-   TocEdit *tocEdit();
-   gint getViewNumber();