7 files changed, 42 insertions, 74 deletions

diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index 212c25b02bda..a985852b1ef6 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	Ice
-PORTVERSION=	3.3.1
+PORTVERSION=	3.4.1
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.zeroc.com/download/Ice/3.3/ \
+MASTER_SITES=	http://www.zeroc.com/download/Ice/3.4/ \
 		http://www.dirk.sh/dirk/Ice/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Ice-${PORTVERSION}
@@ -16,7 +16,7 @@ DISTNAME=	Ice-${PORTVERSION}
 MAINTAINER=	dirk.ye@gmail.com
 COMMENT=	An Ice (Internet Communications Engine) language mapping for Python
 
-BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp
+BUILD_DEPENDS=	mcpp.3:${PORTSDIR}/devel/mcpp
 LIB_DEPENDS=	Ice.${LIB_VRS}:${PORTSDIR}/devel/ice
 
 USE_GMAKE=	yes
diff --git a/devel/py-ice/distinfo b/devel/py-ice/distinfo
index a5d8186ba8c4..0ce935a9c857 100644
--- a/devel/py-ice/distinfo
+++ b/devel/py-ice/distinfo
@@ -1,3 +1,3 @@
-MD5 (Ice-3.3.1.tar.gz) = 1f37dfcec4662fcde030553fb447d064
-SHA256 (Ice-3.3.1.tar.gz) = 7b90477303ea2668e8f2cc7bb4506e3a596699e092c4e622746ea42d8286abd0
-SIZE (Ice-3.3.1.tar.gz) = 4455154
+MD5 (Ice-3.4.1.tar.gz) = 3aae42aa47dec74bb258c1a1b2847a1a
+SHA256 (Ice-3.4.1.tar.gz) = 83c76687ac2b1c16a7e51799668531ec794dc8bd81f0daec14765ad3c671b0e6
+SIZE (Ice-3.4.1.tar.gz) = 5263510
diff --git a/devel/py-ice/files/patch-config+Make.common.rules b/devel/py-ice/files/patch-config+Make.common.rules
index 0152020bae8b..82abdb124401 100644
--- a/devel/py-ice/files/patch-config+Make.common.rules
+++ b/devel/py-ice/files/patch-config+Make.common.rules
@@ -1,46 +1,11 @@
---- config/Make.common.rules.orig	2009-04-13 22:41:24.000000000 +0800
-+++ config/Make.common.rules	2009-04-13 22:43:01.000000000 +0800
-@@ -309,24 +309,24 @@
- 	    $(call mkdir,$(prefix), -p) ; \
- 	fi
+--- config/Make.common.rules.orig	2010-07-11 13:40:06.000000000 +1000
++++ config/Make.common.rules	2010-07-11 13:40:43.000000000 +1000
+@@ -19,7 +19,7 @@
+ SHORT_VERSION           = 3.4
+ SOVERSION		= 34
  
--	@if test ! -d $(install_slicedir) ; \
--	then \
--	    echo "Creating $(install_slicedir)..." ; \
--	    $(call mkdir, $(install_slicedir)) ; \
--	    cd $(top_srcdir)/../slice ; \
--	    for subdir in * ; \
--	    do \
--	        echo "Copying slice/$$subdir to $(install_slicedir)..." ; \
--	        cp -fpr $$subdir $(install_slicedir) ; \
--	    done ; \
--        fi
-+#	@if test ! -d $(install_slicedir) ; \
-+#	then \
-+#	    echo "Creating $(install_slicedir)..." ; \
-+#	    $(call mkdir, $(install_slicedir)) ; \
-+#	    cd $(top_srcdir)/../slice ; \
-+#	    for subdir in * ; \
-+#	    do \
-+#	        echo "Copying slice/$$subdir to $(install_slicedir)..." ; \
-+#	        cp -fpr $$subdir $(install_slicedir) ; \
-+#	    done ; \
-+#        fi
- 
--	@if test ! -f $(prefix)/ICE_LICENSE ; \
--	then \
--	    $(call installdata,$(top_srcdir)/../ICE_LICENSE,$(prefix)) ; \
--	fi
-+#	@if test ! -f $(prefix)/ICE_LICENSE ; \
-+#	then \
-+#	    $(call installdata,$(top_srcdir)/../ICE_LICENSE,$(prefix)) ; \
-+#	fi
- 
--	@if test ! -f $(prefix)/LICENSE ; \
--	then \
--	    $(call installdata,$(top_srcdir)/../LICENSE,$(prefix)) ; \
--	fi
-+#	@if test ! -f $(prefix)/LICENSE ; \
-+#	then \
-+#	    $(call installdata,$(top_srcdir)/../LICENSE,$(prefix)) ; \
-+#	fi
+-INSTALL			= cp -fp
++INSTALL			= install
+ INSTALL_PROGRAM		= ${INSTALL}
+ INSTALL_LIBRARY		= ${INSTALL}
+ INSTALL_DATA		= ${INSTALL}
diff --git a/devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD b/devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD
index 41619d6da981..a12a6af5544b 100644
--- a/devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD
+++ b/devel/py-ice/files/patch-cpp+config+Make.rules.FreeBSD
@@ -1,5 +1,5 @@
---- cpp/config/Make.rules.FreeBSD.orig	2008-08-02 08:12:53.000000000 +0800
-+++ cpp/config/Make.rules.FreeBSD	2008-08-02 08:14:46.000000000 +0800
+--- cpp/config/Make.rules.FreeBSD.orig	2010-07-11 11:00:46.000000000 +1000
++++ cpp/config/Make.rules.FreeBSD	2010-07-11 11:07:28.000000000 +1000
 @@ -27,7 +27,7 @@
  endif
  
