Attachment #116040 for bug #157947

Lines 6-14 Link Here

(-)ice/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= Ice	8	PORTNAME= Ice
9	PORTVERSION= 3.4.1	9	PORTVERSION= 3.4.2
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://www.zeroc.com/download/Ice/3.4/	11	MASTER_SITES= http://download.zeroc.com/Ice/3.4/
12		12
13	MAINTAINER= shoesoft@gmx.net	13	MAINTAINER= shoesoft@gmx.net
14	COMMENT= A modern alternative to object middleware such as CORBA/COM/DCOM/COM+	14	COMMENT= A modern alternative to object middleware such as CORBA/COM/DCOM/COM+

Lines 1-3 Link Here

(-)ice/distinfo (-3 / +2 lines)
1	MD5 (Ice-3.4.1.tar.gz) = 3aae42aa47dec74bb258c1a1b2847a1a	1	SHA256 (Ice-3.4.2.tar.gz) = dcf0484495b6df0849ec90a00e8204fe5fe1c0d3882bb438bf2c1d062f15c979
2	SHA256 (Ice-3.4.1.tar.gz) = 83c76687ac2b1c16a7e51799668531ec794dc8bd81f0daec14765ad3c671b0e6	2	SIZE (Ice-3.4.2.tar.gz) = 5485106
3	SIZE (Ice-3.4.1.tar.gz) = 5263510




