Fix build on -current.

PR:		54075
Submitted by:	Georg-W. Koltermann <Georg.Koltermann@mscsoftware.com>

5 files changed, 69 insertions, 4 deletions

diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index 5d6ea2e99949..d2e23b2adccb 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -31,10 +31,6 @@ WRKSRC=	${WRKDIR}/xxdiff-${PORTVERSION}/src
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 do-build:
 	(cd ${WRKSRC}; ${SETENV} ${TMAKEENV} tmake -o Makefile xxdiff.pro)
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
diff --git a/textproc/xxdiff/files/patch-builderDirs2.cpp b/textproc/xxdiff/files/patch-builderDirs2.cpp
new file mode 100644
index 000000000000..561b29eaf48d
--- /dev/null
+++ b/textproc/xxdiff/files/patch-builderDirs2.cpp
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- builderDirs2.cpp.orig	Mon Jun 30 17:32:25 2003
++++ builderDirs2.cpp	Mon Jun 30 17:32:46 2003
+@@ -94,6 +94,8 @@
+       const char* buf
+    );
+ 
++  ~XxParseDiffError() throw() { }
++
+ };
+ 
+ /*==============================================================================
diff --git a/textproc/xxdiff/files/patch-builderFiles2.cpp b/textproc/xxdiff/files/patch-builderFiles2.cpp
new file mode 100644
index 000000000000..6b8da63d6532
--- /dev/null
+++ b/textproc/xxdiff/files/patch-builderFiles2.cpp
@@ -0,0 +1,14 @@
+$FreeBSD$
+
+--- builderFiles2.cpp~	Tue Nov  6 07:30:32 2001
++++ builderFiles2.cpp	Mon Jun 30 17:40:21 2003
+@@ -150,6 +150,8 @@
+       const XxFln f2n2 
+    );
+ 
++  ~XxParseDiffError() throw() { }
++
+ };
+ 
+ //------------------------------------------------------------------------------
+
diff --git a/textproc/xxdiff/files/patch-builderFiles3.cpp b/textproc/xxdiff/files/patch-builderFiles3.cpp
new file mode 100644
index 000000000000..b5903c4d7088
--- /dev/null
+++ b/textproc/xxdiff/files/patch-builderFiles3.cpp
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- builderFiles3.cpp.orig	Mon Jun 30 17:31:39 2003
++++ builderFiles3.cpp	Mon Jun 30 17:32:00 2003
+@@ -73,6 +73,8 @@
+       const XxFln f3n2 
+    );
+ 
++  ~XxParseDiffError() throw() { }
++
+ };
+ 
+ //------------------------------------------------------------------------------
diff --git a/textproc/xxdiff/files/patch-exceptions.h b/textproc/xxdiff/files/patch-exceptions.h
new file mode 100644
index 000000000000..002255371cdf
--- /dev/null
+++ b/textproc/xxdiff/files/patch-exceptions.h
@@ -0,0 +1,29 @@
+$FreeBSD$
+
+--- exceptions.h.orig	Mon Jun 30 17:27:19 2003
++++ exceptions.h	Mon Jun 30 17:29:00 2003
+@@ -116,6 +116,8 @@
+    // Returns true if this is a benine exception.
+    bool isBenine() const;
+ 
++   ~XxUsageError() throw() { }
++
+ private:
+ 
+    /*----- data members -----*/
+@@ -142,6 +144,7 @@
+       const QString& msg = QString::null // use errno string only.
+    );
+ 
++   ~XxIoError() throw() { }
+ };
+ 
+ /*==============================================================================
+@@ -161,6 +164,8 @@
+    XxInternalError( 
+       XX_EXC_PARAMS_DECL(file,line)
+    );
++
++   ~XxInternalError() throw() { }
+ 
+ };