- Update to 3.2.0

PR:		ports/111542
Submitted by:	Stefan Ehmann <shoesoft at gmx.de>

5 files changed, 39 insertions, 100 deletions

diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index a21a764f6f37..50a5303cdb16 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	Ice
-PORTVERSION=	3.1.0
+PORTVERSION=	3.2.0
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.zeroc.com/download/Ice/3.1/
+MASTER_SITES=	http://www.zeroc.com/download/Ice/3.2/
 PKGNAMEPREFIX=	py-
 DISTNAME=	IcePy-${PORTVERSION}
 
diff --git a/devel/py-ice/distinfo b/devel/py-ice/distinfo
index b3393bf855fd..f13d278f0169 100644
--- a/devel/py-ice/distinfo
+++ b/devel/py-ice/distinfo
@@ -1,3 +1,3 @@
-MD5 (IcePy-3.1.0.tar.gz) = 087162a14ade7f9c97e6e782fbf29471
-SHA256 (IcePy-3.1.0.tar.gz) = fe11e1250f6a315fb0ad8c67a533ecab4e9e0b920ee88a3880efd094470194fd
-SIZE (IcePy-3.1.0.tar.gz) = 391534
+MD5 (IcePy-3.2.0.tar.gz) = e3ccb5040449c73c5da380b62fefa7cd
+SHA256 (IcePy-3.2.0.tar.gz) = 236cebc50b27552099fc2c1004baf4b908be04ce402c7a4541a17de115a76bf5
+SIZE (IcePy-3.2.0.tar.gz) = 169214
diff --git a/devel/py-ice/files/patch-Makefile b/devel/py-ice/files/patch-Makefile
index 0a3f578f112e..262924e5898d 100644
--- a/devel/py-ice/files/patch-Makefile
+++ b/devel/py-ice/files/patch-Makefile
@@ -1,71 +1,8 @@
---- Makefile.orig	Tue Aug 30 21:50:09 2005
-+++ Makefile	Tue Aug 30 21:27:37 2005
-@@ -26,11 +26,11 @@
- 	    $(call mkdir,$(install_libdir)) ; \
- 	fi
- 
--	@if test ! -d $(install_slicedir) ; \
--	then \
--	    echo "Creating $(install_slicedir)..." ; \
--	    $(call mkdir,$(install_slicedir)) ; \
--	fi
-+#	@if test ! -d $(install_slicedir) ; \
-+#	then \
-+#	    echo "Creating $(install_slicedir)..." ; \
-+#	    $(call mkdir,$(install_slicedir)) ; \
-+#	fi
- 
- 	@if test ! -d $(install_pythondir) ; \
- 	then \
-@@ -45,32 +45,32 @@
- 	    ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
+--- Makefile.orig	Thu Mar  1 20:11:25 2007
++++ Makefile	Sat Mar 24 13:52:25 2007
+@@ -40,8 +40,8 @@
  	done
  
--install::
--	@if test -d slice ; \
--	then \
--	    cd slice ; \
--	    for i in * ; \
--	    do \
--		if test ! -d $(install_slicedir)/$$i ; \
--		then \
--		    echo "Creating $(install_slicedir)/$$i..." ; \
--		    mkdir $(install_slicedir)/$$i ; \
--		    chmod a+rx $(install_slicedir)/$$i ; \
--		fi ; \
--		cd $$i ; \
--		for f in *.ice ; \
--		do \
--		    echo "Installing $$i/$$f" ; \
--		    $(INSTALL_DATA) $$f $(install_slicedir)/$$i ; \
--		    chmod a+r $(install_slicedir)/$$i/$$f ; \
--		done ; \
--		cd .. ; \
--	    done \
--	fi
-+#install::
-+#	@if test -d slice ; \
-+#	then \
-+#	    cd slice ; \
-+#	    for i in * ; \
-+#	    do \
-+#		if test ! -d $(install_slicedir)/$$i ; \
-+#		then \
-+#		    echo "Creating $(install_slicedir)/$$i..." ; \
-+#		    mkdir $(install_slicedir)/$$i ; \
-+#		    chmod a+rx $(install_slicedir)/$$i ; \
-+#		fi ; \
-+#		cd $$i ; \
-+#		for f in *.ice ; \
-+#		do \
-+#		    echo "Installing $$i/$$f" ; \
-+#		    $(INSTALL_DATA) $$f $(install_slicedir)/$$i ; \
-+#		    chmod a+r $(install_slicedir)/$$i/$$f ; \
-+#		done ; \
-+#		cd .. ; \
-+#	    done \
-+#	fi
- 
  install::
 -	$(call installdata,ICE_LICENSE,$(prefix))
 -	$(call installdata,LICENSE,$(prefix))
