diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2011-06-28 13:44:00 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2011-06-28 13:44:00 +0000 |
| commit | 495354adda3a5d29c3ffd9fd27ade82b65fd1961 (patch) | |
| tree | b09bacc5a49b1d5763f3cdc6cbbdb6b1aed052fc /devel/ice/files | |
| parent | 1ee5889ab0e3e922c9d578ec94bf1d82dfb3bc72 (diff) | |
| download | ports-495354adda3a5d29c3ffd9fd27ade82b65fd1961.tar.gz ports-495354adda3a5d29c3ffd9fd27ade82b65fd1961.zip | |
- Update to 3.4.2
PR: 157947
Submitted by: Michael Gmelin <freebsd@grem.de>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=276568
Diffstat (limited to 'devel/ice/files')
| -rw-r--r-- | devel/ice/files/patch-Exception.cpp | 38 | ||||
| -rw-r--r-- | devel/ice/files/patch-IconvStringConverter.h | 11 | ||||
| -rw-r--r-- | devel/ice/files/patch-Makefile | 2 |
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 |