Fix build with new ice by updating to 3.0.0, which fixes builds on

64bit Platforms

PR:		89200
Submitted by:	Boris B. Samorodov <bsam@ipt.ru>

5 files changed, 56 insertions, 30 deletions

diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index 53b12ed76a90..4be659c65e02 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	Ice
-PORTVERSION=	2.1.2
+PORTVERSION=	3.0.0
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.zeroc.com/download/Ice/2.1/ \
+MASTER_SITES=	http://www.zeroc.com/download/Ice/3.0/ \
 		ftp://ftp.ipt.ru/pub/download/
 PKGNAMEPREFIX=	py-
 DISTNAME=	IcePy-${PORTVERSION}
@@ -16,7 +16,7 @@ DISTNAME=	IcePy-${PORTVERSION}
 MAINTAINER=	bsam@ipt.ru
 COMMENT=	An Ice (Internet Communications Engine) language mapping for Python
 
-LIB_DEPENDS=	Ice.21:${PORTSDIR}/devel/ice
+LIB_DEPENDS=	Ice.30:${PORTSDIR}/devel/ice
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -31,7 +31,7 @@ CFLAGS+=	-DNDEBUG
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
+.if ${ARCH} == "ia64"
 BROKEN=		"does not compile"
 .endif
 
diff --git a/devel/py-ice/distinfo b/devel/py-ice/distinfo
index 12c9f30e4d20..e71827fa2c84 100644
--- a/devel/py-ice/distinfo
+++ b/devel/py-ice/distinfo
@@ -1,2 +1,3 @@
-MD5 (IcePy-2.1.2.tar.gz) = 81af19ef229fbab2102290e7517a39bb
-SIZE (IcePy-2.1.2.tar.gz) = 295138
+MD5 (IcePy-3.0.0.tar.gz) = 86bc80ee3c40e5108f62f4447eb846df
+SHA256 (IcePy-3.0.0.tar.gz) = 346058297a48d1de6480062aec0284107d9ff71f774f937ab50f76477ef53c75
+SIZE (IcePy-3.0.0.tar.gz) = 342416
diff --git a/devel/py-ice/files/patch-config+Make.rules b/devel/py-ice/files/patch-config+Make.rules
index eab3b7b92e82..5d3f652bf2d9 100644
--- a/devel/py-ice/files/patch-config+Make.rules
+++ b/devel/py-ice/files/patch-config+Make.rules
@@ -1,5 +1,5 @@
---- config/Make.rules.orig	Fri Jun 24 01:36:53 2005
-+++ config/Make.rules	Tue Aug 30 20:31:34 2005
+--- config/Make.rules.orig	Fri Nov 11 16:59:51 2005
++++ config/Make.rules	Thu Nov 17 18:15:30 2005
 @@ -7,6 +7,8 @@
  #
  # **********************************************************************
@@ -35,14 +35,25 @@
  endif
  
  ifeq ($(PYTHON_VERSION),)
-@@ -103,14 +105,14 @@
- ifeq ($(LP64),yes)
-     install_libdir	= $(prefix)/lib$(lp64suffix)
- else
--    install_libdir	= $(prefix)/lib
-+    install_libdir	= %%PYTHON_SITELIBDIR%%/Ice
+@@ -100,21 +102,21 @@
+     slicedir		= $(ICE_HOME)/slice
  endif
  
+-ifeq ($(LP64),yes)
++#ifeq ($(LP64),yes)
+ #
+ # TODO: Where should the shared library be installed if it is a 64 bit
+ # build.
+ #
+-    install_libdir	= $(prefix)/lib$(lp64suffix)
+-else
+-    install_libdir	= $(prefix)/python
+-endif
++#    install_libdir	= $(prefix)/lib$(lp64suffix)
++#else
++    install_libdir	= %%PYTHON_SITELIBDIR%%/Ice
++#endif
+ 
  install_slicedir	= $(prefix)/slice
 -install_pythondir	= $(prefix)/python
 +install_pythondir	= %%PYTHON_SITELIBDIR%%/Ice
