4 files changed, 25 insertions, 17 deletions

diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index 63bcc95252e8..415fcbd43ea2 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -6,21 +6,24 @@
 #
 
 PORTNAME=	Ice
-PORTVERSION=	3.0.0
+PORTVERSION=	3.1.0
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.zeroc.com/download/Ice/3.0/ \
+MASTER_SITES=	http://www.zeroc.com/download/Ice/3.1/ \
 		ftp://ftp.ipt.ru/pub/download/
 PKGNAMEPREFIX=	py-
 DISTNAME=	IcePy-${PORTVERSION}
 
-MAINTAINER=	bsam@ipt.ru
+MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	An Ice (Internet Communications Engine) language mapping for Python
 
-LIB_DEPENDS=	Ice.30:${PORTSDIR}/devel/ice
+LIB_DEPENDS=	Ice.${LIB_VRS}:${PORTSDIR}/devel/ice
 
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 
+LIB_VRS=	${PORTVERSION:S|.||g:C|0$||}
+PLIST_SUB=	LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
+
 CFLAGS+=	-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS}
 .if defined(DEBUG)
 CFLAGS+=	-g
@@ -31,7 +34,7 @@ CFLAGS+=	-DNDEBUG
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64"
-BROKEN=		"does not compile"
+BROKEN=		does not compile
 .endif
 
 .if ((${ARCH} != i386) && (${ARCH} != powerpc))
diff --git a/devel/py-ice/distinfo b/devel/py-ice/distinfo
index e71827fa2c84..b3393bf855fd 100644
--- a/devel/py-ice/distinfo
+++ b/devel/py-ice/distinfo
@@ -1,3 +1,3 @@
-MD5 (IcePy-3.0.0.tar.gz) = 86bc80ee3c40e5108f62f4447eb846df
-SHA256 (IcePy-3.0.0.tar.gz) = 346058297a48d1de6480062aec0284107d9ff71f774f937ab50f76477ef53c75
-SIZE (IcePy-3.0.0.tar.gz) = 342416
+MD5 (IcePy-3.1.0.tar.gz) = 087162a14ade7f9c97e6e782fbf29471
+SHA256 (IcePy-3.1.0.tar.gz) = fe11e1250f6a315fb0ad8c67a533ecab4e9e0b920ee88a3880efd094470194fd
+SIZE (IcePy-3.1.0.tar.gz) = 391534
diff --git a/devel/py-ice/files/patch-config+Make.rules b/devel/py-ice/files/patch-config+Make.rules
index 5d3f652bf2d9..cde0c1e15a96 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 Nov 11 16:59:51 2005
-+++ config/Make.rules	Thu Nov 17 18:15:30 2005
+--- config/Make.rules.orig	Thu Jul  6 20:35:10 2006
++++ config/Make.rules	Thu Aug  3 21:15:07 2006
 @@ -7,6 +7,8 @@
  #
  # **********************************************************************
@@ -17,8 +17,8 @@
 +prefix			= %%PREFIX%%
  
  #
- # Define OPTIMIZE as yes if you want to build with optimization.
-@@ -65,13 +67,13 @@
+ # When creating an executable, shall we add install_libdir to the
+@@ -68,13 +70,13 @@
      # version used for building the Ice extension, then set PYTHON_VERSION
      # to "python2.3" or "python2.4".
      #
@@ -35,7 +35,7 @@
  endif
  
  ifeq ($(PYTHON_VERSION),)
-@@ -100,21 +102,21 @@
+@@ -109,21 +111,21 @@
      slicedir		= $(ICE_HOME)/slice
  endif
  
@@ -45,11 +45,11 @@
  # TODO: Where should the shared library be installed if it is a 64 bit
  # build.
  #
--    install_libdir	= $(prefix)/lib$(lp64suffix)
+-    install_libdir	= $(prefix)/python
 -else
 -    install_libdir	= $(prefix)/python
 -endif
-+#    install_libdir	= $(prefix)/lib$(lp64suffix)
++#    install_libdir	= $(prefix)/python
 +#else
 +    install_libdir	= %%PYTHON_SITELIBDIR%%/Ice
 +#endif
diff --git a/devel/py-ice/pkg-plist b/devel/py-ice/pkg-plist
index 36ecf48fc7cc..3c6360500743 100644
--- a/devel/py-ice/pkg-plist
+++ b/devel/py-ice/pkg-plist
@@ -4,6 +4,7 @@
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SessionF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.py
@@ -20,8 +21,12 @@
 %%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_FileParser_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_LocalException_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.py
@@ -46,8 +51,8 @@
 %%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/IcePy.so
-%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.3.0.0
-%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.30
+%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VERSION%%
+%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VRS%%
 %%PYTHON_SITELIBDIR%%/Ice/LICENSE
 %%PYTHON_SITELIBDIR%%/Ice/ICE_LICENSE
 %%PYTHON_SITELIBDIR%%/Ice/Glacier2/__init__.py