Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Dec 2015 17:40:15 +0000 (UTC)
From:      Michael Gmelin <grembo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r404582 - in head/devel: ice ice/files php5-ice py-ice
Message-ID:  <201512271740.tBRHeFOG032502@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: grembo
Date: Sun Dec 27 17:40:15 2015
New Revision: 404582
URL: https://svnweb.freebsd.org/changeset/ports/404582

Log:
  Update ice ports to 3.6.1 and switch to new unit test framework.
  
  Approved by:    mentors (implicit)

Added:
  head/devel/ice/files/patch-cpp-test-Ice-properties-run.py   (contents, props changed)
  head/devel/ice/files/patch-python-test-Ice-properties-run.py   (contents, props changed)
Deleted:
  head/devel/ice/files/patch-cpp-test-Glacier2-override-Client.cpp
  head/devel/ice/files/patch-cpp-test-Ice-hold-AllTests.cpp
Modified:
  head/devel/ice/Makefile
  head/devel/ice/distinfo
  head/devel/ice/files/patch-scripts-TestUtil.py
  head/devel/ice/pkg-plist
  head/devel/php5-ice/pkg-plist
  head/devel/py-ice/Makefile
  head/devel/py-ice/pkg-plist

Modified: head/devel/ice/Makefile
==============================================================================
--- head/devel/ice/Makefile	Sun Dec 27 16:44:32 2015	(r404581)
+++ head/devel/ice/Makefile	Sun Dec 27 17:40:15 2015	(r404582)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		Ice
-PORTVERSION=		3.6.0
-PORTREVISION=		1
+PORTVERSION=		3.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel
 
