aboutsummaryrefslogtreecommitdiff
path: root/devel/ice/files
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-08-14 22:28:54 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-08-14 22:28:54 +0000
commitf0000681746c861b50020b459d0d0d2cfcf0be8a (patch)
treedd2fbbcf910a8c52a3002fd51e90860107f237a9 /devel/ice/files
parent2e6153f64fc8c34f093fe8996451422c88ec97bc (diff)
downloadports-f0000681746c861b50020b459d0d0d2cfcf0be8a.tar.gz
ports-f0000681746c861b50020b459d0d0d2cfcf0be8a.zip
- Update to 3.3.0
PR: 126195 126197 126198 Submitted by: Stefan Ehmann <shoesoft@gmx.net> (maintainer)
Notes
Notes: svn path=/head/; revision=218562
Diffstat (limited to 'devel/ice/files')
-rw-r--r--devel/ice/files/Make.rules.FreeBSD5
-rw-r--r--devel/ice/files/patch-IconvStringConverter.h11
-rw-r--r--devel/ice/files/patch-Make.rules5
-rw-r--r--devel/ice/files/patch-Makefile31
-rw-r--r--devel/ice/files/patch-SignalHandler.cpp28
-rw-r--r--devel/ice/files/patch-src::Ice::Network.cpp20
6 files changed, 51 insertions, 49 deletions
diff --git a/devel/ice/files/Make.rules.FreeBSD b/devel/ice/files/Make.rules.FreeBSD
index 88b32dd96100..00b9543ba1cf 100644
--- a/devel/ice/files/Make.rules.FreeBSD
+++ b/devel/ice/files/Make.rules.FreeBSD
@@ -1,6 +1,6 @@
mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
-BASELIBS = -lIceUtil %%PTHREAD_LIBS%%
+BASELIBS = -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv
LIBS = -lIce $(BASELIBS)
ICEUTIL_OS_LIBS = %%PTHREAD_LIBS%%
@@ -10,9 +10,12 @@ PLATFORM_HAS_READLINE := yes
export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH)
lp64suffix =
+create_runpath_symlink = no
prefix = %%PREFIX%%
install_slicedir = %%DATADIR%%
+install_configdir = %%DATADIR%%/config
install_docdir = %%DOCSDIR%%
EXPAT_HOME = $(LOCALBASE)
INSTALL = %%INSTALL_DATA%%
INSTALL_PROGRAM = %%INSTALL_PROGRAM%%
+MCPP_HOME = $(LOCALBASE)
diff --git a/devel/ice/files/patch-IconvStringConverter.h b/devel/ice/files/patch-IconvStringConverter.h
new file mode 100644
index 000000000000..454f9e8bf99d
--- /dev/null
+++ b/devel/ice/files/patch-IconvStringConverter.h
@@ -0,0 +1,11 @@
+--- 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-Make.rules b/devel/ice/files/patch-Make.rules
index 8ff7446b840c..6808d132034d 100644
--- a/devel/ice/files/patch-Make.rules
+++ b/devel/ice/files/patch-Make.rules
@@ -1,5 +1,5 @@
---- config/Make.rules.orig Fri Mar 9 00:16:54 2007
-+++ config/Make.rules Fri Apr 13 20:05:04 2007
+--- cpp/config/Make.rules.orig Fri Mar 9 00:16:54 2007
++++ cpp/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
@@ -10,4 +10,3 @@
+ DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%)
endif
endif
-
diff --git a/devel/ice/files/patch-Makefile b/devel/ice/files/patch-Makefile
index d6dda1c87496..ae1aa81e0b31 100644
--- a/devel/ice/files/patch-Makefile
+++ b/devel/ice/files/patch-Makefile
@@ -1,31 +1,12 @@
---- Makefile.orig Wed Aug 8 21:00:54 2007
-+++ Makefile Fri Sep 14 12:30:38 2007
-@@ -11,7 +11,10 @@
-
+--- cpp/Makefile.bak 2008-05-16 19:24:00.000000000 +0200
++++ cpp/Makefile 2008-07-31 13:37:25.000000000 +0200
+@@ -12,6 +12,9 @@
include $(top_srcdir)/config/Make.rules
--SUBDIRS = config src include test demo slice doc
-+SUBDIRS = config src include test demo slice
-+ifndef NOPORTDOCS
+ SUBDIRS = config src include test demo
++ifneq ($(NOPORTDOCS),yes)
+SUBDIRS += doc
+endif
- INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir)
-
-@@ -51,12 +54,14 @@
- @( cd doc && $(MAKE) ) || exit 1
-
- install::
-+ifndef NOPORTDOCS
- @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))
-+ $(call installdata,LICENSE,$(install_docdir))
-+endif
+ INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
- clean::
- @if test -d doc ; \
diff --git a/devel/ice/files/patch-SignalHandler.cpp b/devel/ice/files/patch-SignalHandler.cpp
new file mode 100644
index 000000000000..34c70d5a1879
--- /dev/null
+++ b/devel/ice/files/patch-SignalHandler.cpp
@@ -0,0 +1,28 @@
+--- cpp/src/Slice/SignalHandler.cpp.orig 2008-05-22 18:55:20.000000000 +0200
++++ cpp/src/Slice/SignalHandler.cpp 2008-05-22 18:55:38.000000000 +0200
+@@ -52,9 +52,9 @@
+ #ifdef _WIN32
+ SetConsoleCtrlHandler(signalHandler, TRUE);
+ #else
+- sigset(SIGHUP, signalHandler);
+- sigset(SIGINT, signalHandler);
+- sigset(SIGQUIT, signalHandler);
++ signal(SIGHUP, signalHandler);
++ signal(SIGINT, signalHandler);
++ signal(SIGQUIT, signalHandler);
+ #endif
+ }
+
+@@ -63,9 +63,9 @@
+ #ifdef _WIN32
+ SetConsoleCtrlHandler(signalHandler, FALSE);
+ #else
+- sigset(SIGHUP, SIG_DFL);
+- sigset(SIGINT, SIG_DFL);
+- sigset(SIGQUIT, SIG_DFL);
++ signal(SIGHUP, SIG_DFL);
++ signal(SIGINT, SIG_DFL);
++ signal(SIGQUIT, SIG_DFL);
+ #endif
+
+ _fileList.clear();
diff --git a/devel/ice/files/patch-src::Ice::Network.cpp b/devel/ice/files/patch-src::Ice::Network.cpp
deleted file mode 100644
index 3bba8098706f..000000000000
--- a/devel/ice/files/patch-src::Ice::Network.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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;