diff --git a/devel/py-ice/files/patch-config+Make.rules b/devel/py-ice/files/patch-config+Make.rules
index cde0c1e15a96..0c79c78e3bc7 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	Thu Jul  6 20:35:10 2006
-+++ config/Make.rules	Thu Aug  3 21:15:07 2006
+--- config/Make.rules.orig	Thu Mar  1 20:11:25 2007
++++ config/Make.rules	Fri Apr 13 19:42:32 2007
 @@ -7,6 +7,8 @@
  #
  # **********************************************************************
@@ -7,9 +7,9 @@
 +ICE_HOME		= %%LOCALBASE%%
 +
  ifndef ICE_HOME
-     $(error ICE_HOME is not defined)
- endif
-@@ -16,7 +18,7 @@
+    ifneq ($(shell test -f /usr/include/Ice/Ice.h && echo 0),0)
+       $(error Ice installation not found, please set ICE_HOME!)
+@@ -18,7 +20,7 @@
  # if it does not exist.
  #
  
@@ -17,42 +17,26 @@
 +prefix			= %%PREFIX%%
  
  #
- # When creating an executable, shall we add install_libdir to the
-@@ -68,13 +70,13 @@
+ # The "root directory" for runpath embedded in executables. Can be unset
+@@ -69,13 +71,13 @@
      # version used for building the Ice extension, then set PYTHON_VERSION
      # to "python2.3" or "python2.4".
      #
--    PYTHON_VERSION	?= $(word 1,$(notdir $(wildcard /usr/include/python2.[34]*)))
-+    PYTHON_VERSION	?= $(word 1,$(notdir $(wildcard %%LOCALBASE%%/include/python2.[34]*)))
+-    PYTHON_VERSION	?= $(word 1,$(notdir $(wildcard /usr/include/python2.[345]*)))
++    PYTHON_VERSION	?= $(word 1,$(notdir $(wildcard %%LOCALBASE%%/include/python2.[345]*)))
      ifeq ($(PYTHON_VERSION),)
        python_darwin_home = /System/Library/Frameworks/Python.framework/Versions/Current
-       PYTHON_VERSION 	= $(word 1,$(notdir $(wildcard $(python_darwin_home)/include/python2.[34]*)))
+       PYTHON_VERSION 	= $(word 1,$(notdir $(wildcard $(python_darwin_home)/include/python2.[345]*)))
      endif
 -    PYTHON_INCLUDE_DIR	= /usr/include/$(PYTHON_VERSION)
 -    PYTHON_LIB_DIR	= /usr/lib/$(PYTHON_VERSION)/config
 +    PYTHON_INCLUDE_DIR	= %%LOCALBASE%%/include/$(PYTHON_VERSION)
-+    PYTHON_LIB_DIR	= %%LOCALBASE%%/lib/$(PYTHON_VERSION)
++    PYTHON_LIB_DIR	= %%LOCALBASE%%/lib/$(PYTHON_VERSION)/config
  endif
  
  ifeq ($(PYTHON_VERSION),)
-@@ -109,21 +111,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)/python
--else
--    install_libdir	= $(prefix)/python
--endif
-+#    install_libdir	= $(prefix)/python
-+#else
-+    install_libdir	= %%PYTHON_SITELIBDIR%%/Ice
-+#endif
+@@ -102,10 +104,10 @@
+ libdir			= $(top_srcdir)/python
  
  install_slicedir	= $(prefix)/slice
 -install_pythondir	= $(prefix)/python
@@ -65,3 +49,18 @@
  INSTALL_LIBRARY		= ${INSTALL}
  INSTALL_DATA		= ${INSTALL}
  
+@@ -136,12 +138,12 @@
+ endif
+ 
+ ifneq ($(ICE_HOME),)
+-    slicedir		= $(ICE_HOME)/slice
++    slicedir		= $(ICE_HOME)/share/Ice
+ else
+     slicedir		= /usr/share/Ice-$(VERSION)/slice
+ endif
+ 
+-install_libdir	        = $(prefix)/python
++install_libdir	        = %%PYTHON_SITELIBDIR%%/Ice
+ 
+ ifneq ($(embedded_runpath_prefix),)
+    ifeq ($(LP64),yes)
diff --git a/devel/py-ice/pkg-plist b/devel/py-ice/pkg-plist
index 3c6360500743..29231f951065 100644
--- a/devel/py-ice/pkg-plist
+++ b/devel/py-ice/pkg-plist
@@ -22,12 +22,15 @@
 %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Locator_ice.py