Date: Fri, 17 Jun 2011 17:00:24 GMT From: Michael Gmelin <freebsd@grem.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/157947: [PATCH] devel/Ice: update to 3.4.2 Message-ID: <201106171700.p5HH0Oo5010239@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/157947; it has been noted by GNATS. From: Michael Gmelin <freebsd@grem.de> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: Subject: Re: ports/157947: [PATCH] devel/Ice: update to 3.4.2 Date: Fri, 17 Jun 2011 18:57:19 +0200 --Apple-Mail-32--689842222 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On Jun 17, 2011, at 16:00, FreeBSD-gnats-submit@FreeBSD.org wrote: > Thank you very much for your problem report. > It has the internal identification `ports/157947'. > The individual assigned to look at your > report is: freebsd-ports-bugs.=20 >=20 > You can access the state of your problem report at any time > via this link: >=20 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D157947 >=20 >> Category: ports >> Responsible: freebsd-ports-bugs >> Synopsis: [PATCH] devel/Ice: update to 3.4.2 >> Arrival-Date: Fri Jun 17 14:00:24 UTC 2011 The patch I sent in the original PR was incomplete (pkg_plist hasn't = been changed properly). Supplied the maintainer with a complete version = of the patch: --Apple-Mail-32--689842222 Content-Disposition: attachment; filename=ice-update341to342final.patch.txt Content-Type: text/plain; name="ice-update341to342final.patch.txt" Content-Transfer-Encoding: quoted-printable =3D=3D=3D> Generating patch =3D=3D=3D> Viewing diff with less diff -ruN --exclude=3DCVS /usr/ports/devel/ice.orig/Makefile = /usr/ports/devel/ice/Makefile --- /usr/ports/devel/ice.orig/Makefile 2011-06-17 15:23:26.000000000 = +0200 +++ /usr/ports/devel/ice/Makefile 2011-06-17 13:00:01.000000000 = +0200 @@ -6,10 +6,9 @@ # =20 PORTNAME=3D Ice -PORTVERSION=3D 3.4.1 -PORTREVISION=3D 1 +PORTVERSION=3D 3.4.2 CATEGORIES=3D devel -MASTER_SITES=3D http://www.zeroc.com/download/Ice/3.4/ +MASTER_SITES=3D http://download.zeroc.com/Ice/3.4/ =20 MAINTAINER=3D shoesoft@gmx.net COMMENT=3D A modern alternative to object middleware such as = CORBA/COM/DCOM/COM+ diff -ruN --exclude=3DCVS /usr/ports/devel/ice.orig/distinfo = /usr/ports/devel/ice/distinfo --- /usr/ports/devel/ice.orig/distinfo 2011-06-17 15:23:26.000000000 = +0200 +++ /usr/ports/devel/ice/distinfo 2011-06-17 13:00:43.000000000 = +0200 @@ -1,3 +1,3 @@ -MD5 (Ice-3.4.1.tar.gz) =3D 3aae42aa47dec74bb258c1a1b2847a1a -SHA256 (Ice-3.4.1.tar.gz) =3D = 83c76687ac2b1c16a7e51799668531ec794dc8bd81f0daec14765ad3c671b0e6 -SIZE (Ice-3.4.1.tar.gz) =3D 5263510 +MD5 (Ice-3.4.2.tar.gz) =3D e97672eb4a63c6b8dd202d0773e19dc7 +SHA256 (Ice-3.4.2.tar.gz) =3D = dcf0484495b6df0849ec90a00e8204fe5fe1c0d3882bb438bf2c1d062f15c979 +SIZE (Ice-3.4.2.tar.gz) =3D 5485106 diff -ruN --exclude=3DCVS = /usr/ports/devel/ice.orig/files/patch-Exception.cpp = /usr/ports/devel/ice/files/patch-Exception.cpp --- /usr/ports/devel/ice.orig/files/patch-Exception.cpp 2011-06-17 = 15:23:26.000000000 +0200 +++ /usr/ports/devel/ice/files/patch-Exception.cpp 1970-01-01 = 01:00:00.000000000 +0100 @@ -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> -=20 --#if defined(__GNUC__) && !defined(__sun) -+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) - # include <execinfo.h> - # include <cxxabi.h> - #endif -@@ -52,7 +52,7 @@ -=20 - Init init; -=20 --#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 -ruN --exclude=3DCVS = /usr/ports/devel/ice.orig/files/patch-IconvStringConverter.h = /usr/ports/devel/ice/files/patch-IconvStringConverter.h --- /usr/ports/devel/ice.orig/files/patch-IconvStringConverter.h = 2011-06-17 15:23:26.000000000 +0200 +++ /usr/ports/devel/ice/files/patch-IconvStringConverter.h = 1970-01-01 01:00:00.000000000 +0100 @@ -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 -=20 --#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=3D2962 - // diff -ruN --exclude=3DCVS = /usr/ports/devel/ice.orig/files/patch-Network.h = /usr/ports/devel/ice/files/patch-Network.h --- /usr/ports/devel/ice.orig/files/patch-Network.h 2011-06-17 = 15:23:26.000000000 +0200 +++ /usr/ports/devel/ice/files/patch-Network.h 1970-01-01 = 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- cpp/src/Ice/Network.h.orig 2011-06-03 21:25:21.000000000 +0200 -+++ cpp/src/Ice/Network.h 2011-06-03 21:25:21.000000000 +0200 -@@ -36,7 +36,7 @@ -=20 - #if defined(__linux) && !defined(ICE_NO_EPOLL) - # define ICE_USE_EPOLL 1 --#elif defined(__APPLE__) && !defined(ICE_NO_KQUEUE) -+#elif (defined(__APPLE__) || defined(__FreeBSD__)) && = !defined(ICE_NO_KQUEUE) - # define ICE_USE_KQUEUE 1 - #elif defined(_WIN32) - # if !defined(ICE_NO_IOCP) diff -ruN --exclude=3DCVS = /usr/ports/devel/ice.orig/files/patch-PlatformInfo.cpp = /usr/ports/devel/ice/files/patch-PlatformInfo.cpp --- /usr/ports/devel/ice.orig/files/patch-PlatformInfo.cpp = 2011-06-17 15:23:26.000000000 +0200 +++ /usr/ports/devel/ice/files/patch-PlatformInfo.cpp 1970-01-01 = 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ ---- cpp/src/IceGrid/PlatformInfo.cpp.orig 2011-06-03 = 21:07:43.000000000 +0200 -+++ cpp/src/IceGrid/PlatformInfo.cpp 2011-06-03 21:07:43.000000000 = +0200 -@@ -24,7 +24,7 @@ - # include <pdhmsg.h> // For PDH_MORE_DATA - #else - # include <sys/utsname.h> --# if defined(__APPLE__) -+# if defined(__APPLE__) || defined(__FreeBSD__) - # include <sys/sysctl.h> - # elif defined(__sun) - # include <sys/loadavg.h> -@@ -222,7 +222,7 @@ - SYSTEM_INFO sysInfo; - GetSystemInfo(&sysInfo); - _nProcessors =3D sysInfo.dwNumberOfProcessors; --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - static int ncpu[2] =3D { CTL_HW, HW_NCPU }; - size_t sz =3D sizeof(_nProcessors); - if(sysctl(ncpu, 2, &_nProcessors, &sz, 0, 0) =3D=3D -1) -@@ -446,7 +446,7 @@ - info.avg1 =3D static_cast<float>(_last1Total) / _usages1.size() / = 100.0f; - info.avg5 =3D static_cast<float>(_last5Total) / _usages5.size() / = 100.0f; - info.avg15 =3D static_cast<float>(_last15Total) / _usages15.size() = / 100.0f; --#elif defined(__sun) || defined(__linux) || defined(__APPLE__) -+#elif defined(__sun) || defined(__linux) || defined(__APPLE__) || = defined(__FreeBSD__) - // - // We use the load average divided by the number of - // processors to figure out if the machine is busy or diff -ruN --exclude=3DCVS /usr/ports/devel/ice.orig/pkg-plist = /usr/ports/devel/ice/pkg-plist --- /usr/ports/devel/ice.orig/pkg-plist 2011-06-17 15:23:26.000000000 = +0200 +++ /usr/ports/devel/ice/pkg-plist 2011-06-17 17:51:07.000000000 = +0200 @@ -147,7 +147,6 @@ 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 @@ -212,49 +211,49 @@ include/Slice/Util.h lib/ImportKey.class lib/libFreeze.so -lib/libFreeze.so.3.4.1 +lib/libFreeze.so.3.4.2 lib/libFreeze.so.34 lib/libGlacier2.so -lib/libGlacier2.so.3.4.1 +lib/libGlacier2.so.3.4.2 lib/libGlacier2.so.34 lib/libIce.so -lib/libIce.so.3.4.1 +lib/libIce.so.3.4.2 lib/libIce.so.34 lib/libIceBox.so -lib/libIceBox.so.3.4.1 +lib/libIceBox.so.3.4.2 lib/libIceBox.so.34 lib/libIceDB.so -lib/libIceDB.so.3.4.1 +lib/libIceDB.so.3.4.2 lib/libIceDB.so.34 lib/libIceGrid.so -lib/libIceGrid.so.3.4.1 +lib/libIceGrid.so.3.4.2 lib/libIceGrid.so.34 lib/libIceGridFreezeDB.so -lib/libIceGridFreezeDB.so.3.4.1 +lib/libIceGridFreezeDB.so.3.4.2 lib/libIceGridFreezeDB.so.34 lib/libIcePatch2.so -lib/libIcePatch2.so.3.4.1 +lib/libIcePatch2.so.3.4.2 lib/libIcePatch2.so.34 lib/libIceSSL.so -lib/libIceSSL.so.3.4.1 +lib/libIceSSL.so.3.4.2 lib/libIceSSL.so.34 lib/libIceStorm.so -lib/libIceStorm.so.3.4.1 +lib/libIceStorm.so.3.4.2 lib/libIceStorm.so.34 lib/libIceStormFreezeDB.so -lib/libIceStormFreezeDB.so.3.4.1 +lib/libIceStormFreezeDB.so.3.4.2 lib/libIceStormFreezeDB.so.34 lib/libIceStormService.so -lib/libIceStormService.so.3.4.1 +lib/libIceStormService.so.3.4.2 lib/libIceStormService.so.34 lib/libIceUtil.so -lib/libIceUtil.so.3.4.1 +lib/libIceUtil.so.3.4.2 lib/libIceUtil.so.34 lib/libIceXML.so -lib/libIceXML.so.3.4.1 +lib/libIceXML.so.3.4.2 lib/libIceXML.so.34 lib/libSlice.so -lib/libSlice.so.3.4.1 +lib/libSlice.so.3.4.2 lib/libSlice.so.34 %%DATADIR%%/Freeze/BackgroundSaveEvictor.ice %%DATADIR%%/Freeze/CatalogData.ice =3D=3D=3D> Done --Apple-Mail-32--689842222--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106171700.p5HH0Oo5010239>