aboutsummaryrefslogtreecommitdiff
path: root/devel/ice/files
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2007-04-18 20:52:20 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2007-04-18 20:52:20 +0000
commit0abaa32122c0e00306e96a5447033ad36e4347cb (patch)
treec96cd33db7ca8161d39e1098983908c7b0e7758f /devel/ice/files
parent37b2dd27bd258dad8c65cc179ecb94f39eef480e (diff)
downloadports-0abaa32122c0e00306e96a5447033ad36e4347cb.tar.gz
ports-0abaa32122c0e00306e96a5447033ad36e4347cb.zip
- Update to 3.2.0
PR: ports/111541 Submitted by: Stefan Ehmann <shoesoft@gmx.net> (maintainer)
Notes
Notes: svn path=/head/; revision=190309
Diffstat (limited to 'devel/ice/files')
-rw-r--r--devel/ice/files/patch-Make.rules26
-rw-r--r--devel/ice/files/patch-src::Ice::Network.cpp24
2 files changed, 24 insertions, 26 deletions
diff --git a/devel/ice/files/patch-Make.rules b/devel/ice/files/patch-Make.rules
index 0605c684dba6..8ff7446b840c 100644
--- a/devel/ice/files/patch-Make.rules
+++ b/devel/ice/files/patch-Make.rules
@@ -1,15 +1,13 @@
---- config/Make.rules.orig Sat Aug 5 16:29:46 2006
-+++ config/Make.rules Sat Aug 5 16:29:51 2006
-@@ -166,9 +166,9 @@
- BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
- BZIP2_RPATH_LINK = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
+--- config/Make.rules.orig Fri Mar 9 00:16:54 2007
++++ config/Make.rules Fri Apr 13 20:05:04 2007
+@@ -188,7 +188,9 @@
+ DB_FLAGS = -I/usr/include/db45
+ DB_LIBS = -L/usr/$(libsubdir)/db45 -ldb_cxx
+ else
+- DB_LIBS = -ldb_cxx
++ DB_FLAGS = -I%%BDB_INCLUDE_DIR%%
++ DB_LIBS = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
++ DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%)
+ endif
+ endif
--DB_FLAGS = $(if $(DB_HOME),-I$(DB_HOME)/include)
--DB_LIBS = $(if $(DB_HOME),-L$(DB_HOME)/$(libsubdir)) -ldb_cxx
--DB_RPATH_LINK = $(if $(DB_HOME),$(call rpathlink,$(DB_HOME)/$(libsubdir)))
-+DB_FLAGS = -I%%BDB_INCLUDE_DIR%%
-+DB_LIBS = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
-+DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%)
-
- EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
- EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
diff --git a/devel/ice/files/patch-src::Ice::Network.cpp b/devel/ice/files/patch-src::Ice::Network.cpp
index 3189931d7844..3bba8098706f 100644
--- a/devel/ice/files/patch-src::Ice::Network.cpp
+++ b/devel/ice/files/patch-src::Ice::Network.cpp
@@ -1,20 +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;
- }
+ {
+ return;
+ }
-#elif defined(__APPLE__)
+#elif (defined(__APPLE__) || defined(__FreeBSD__))
- if(errno == ENOTCONN || errno == EINVAL)
- {
- return;
+ if(errno == ENOTCONN || errno == EINVAL)
+ {
+ return;
@@ -306,7 +306,7 @@
- {
- return;
- }
+ {
+ return;
+ }
-#elif defined(__APPLE__)
+#elif (defined(__APPLE__) || defined(__FreeBSD__))
- if(errno == ENOTCONN || errno == EINVAL)
- {
- return;
+ if(errno == ENOTCONN || errno == EINVAL)
+ {
+ return;