@@ -19,13 +19,12 @@
  mklib			= ar cr $(1) $(2)
  
 -BASELIBS		= -lIceUtil -lc_r
-+BASELIBS		= -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv
++BASELIBS		= -lIceUtil %%PTHREAD_LIBS%%
  LIBS			= -lIce $(BASELIBS)
  
--ICEUTIL_OS_LIBS		= 
+ ICEUTIL_OS_LIBS		= 
 -ICE_OS_LIBS		= 
-+ICEUTIL_OS_LIBS		= %%PTHREAD_LIBS%% 
-+ICE_OS_LIBS		=
++ICE_OS_LIBS		= %%PTHREAD_LIBS%%
  
  PLATFORM_HAS_READLINE	= yes
  
diff --git a/devel/py-ice/files/patch-py+config+Make.rules b/devel/py-ice/files/patch-py+config+Make.rules
index f29150b7dbe4..fa91df020747 100644
--- a/devel/py-ice/files/patch-py+config+Make.rules
+++ b/devel/py-ice/files/patch-py+config+Make.rules
@@ -1,17 +1,16 @@
---- py/config/Make.rules.orig	2009-04-14 21:17:37.000000000 +0800
-+++ py/config/Make.rules	2009-04-14 21:19:57.000000000 +0800
-@@ -12,7 +12,9 @@
+--- py/config/Make.rules.orig	2010-07-11 11:13:30.000000000 +1000
++++ py/config/Make.rules	2010-07-11 11:18:09.000000000 +1000
+@@ -12,7 +12,8 @@
  # if it does not exist.
  #
  
 -prefix			?= /opt/Ice-$(VERSION)
 +ICE_HOME		= %%LOCALBASE%%
-+
 +prefix			?= %%PREFIX%%
  
  #
  # The "root directory" for runpath embedded in executables. Can be unset
-@@ -72,8 +74,8 @@
+@@ -80,8 +81,8 @@
  endif
  
  libdir			= $(top_srcdir)/python
@@ -22,7 +21,7 @@
  
  #
  # Platform specific definitions
-@@ -97,7 +99,7 @@
+@@ -105,7 +106,7 @@
      ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
      ICE_FLAGS	= -I$(ice_dir)/include
  endif
diff --git a/devel/py-ice/files/patch-py+python+Makefile b/devel/py-ice/files/patch-py+python+Makefile
index 33d41fae561c..c11ef5d561f6 100644
--- a/devel/py-ice/files/patch-py+python+Makefile
+++ b/devel/py-ice/files/patch-py+python+Makefile
@@ -1,6 +1,6 @@
---- py/python/Makefile.orig	2008-08-01 16:33:15.000000000 +0800
-+++ py/python/Makefile	2008-08-01 16:33:45.000000000 +0800
-@@ -230,7 +230,8 @@
+--- py/python/Makefile.orig	2010-07-11 13:05:38.000000000 +1000
++++ py/python/Makefile	2010-07-11 13:09:09.000000000 +1000
+@@ -121,7 +121,8 @@
  	$(INSTALL_DATA) *.py $(install_pythondir)
  	@for i in $(PACKAGES) ; \
  	do \
@@ -9,4 +9,4 @@
 +	    $(INSTALL_DATA) $$i/*.py $(install_pythondir)/$$i ; \
  	done
  
- clean::
+ depend::  $(ICE_SLICE) $(GLACIER2_SLICE) $(ICEBOX_SLICE) $(ICEGRID_SLICE) $(ICEPATCH2_SLICE) $(ICESTORM_SLICE)
diff --git a/devel/py-ice/pkg-plist b/devel/py-ice/pkg-plist
index 6b4530d350f1..1029860851ad 100644
--- a/devel/py-ice/pkg-plist
+++ b/devel/py-ice/pkg-plist
@@ -3,8 +3,8 @@
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.py
-%%PYTHON_SITELIBDIR%%/Ice/Glacier2_SessionF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.py
@@ -27,6 +27,8 @@
 %%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_EndpointF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointTypes_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.py
@@ -62,7 +64,6 @@
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.pyc
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.pyc
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.pyc
-@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SessionF_ice.pyc
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.pyc
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice.pyc
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.pyc
@@ -117,7 +118,6 @@
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.pyo
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.pyo
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.pyo
-@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SessionF_ice.pyo
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.pyo
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice.pyo
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.pyo
@@ -167,9 +167,14 @@
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.pyo
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.pyo
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.pyo
+@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2/__init__.py
 @rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2
-@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox
-@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid
-@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2
-@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm
+@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.py
+@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox
+@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.py
+@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid
+@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.py
+@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2
+@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.py
+@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm
 @dirrmtry %%PYTHON_SITELIBDIR%%/Ice