diff --git a/devel/py-ice/files/patch-config+Make.rules.FreeBSD b/devel/py-ice/files/patch-config+Make.rules.FreeBSD
index 0bff4deac237..329ad4fd06fc 100644
--- a/devel/py-ice/files/patch-config+Make.rules.FreeBSD
+++ b/devel/py-ice/files/patch-config+Make.rules.FreeBSD
@@ -1,18 +1,29 @@
---- config/Make.rules.FreeBSD.orig	Tue Aug 30 16:02:02 2005
-+++ config/Make.rules.FreeBSD	Tue Aug 30 16:02:50 2005
-@@ -26,12 +26,12 @@
+--- config/Make.rules.FreeBSD.orig	Wed Nov 16 03:51:31 2005
++++ config/Make.rules.FreeBSD	Thu Nov 17 16:19:46 2005
+@@ -20,7 +20,7 @@
+ endif
+ 
+ ifeq ($(OPTIMIZE),yes)
+-    CXXFLAGS		+= -O3 -DNDEBUG
++    CXXFLAGS		+= -O2 -DNDEBUG
+ else
+     CXXFLAGS		+= -g
+ endif
+@@ -30,14 +30,14 @@
  #
  CXXLIBS			=
  
--mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lc_r
-+mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
+-mkshlib			= $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lc_r
++mkshlib			= $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
+ 
+ mklib			= ar cr $(1) $(2)
  
 -BASELIBS		= -lIceUtil -lc_r
 +BASELIBS		= -lIceUtil %%PTHREAD_LIBS%%
  LIBS			= -lIce $(BASELIBS)
  
--ICEUTIL_OS_LIBS         = 
-+ICEUTIL_OS_LIBS         = %%PTHREAD_LIBS%%
- ICE_OS_LIBS             = 
+-ICEUTIL_OS_LIBS		= 
++ICEUTIL_OS_LIBS		= %%PTHREAD_LIBS%%
+ ICE_OS_LIBS		= 
  
- PLATFORM_HAS_READLINE   := yes
+ PLATFORM_HAS_READLINE	= yes
diff --git a/devel/py-ice/pkg-plist b/devel/py-ice/pkg-plist
index 8b54e865d862..36ecf48fc7cc 100644
--- a/devel/py-ice/pkg-plist
+++ b/devel/py-ice/pkg-plist
@@ -6,9 +6,6 @@
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.py
-%%PYTHON_SITELIBDIR%%/Ice/IcePack_Admin_ice.py
-%%PYTHON_SITELIBDIR%%/Ice/IcePack_Exception_ice.py
-%%PYTHON_SITELIBDIR%%/Ice/IcePack_Query_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.py
@@ -18,7 +15,13 @@
 %%PYTHON_SITELIBDIR%%/Ice/Ice_ConnectionF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.py
@@ -43,19 +46,19 @@
 %%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IcePy.so
-%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.2.1.2
-%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.21
+%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.3.0.0
+%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.30
 %%PYTHON_SITELIBDIR%%/Ice/LICENSE
 %%PYTHON_SITELIBDIR%%/Ice/ICE_LICENSE
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2/__init__.py
 %%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.py
-%%PYTHON_SITELIBDIR%%/Ice/IcePack/__init__.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.py
 %%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.py
 %%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.py
 %%PYTHON_SITELIBDIR%%/Ice.pth
 @dirrm %%PYTHON_SITELIBDIR%%/Ice/Glacier2
 @dirrm %%PYTHON_SITELIBDIR%%/Ice/IceBox
-@dirrm %%PYTHON_SITELIBDIR%%/Ice/IcePack
+@dirrm %%PYTHON_SITELIBDIR%%/Ice/IceGrid
 @dirrm %%PYTHON_SITELIBDIR%%/Ice/IcePatch2
 @dirrm %%PYTHON_SITELIBDIR%%/Ice/IceStorm
 @dirrm %%PYTHON_SITELIBDIR%%/Ice