--- 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
 {

Lines 1-11 Link Here

(-)ice/files/patch-IconvStringConverter.h (-11 lines)
1	--- cpp/include/Ice/IconvStringConverter.h.orig 2008-05-22 19:27:55.000000000 +0200
2	+++ cpp/include/Ice/IconvStringConverter.h 2008-05-22 19:28:22.000000000 +0200
3	@@ -19,7 +19,7 @@
4	#include <langinfo.h>
5	#endif
6
7	-#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) \|\| (defined(__sun) && !defined(_XPG6))
8	+#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) \|\| (defined(__sun) && !defined(_XPG6)) \|\| defined(__FreeBSD__)
9	//
10	// See http://sourceware.org/bugzilla/show_bug.cgi?id=2962
11	//

Lines 4-10 Link Here

(-)ice/files/patch-Makefile (-1 / +1 lines)
4	include $(top_srcdir)/config/Make.rules	4	include $(top_srcdir)/config/Make.rules
5		5
6	SUBDIRS = config src include test demo	6	SUBDIRS = config src include test demo
7	+ifneq ($(NOPORTDOCS),yes)	7	+ifeq ($(NOPORTDOCS),)
8	+SUBDIRS += doc	8	+SUBDIRS += doc
9	+endif	9	+endif
10		10

Lines 3-5 Link Here

(-)ice/pkg-descr (+2 lines)
3	provides a powerful network infrastructure for demanding technical applications.	3	provides a powerful network infrastructure for demanding technical applications.
4	Ice shines where technologies such as SOAP or XML-RPC are too slow, or do not	4	Ice shines where technologies such as SOAP or XML-RPC are too slow, or do not
5	provide sufficient scalability or security.	5	provide sufficient scalability or security.
		6
		7	WWW: http://www.zeroc.com/




include/IceGrid/IceGrid.h
include/IceGrid/Locator.h
include/IceGrid/Observer.h
include/IceGrid/Perf.h
include/IceGrid/Query.h
include/IceGrid/Registry.h
include/IceGrid/Session.h

include/Slice/Util.h
lib/ImportKey.class
lib/libFreeze.so
lib/libFreeze.so.3.4.2
lib/libFreeze.so.34
lib/libGlacier2.so
lib/libGlacier2.so.3.4.2
lib/libGlacier2.so.34
lib/libIce.so
lib/libIce.so.3.4.2
lib/libIce.so.34
lib/libIceBox.so
lib/libIceBox.so.3.4.2
lib/libIceBox.so.34
lib/libIceDB.so
lib/libIceDB.so.3.4.2
lib/libIceDB.so.34
lib/libIceGrid.so
lib/libIceGrid.so.3.4.2
lib/libIceGrid.so.34
lib/libIceGridFreezeDB.so
lib/libIceGridFreezeDB.so.3.4.2
lib/libIceGridFreezeDB.so.34
lib/libIcePatch2.so
lib/libIcePatch2.so.3.4.2
lib/libIcePatch2.so.34
lib/libIceSSL.so
lib/libIceSSL.so.3.4.2
lib/libIceSSL.so.34
lib/libIceStorm.so
lib/libIceStorm.so.3.4.2
lib/libIceStorm.so.34
lib/libIceStormFreezeDB.so
lib/libIceStormFreezeDB.so.3.4.2
lib/libIceStormFreezeDB.so.34
lib/libIceStormService.so
lib/libIceStormService.so.3.4.2
lib/libIceStormService.so.34
lib/libIceUtil.so
lib/libIceUtil.so.3.4.2
lib/libIceUtil.so.34
lib/libIceXML.so
lib/libIceXML.so.3.4.2
lib/libIceXML.so.34
lib/libSlice.so
lib/libSlice.so.3.4.2
lib/libSlice.so.34
%%DATADIR%%/Freeze/BackgroundSaveEvictor.ice
%%DATADIR%%/Freeze/CatalogData.ice

%%PORTDOCS%%%%DOCSDIR%%/reference/images/warning.gif
%%PORTDOCS%%%%DOCSDIR%%/reference/index.html
%%PORTDOCS%%%%DOCSDIR%%/reference/symboltree.js
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceStorm
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceSSL
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IcePatch2
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceGrid
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceBox
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Ice
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Glacier2
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Freeze
%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/config
@dirrm %%DATADIR%%/IceStorm
@dirrm %%DATADIR%%/IceSSL

Return to bug 157947

Lines 147-153 Link Here

(-)ice/pkg-plist (-27 / +26 lines)
147	include/IceGrid/IceGrid.h	147	include/IceGrid/IceGrid.h
148	include/IceGrid/Locator.h	148	include/IceGrid/Locator.h
149	include/IceGrid/Observer.h	149	include/IceGrid/Observer.h
150	include/IceGrid/Perf.h
151	include/IceGrid/Query.h	150	include/IceGrid/Query.h
152	include/IceGrid/Registry.h	151	include/IceGrid/Registry.h
153	include/IceGrid/Session.h	152	include/IceGrid/Session.h
Lines 212-260 Link Here
212	include/Slice/Util.h	211	include/Slice/Util.h
213	lib/ImportKey.class	212	lib/ImportKey.class
214	lib/libFreeze.so	213	lib/libFreeze.so
215	lib/libFreeze.so.3.4.1	214	lib/libFreeze.so.3.4.2
216	lib/libFreeze.so.34	215	lib/libFreeze.so.34
217	lib/libGlacier2.so	216	lib/libGlacier2.so
218	lib/libGlacier2.so.3.4.1	217	lib/libGlacier2.so.3.4.2
219	lib/libGlacier2.so.34	218	lib/libGlacier2.so.34
220	lib/libIce.so	219	lib/libIce.so
221	lib/libIce.so.3.4.1	220	lib/libIce.so.3.4.2
222	lib/libIce.so.34	221	lib/libIce.so.34
223	lib/libIceBox.so	222	lib/libIceBox.so
224	lib/libIceBox.so.3.4.1	223	lib/libIceBox.so.3.4.2
225	lib/libIceBox.so.34	224	lib/libIceBox.so.34
226	lib/libIceDB.so	225	lib/libIceDB.so
227	lib/libIceDB.so.3.4.1	226	lib/libIceDB.so.3.4.2
228	lib/libIceDB.so.34	227	lib/libIceDB.so.34
229	lib/libIceGrid.so	228	lib/libIceGrid.so
230	lib/libIceGrid.so.3.4.1	229	lib/libIceGrid.so.3.4.2
231	lib/libIceGrid.so.34	230	lib/libIceGrid.so.34
232	lib/libIceGridFreezeDB.so	231	lib/libIceGridFreezeDB.so
233	lib/libIceGridFreezeDB.so.3.4.1	232	lib/libIceGridFreezeDB.so.3.4.2
234	lib/libIceGridFreezeDB.so.34	233	lib/libIceGridFreezeDB.so.34
235	lib/libIcePatch2.so	234	lib/libIcePatch2.so
236	lib/libIcePatch2.so.3.4.1	235	lib/libIcePatch2.so.3.4.2
237	lib/libIcePatch2.so.34	236	lib/libIcePatch2.so.34
238	lib/libIceSSL.so	237	lib/libIceSSL.so
239	lib/libIceSSL.so.3.4.1	238	lib/libIceSSL.so.3.4.2
240	lib/libIceSSL.so.34	239	lib/libIceSSL.so.34
241	lib/libIceStorm.so	240	lib/libIceStorm.so
242	lib/libIceStorm.so.3.4.1	241	lib/libIceStorm.so.3.4.2
243	lib/libIceStorm.so.34	242	lib/libIceStorm.so.34
244	lib/libIceStormFreezeDB.so	243	lib/libIceStormFreezeDB.so
245	lib/libIceStormFreezeDB.so.3.4.1	244	lib/libIceStormFreezeDB.so.3.4.2
246	lib/libIceStormFreezeDB.so.34	245	lib/libIceStormFreezeDB.so.34
247	lib/libIceStormService.so	246	lib/libIceStormService.so
248	lib/libIceStormService.so.3.4.1	247	lib/libIceStormService.so.3.4.2
249	lib/libIceStormService.so.34	248	lib/libIceStormService.so.34
250	lib/libIceUtil.so	249	lib/libIceUtil.so
251	lib/libIceUtil.so.3.4.1	250	lib/libIceUtil.so.3.4.2
252	lib/libIceUtil.so.34	251	lib/libIceUtil.so.34
253	lib/libIceXML.so	252	lib/libIceXML.so
254	lib/libIceXML.so.3.4.1	253	lib/libIceXML.so.3.4.2
255	lib/libIceXML.so.34	254	lib/libIceXML.so.34
256	lib/libSlice.so	255	lib/libSlice.so
257	lib/libSlice.so.3.4.1	256	lib/libSlice.so.3.4.2
258	lib/libSlice.so.34	257	lib/libSlice.so.34
259	%%DATADIR%%/Freeze/BackgroundSaveEvictor.ice	258	%%DATADIR%%/Freeze/BackgroundSaveEvictor.ice
260	%%DATADIR%%/Freeze/CatalogData.ice	259	%%DATADIR%%/Freeze/CatalogData.ice
Lines 586-602 Link Here
586	%%PORTDOCS%%%%DOCSDIR%%/reference/images/warning.gif	585	%%PORTDOCS%%%%DOCSDIR%%/reference/images/warning.gif
587	%%PORTDOCS%%%%DOCSDIR%%/reference/index.html	586	%%PORTDOCS%%%%DOCSDIR%%/reference/index.html
588	%%PORTDOCS%%%%DOCSDIR%%/reference/symboltree.js	587	%%PORTDOCS%%%%DOCSDIR%%/reference/symboltree.js
589	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference/images	588	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/images
590	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference/IceStorm	589	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceStorm
591	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference/IceSSL	590	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceSSL
592	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference/IcePatch2	591	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IcePatch2
593	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference/IceGrid	592	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceGrid
594	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference/IceBox	593	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/IceBox
595	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference/Ice	594	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Ice
596	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference/Glacier2	595	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Glacier2
597	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference/Freeze	596	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/Freeze
598	@dirrm %%PORTDOCS%%%%DOCSDIR%%/reference	597	%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference
599	@dirrm %%PORTDOCS%%%%DOCSDIR%%	598	%%PORTDOCS%%@dirrm %%DOCSDIR%%
600	@dirrm %%DATADIR%%/config	599	@dirrm %%DATADIR%%/config
601	@dirrm %%DATADIR%%/IceStorm	600	@dirrm %%DATADIR%%/IceStorm
602	@dirrm %%DATADIR%%/IceSSL	601	@dirrm %%DATADIR%%/IceSSL

Lines 1-38 Link Here

(-)ice/files/patch-Exception.cpp (-38 lines)
1	--- cpp/src/IceUtil/Exception.cpp.orig 2010-02-25 16:55:42.000000000 +0100
2	+++ cpp/src/IceUtil/Exception.cpp 2010-05-16 14:32:45.000000000 +0200
3	@@ -14,7 +14,7 @@
4	#include <ostream>
5	#include <cstdlib>
6
7	-#if defined(__GNUC__) && !defined(__sun)
8	+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__)
9	# include <execinfo.h>
10	# include <cxxabi.h>
11	#endif
12	@@ -52,7 +52,7 @@
13
14	Init init;
15
16	-#if defined(__GNUC__) && !defined(__sun)
17	+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__)
18	string
19	getStackTrace()
20	{
21	@@ -183,7 +183,7 @@
22	IceUtil::Exception::Exception() :
23	_file(0),
24	_line(0)
25	-#if defined(__GNUC__) && !defined(__sun)
26	+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__)
27	, _stackTrace(getStackTrace())
28	#endif
29	{
30	@@ -192,7 +192,7 @@
31	IceUtil::Exception::Exception(const char* file, int line) :
32	_file(file),
33	_line(line)
34	-#if defined(__GNUC__) && !defined(__sun)
35	+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__)
36	, _stackTrace(getStackTrace())
37	#endif
38	{