@@ -24,15 +23,13 @@ LIB_DEPENDS+=		libIce.so.${LIB_VRS}:${PO
 PLIST_SUB+=		LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 .endif
 
-OPTIONS_DEFINE?=	DEBUG TESTS
-OPTIONS_DEFAULT?=	TESTS
-TESTS_DESC?=		Build and run tests (requires lang/python)
+OPTIONS_DEFINE?=	DEBUG TEST
 
 .include <bsd.port.options.mk>
 
 USES+=			iconv gmake
 
-.if ${PORT_OPTIONS:MTESTS} && ${SLAVE_PORT} == "no"
+.if ${PORT_OPTIONS:MTEST} && ${SLAVE_PORT} == "no"
 USES+=			python:build
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:${PORTSDIR}/security/py-passlib
 .endif
@@ -62,7 +59,7 @@ BROKEN_sparc64=		Does not compile on ${A
 MAKE_ENV+=		LP64=yes
 .endif
 
-.if !${PORT_OPTIONS:MTESTS}
+.if !${PORT_OPTIONS:MTEST}
 MAKE_ENV+=		NOTESTS=yes
 .endif
 
@@ -135,13 +132,8 @@ post-patch:
 		s|%%PREFIX%%|${PREFIX}|g; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g;' ${WRKSRC}/php/config/Make.rules.php
 
-.if ${PORT_OPTIONS:MTESTS}
-TEST_CMD=		@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
-check regression-test test: build
-	${TEST_CMD}
-
-pre-install: regression-test
-.endif
+do-test-TEST-on:
+	@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
 
 .if ${SLAVE_PORT} == "no"
 post-install:

Modified: head/devel/ice/distinfo
==============================================================================
--- head/devel/ice/distinfo	Sun Dec 27 16:44:32 2015	(r404581)
+++ head/devel/ice/distinfo	Sun Dec 27 17:40:15 2015	(r404582)
@@ -1,2 +1,2 @@
-SHA256 (zeroc-ice-Ice-v3.6.0_GH0.tar.gz) = 77933580cdc7fade0ebfce517935819e9eef5fc6b9e3f4143b07404daf54e25e
-SIZE (zeroc-ice-Ice-v3.6.0_GH0.tar.gz) = 5300956
+SHA256 (zeroc-ice-Ice-v3.6.1_GH0.tar.gz) = 454d81cb72986c1f04e297a81bca7563e3449a216ad63de8630122d34545ae78
+SIZE (zeroc-ice-Ice-v3.6.1_GH0.tar.gz) = 5338954

Added: head/devel/ice/files/patch-cpp-test-Ice-properties-run.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-test-Ice-properties-run.py	Sun Dec 27 17:40:15 2015	(r404582)
@@ -0,0 +1,11 @@
+--- cpp/test/Ice/properties/run.py.orig	2015-12-27 03:21:09.629772970 +0100
++++ cpp/test/Ice/properties/run.py	2015-12-27 03:21:20.836761970 +0100
+@@ -28,7 +28,7 @@
+ #
+ if sys.version_info[0] == 2:
+     configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
+-    decodedPath = configPath.decode("utf-8")
++    decodedPath = configPath
+ else:
+     configPath = "./config/\u4e2d\u56fd_client.config"
+     decodedPath = configPath # No need to decode with Python3, strings are already Unicode

Added: head/devel/ice/files/patch-python-test-Ice-properties-run.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ice/files/patch-python-test-Ice-properties-run.py	Sun Dec 27 17:40:15 2015	(r404582)
@@ -0,0 +1,11 @@
+--- python/test/Ice/properties/run.py.orig	2015-12-27 02:42:11.742927971 +0100
++++ python/test/Ice/properties/run.py	2015-12-27 03:06:41.640921970 +0100
+@@ -26,7 +26,7 @@
+ #
+ if sys.version_info[0] == 2:
+     configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
+-    decodedPath = configPath.decode("utf-8")
++    decodedPath = configPath
+ else:
+     configPath = "./config/\u4e2d\u56fd_client.config"
+     decodedPath = configPath # No need to decode with Python3, strings are already Unicode

Modified: head/devel/ice/files/patch-scripts-TestUtil.py
==============================================================================
--- head/devel/ice/files/patch-scripts-TestUtil.py	Sun Dec 27 16:44:32 2015	(r404581)
+++ head/devel/ice/files/patch-scripts-TestUtil.py	Sun Dec 27 17:40:15 2015	(r404582)
@@ -26,15 +26,15 @@
  def getCppCompiler():
      compiler = ""
      if os.environ.get("CPP_COMPILER", "") != "":
-@@ -311,7 +330,7 @@
-     if(p.wait() != 0):
+@@ -324,7 +324,7 @@
          print("uname failed:\n" + p.stdout.read().strip())
          sys.exit(1)
--    if p.stdout.readline().decode('UTF-8').strip() == "x86_64" and os.environ.get("LP64", "") != "no":
-+    if p.stdout.readline().decode('UTF-8').strip() in ["x86_64", "amd64"] and os.environ.get("LP64", "") != "no":
+     line = p.stdout.readline().decode('UTF-8').strip()
+-    if line == "x86_64" and os.environ.get("LP64", "") != "no":
++    if line in ["x86_64", "amd64"] and os.environ.get("LP64", "") != "no":
          x64 = True
- 
- #
+     elif line == "armv7l":
+         armv7l = True
 @@ -1887,7 +1906,7 @@
          if lang == "java":
              addLdPath(os.path.join(getIceDir("cpp"), "bin", "x64" if x64 else ""), env) # Add bin for db53_vc100.dll

Modified: head/devel/ice/pkg-plist
==============================================================================
--- head/devel/ice/pkg-plist	Sun Dec 27 16:44:32 2015	(r404581)
+++ head/devel/ice/pkg-plist	Sun Dec 27 17:40:15 2015	(r404582)
@@ -134,6 +134,7 @@ include/Ice/ProxyF.h
 include/Ice/ProxyFactoryF.h
 include/Ice/ProxyHandle.h
 include/Ice/ReferenceF.h
+include/Ice/RegisterPlugins.h
 include/Ice/RemoteLogger.h
 include/Ice/RequestHandlerF.h
 include/Ice/ResponseHandlerF.h
@@ -237,49 +238,49 @@ include/Slice/PythonUtil.h
 include/Slice/RubyUtil.h
 include/Slice/Util.h
 lib/libFreeze.so
-lib/libFreeze.so.3.6.0
+lib/libFreeze.so.3.6.1
 lib/libFreeze.so.36
 lib/libGlacier2.so
-lib/libGlacier2.so.3.6.0
+lib/libGlacier2.so.3.6.1
 lib/libGlacier2.so.36
 lib/libGlacier2CryptPermissionsVerifier.so
-lib/libGlacier2CryptPermissionsVerifier.so.3.6.0
+lib/libGlacier2CryptPermissionsVerifier.so.3.6.1
 lib/libGlacier2CryptPermissionsVerifier.so.36
 lib/libIce.so
-lib/libIce.so.3.6.0
+lib/libIce.so.3.6.1
 lib/libIce.so.36
 lib/libIceBox.so
-lib/libIceBox.so.3.6.0
+lib/libIceBox.so.3.6.1
 lib/libIceBox.so.36
 lib/libIceDiscovery.so
-lib/libIceDiscovery.so.3.6.0
+lib/libIceDiscovery.so.3.6.1
 lib/libIceDiscovery.so.36
 lib/libIceGrid.so
-lib/libIceGrid.so.3.6.0
+lib/libIceGrid.so.3.6.1
 lib/libIceGrid.so.36
 lib/libIceLocatorDiscovery.so
-lib/libIceLocatorDiscovery.so.3.6.0
+lib/libIceLocatorDiscovery.so.3.6.1
 lib/libIceLocatorDiscovery.so.36
 lib/libIcePatch2.so
-lib/libIcePatch2.so.3.6.0
+lib/libIcePatch2.so.3.6.1
 lib/libIcePatch2.so.36
 lib/libIceSSL.so
-lib/libIceSSL.so.3.6.0
+lib/libIceSSL.so.3.6.1
 lib/libIceSSL.so.36
 lib/libIceStorm.so
-lib/libIceStorm.so.3.6.0
+lib/libIceStorm.so.3.6.1
 lib/libIceStorm.so.36
 lib/libIceStormService.so
-lib/libIceStormService.so.3.6.0
+lib/libIceStormService.so.3.6.1
 lib/libIceStormService.so.36
 lib/libIceUtil.so
-lib/libIceUtil.so.3.6.0
+lib/libIceUtil.so.3.6.1
 lib/libIceUtil.so.36
 lib/libIceXML.so
-lib/libIceXML.so.3.6.0
+lib/libIceXML.so.3.6.1
 lib/libIceXML.so.36
 lib/libSlice.so
-lib/libSlice.so.3.6.0
+lib/libSlice.so.3.6.1
 lib/libSlice.so.36
 man/man1/dumpdb.1.gz
 man/man1/glacier2router.1.gz

Modified: head/devel/php5-ice/pkg-plist
==============================================================================
--- head/devel/php5-ice/pkg-plist	Sun Dec 27 16:44:32 2015	(r404581)
+++ head/devel/php5-ice/pkg-plist	Sun Dec 27 17:40:15 2015	(r404582)
@@ -40,6 +40,7 @@ share/pear/Ice/ProcessF.php
 share/pear/Ice/Properties.php
 share/pear/Ice/PropertiesAdmin.php
 share/pear/Ice/PropertiesF.php
+share/pear/Ice/RemoteLogger.php
 share/pear/Ice/Router.php
 share/pear/Ice/RouterF.php
 share/pear/Ice/SliceChecksumDict.php

Modified: head/devel/py-ice/Makefile
==============================================================================
--- head/devel/py-ice/Makefile	Sun Dec 27 16:44:32 2015	(r404581)
+++ head/devel/py-ice/Makefile	Sun Dec 27 17:40:15 2015	(r404582)
@@ -27,9 +27,7 @@ MAKE_ENV+=	PYTHON_VERSION=${PYTHON_VERSI
 LIB_VRS=	${PORTVERSION:S|.||g:C|[0-9]$||}
 PLIST_SUB=	LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 
-OPTIONS_DEFINE=	DEBUG TESTS
-OPTIONS_DEFAULT=TESTS
-TESTS_DESC=	Run tests
+OPTIONS_DEFINE=	DEBUG TEST
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYSITEDIR}/Ice/*.so.*

Modified: head/devel/py-ice/pkg-plist
==============================================================================
--- head/devel/py-ice/pkg-plist	Sun Dec 27 16:44:32 2015	(r404581)
+++ head/devel/py-ice/pkg-plist	Sun Dec 27 17:40:15 2015	(r404582)
@@ -121,6 +121,8 @@
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_PropertiesF_ice.cpython-%%PYTHON_SUFFIX%%.pyo
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Properties_ice.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Properties_ice.cpython-%%PYTHON_SUFFIX%%.pyo
+%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_RemoteLogger_ice.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_RemoteLogger_ice.cpython-%%PYTHON_SUFFIX%%.pyo
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_RouterF_ice.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_RouterF_ice.cpython-%%PYTHON_SUFFIX%%.pyo
 %%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Router_ice.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -255,6 +257,8 @@
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyo
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyc
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyo
+%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_RemoteLogger_ice.pyc
+%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_RemoteLogger_ice.pyo
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.pyc
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.pyo
 %%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.pyc
@@ -331,6 +335,7 @@
 %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesAdmin_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_RemoteLogger_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.py
 %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512271740.tBRHeFOG032502>