aboutsummaryrefslogtreecommitdiff
path: root/devel/ice/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/ice/files')
-rw-r--r--devel/ice/files/patch-Exception.cpp38
-rw-r--r--devel/ice/files/patch-IconvStringConverter.h11
-rw-r--r--devel/ice/files/patch-Makefile2
3 files changed, 1 insertions, 50 deletions
diff --git a/devel/ice/files/patch-Exception.cpp b/devel/ice/files/patch-Exception.cpp
deleted file mode 100644
index 0cbc7df63949..000000000000
--- a/devel/ice/files/patch-Exception.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- cpp/src/IceUtil/Exception.cpp.orig 2010-02-25 16:55:42.000000000 +0100
-+++ cpp/src/IceUtil/Exception.cpp 2010-05-16 14:32:45.000000000 +0200
-@@ -14,7 +14,7 @@
- #include <ostream>
- #include <cstdlib>
-
--#if defined(__GNUC__) && !defined(__sun)
-+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__)
- # include <execinfo.h>
- # include <cxxabi.h>
- #endif
-@@ -52,7 +52,7 @@
-
- Init init;
-
--#if defined(__GNUC__) && !defined(__sun)
-+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__)
- string
- getStackTrace()
- {
-@@ -183,7 +183,7 @@
- IceUtil::Exception::Exception() :
- _file(0),
- _line(0)
--#if defined(__GNUC__) && !defined(__sun)
-+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__)
- , _stackTrace(getStackTrace())
- #endif
- {
-@@ -192,7 +192,7 @@
- IceUtil::Exception::Exception(const char* file, int line) :
- _file(file),
- _line(line)
--#if defined(__GNUC__) && !defined(__sun)
-+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__)
- , _stackTrace(getStackTrace())
- #endif
- {
diff --git a/devel/ice/files/patch-IconvStringConverter.h b/devel/ice/files/patch-IconvStringConverter.h
deleted file mode 100644
index 454f9e8bf99d..000000000000
--- a/devel/ice/files/patch-IconvStringConverter.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp/include/Ice/IconvStringConverter.h.orig 2008-05-22 19:27:55.000000000 +0200
-+++ cpp/include/Ice/IconvStringConverter.h 2008-05-22 19:28:22.000000000 +0200
-@@ -19,7 +19,7 @@
- #include <langinfo.h>
- #endif
-
--#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || (defined(__sun) && !defined(_XPG6))
-+#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || (defined(__sun) && !defined(_XPG6)) || defined(__FreeBSD__)
- //
- // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962
- //
diff --git a/devel/ice/files/patch-Makefile b/devel/ice/files/patch-Makefile
index ae1aa81e0b31..0717c8e8589a 100644
--- a/devel/ice/files/patch-Makefile
+++ b/devel/ice/files/patch-Makefile
@@ -4,7 +4,7 @@
include $(top_srcdir)/config/Make.rules
SUBDIRS = config src include test demo
-+ifneq ($(NOPORTDOCS),yes)
++ifeq ($(NOPORTDOCS),)
+SUBDIRS += doc
+endif