aboutsummaryrefslogtreecommitdiff
path: root/devel/ice/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/ice/files')
-rw-r--r--devel/ice/files/patch-Makefile27
-rw-r--r--devel/ice/files/patch-include::IceUtil::Config.h11
-rw-r--r--devel/ice/files/patch-src::Ice::Network.cpp20
-rw-r--r--devel/ice/files/patch-src::icecpp::config.h17
4 files changed, 37 insertions, 38 deletions
diff --git a/devel/ice/files/patch-Makefile b/devel/ice/files/patch-Makefile
index b0099528c0cf..46f3411d4c2c 100644
--- a/devel/ice/files/patch-Makefile
+++ b/devel/ice/files/patch-Makefile
@@ -1,25 +1,14 @@
---- Makefile.orig Tue Jul 5 19:58:47 2005
-+++ Makefile Tue Jul 5 19:59:39 2005
-@@ -44,11 +44,13 @@
- $(call mkdir,$(install_slicedir)) ; \
- fi
-
-+ifndef NOPORTDOCS
- @if test ! -d $(install_docdir) ; \
- then \
- echo "Creating $(install_docdir)..." ; \
- $(call mkdir,$(install_docdir)) ; \
- fi
-+endif
-
- $(EVERYTHING)::
- @for subdir in $(SUBDIRS); \
-@@ -61,9 +63,11 @@
+--- Makefile.orig Tue Jul 26 23:32:00 2005
++++ Makefile Thu Nov 17 10:15:57 2005
+@@ -43,12 +43,14 @@
@( cd doc && $(MAKE) ) || exit 1
install::
+ifndef NOPORTDOCS
- @( cd doc && $(MAKE) install ) || exit 1
+ @if test -d doc ; \
+ then \
+ ( cd doc && $(MAKE) install ) || exit 1 ; \
+ fi
- $(call installdata,ICE_LICENSE,$(prefix))
- $(call installdata,LICENSE,$(prefix))
+ $(call installdata,ICE_LICENSE,$(install_docdir))
@@ -27,4 +16,4 @@
+endif
clean::
- @( cd doc && $(MAKE) clean ) || exit 1
+ @if test -d doc ; \
diff --git a/devel/ice/files/patch-include::IceUtil::Config.h b/devel/ice/files/patch-include::IceUtil::Config.h
deleted file mode 100644
index 235ee4e818be..000000000000
--- a/devel/ice/files/patch-include::IceUtil::Config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/IceUtil/Config.h.orig Thu Jul 22 01:21:08 2004
-+++ include/IceUtil/Config.h Tue Jul 27 16:16:48 2004
-@@ -16,7 +16,7 @@
- // Most CPUs support only one endianness, with the notable exceptions
- // of Itanium (IA64) and MIPS.
- //
--#if defined(__i386) || defined(_M_IX86) || defined (__x86_64)
-+#if defined(__i386) || defined(_M_IX86) || defined (__x86_64) || defined(__alpha__)
- # define ICE_LITTLE_ENDIAN
- #elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || defined(__ppc__) || defined(_ARCH_COM)
- # define ICE_BIG_ENDIAN
diff --git a/devel/ice/files/patch-src::Ice::Network.cpp b/devel/ice/files/patch-src::Ice::Network.cpp
new file mode 100644
index 000000000000..3189931d7844
--- /dev/null
+++ b/devel/ice/files/patch-src::Ice::Network.cpp
@@ -0,0 +1,20 @@
+--- src/Ice/Network.cpp.orig Tue Oct 18 16:18:39 2005
++++ src/Ice/Network.cpp Thu Nov 17 15:00:25 2005
+@@ -275,7 +275,7 @@
+ {
+ return;
+ }
+-#elif defined(__APPLE__)
++#elif (defined(__APPLE__) || defined(__FreeBSD__))
+ if(errno == ENOTCONN || errno == EINVAL)
+ {
+ return;
+@@ -306,7 +306,7 @@
+ {
+ return;
+ }
+-#elif defined(__APPLE__)
++#elif (defined(__APPLE__) || defined(__FreeBSD__))
+ if(errno == ENOTCONN || errno == EINVAL)
+ {
+ return;
diff --git a/devel/ice/files/patch-src::icecpp::config.h b/devel/ice/files/patch-src::icecpp::config.h
index 14c32a505917..32a5bee093a0 100644
--- a/devel/ice/files/patch-src::icecpp::config.h
+++ b/devel/ice/files/patch-src::icecpp::config.h
@@ -1,11 +1,12 @@
---- src/icecpp/config.h.orig Wed Feb 16 21:22:23 2005
-+++ src/icecpp/config.h Wed Jun 8 12:28:58 2005
-@@ -56,7 +56,7 @@
- #define LONG_TYPE_SIZE 4
+--- src/icecpp/config.h.orig Thu Sep 22 18:01:13 2005
++++ src/icecpp/config.h Thu Nov 17 10:50:07 2005
+@@ -72,7 +72,8 @@
#if defined(_WIN32)
# define WCHAR_TYPE_SIZE 2
--#elif (defined(__linux) || defined(__FreeBSD__)) && (defined(__i386) || defined(__x86_64) || defined(__sparc)) \
-+#elif (defined(__linux) || defined(__FreeBSD__)) && (defined(__i386) || defined(__x86_64) || defined(__sparc) || defined(__alpha__) || defined(__powerpc__)) \
- || defined (__sun) || defined(__hpux) || defined(__APPLE__) || defined(_AIX)
+ #elif (defined(__linux) || defined(__FreeBSD__)) && \
+- (defined(__i386) || defined(__x86_64) || defined(__sparc)) || \
++ (defined(__i386) || defined(__x86_64) || defined(__sparc) || \
++ defined(__alpha__) || defined(__powerpc__)) || \
+ defined (__sun) || defined(__hpux) || defined(__APPLE__) || \
+ defined(_AIX) || defined(__osf1__)
# define WCHAR_TYPE_SIZE 4
- #else