ports/171645: [PATCH] devel/py-ice: Allow building using Clang,
general overhaul
Michael Gmelin
freebsd at grem.de
Fri Sep 28 10:30:12 UTC 2012
The following reply was made to PR ports/171645; it has been noted by GNATS.
From: Michael Gmelin <freebsd at grem.de>
To: Tony Maher <tonymaher at optusnet.com.au>
Cc: bug-followup at FreeBSD.org
Subject: Re: ports/171645: [PATCH] devel/py-ice: Allow building using Clang,
general overhaul
Date: Fri, 28 Sep 2012 12:23:06 +0200
--MP_/l2SRWsGWoVAuwHaSxfL=MMK
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
On Fri, 28 Sep 2012 18:44:28 +1000
Tony Maher <tonymaher at optusnet.com.au> wrote:
> Hello,
> the patch file files/patch-py-test-Ice-properties-run.py appears to
> have weird characters in the ConfigPath setting so cannot test.
> cheers
Hi Tony,
These weird characters are UTF-8 and part of the source code (it comes
from upstream). Since the unit test is about verifying that UTF-8 works
okay, they can't be removed (and shouldn't).
It seems like that the patch got mangled in submission (porttools or
one of the editors involved)
Please find attached the patch again, I made sure that utf-8 characters
are preserved), let hope that works ok. If there are further issues, I
could also send the patch directly to you in gzipped format.
Sorry for any inconvenience caused by this.
Michael
--
Michael Gmelin
--MP_/l2SRWsGWoVAuwHaSxfL=MMK
Content-Type: text/x-patch
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=py27-Ice-3.4.2_3.patch
diff -ruN --exclude=3DCVS ../py-ice.orig/Makefile ./Makefile
--- ../py-ice.orig/Makefile 2012-08-22 17:18:15.000000000 +0200
+++ ./Makefile 2012-09-12 02:37:38.254057273 +0200
@@ -5,56 +5,69 @@
# $FreeBSD: ports/devel/py-ice/Makefile,v 1.20 2012/08/22 15:18:15 jgh Exp=
$
#
=20
-PORTNAME=3D Ice
-PORTVERSION=3D 3.4.2
-PORTREVISION=3D 2
-CATEGORIES=3D devel python
-MASTER_SITES=3D http://download.zeroc.com/Ice/3.4/ \
- http://www.dirk.sh/dirk/Ice/
-PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=3D tonymaher at optusnet.com.au
-COMMENT=3D An Ice (Internet Communications Engine) language mapping for Py=
thon
-
-BUILD_DEPENDS=3D mcpp:${PORTSDIR}/devel/mcpp
-LIB_DEPENDS=3D Ice.${LIB_VRS}:${PORTSDIR}/devel/ice
-
-USE_GMAKE=3D yes
-USE_PYTHON=3D yes
-BUILD_WRKSRC=3D ${WRKSRC}/py
-INSTALL_WRKSRC=3D ${WRKSRC}/py
-
-LIB_VRS=3D ${PORTVERSION:S|.||g:C|2$||}
-PLIST_SUB=3D LIB_VERSION=3D"${PORTVERSION}" LIB_VRS=3D"${LIB_VRS}"
-MAKE_ENV=3D ICE_HOME=3D"${LOCALBASE}/share/Ice"
-
-CFLAGS+=3D -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_C=
FLAGS}
-.if defined(DEBUG)
-CFLAGS+=3D -g
-.else
-CFLAGS+=3D -DNDEBUG
+PORTNAME=3D Ice
+PORTVERSION=3D 3.4.2
+PORTREVISION=3D 3
+CATEGORIES=3D devel python
+MASTER_SITES=3D http://download.zeroc.com/Ice/3.4/ \
+ http://www.dirk.sh/dirk/Ice/
+PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=3D tonymaher at optusnet.com.au
+COMMENT=3D An Ice (Internet Communications Engine) language mapping for P=
ython
+
+BUILD_DEPENDS=3D mcpp:${PORTSDIR}/devel/mcpp
+LIB_DEPENDS=3D Ice.${LIB_VRS}:${PORTSDIR}/devel/ice
+
+USE_GMAKE=3D yes
+USE_PYTHON=3D yes
+BUILD_WRKSRC=3D ${WRKSRC}/py
+INSTALL_WRKSRC=3D ${WRKSRC}/py
+
+LIB_VRS=3D ${PORTVERSION:S|.||g:C|2$||}
+PLIST_SUB=3D LIB_VERSION=3D"${PORTVERSION}" LIB_VRS=3D"${LIB_VRS}"
+MAKE_ENV=3D ICE_HOME=3D"${LOCALBASE}/share/Ice"
+
+OPTIONS_DEFINE=3D DEBUG DOCS TESTS
+OPTIONS_DEFAULT=3D TESTS
+TESTS_DESC=3D Run tests
+
+# bypass infrastructure bug (taken from www/py-django)
+OPTIONSFILE=3D ${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
+CFLAGS+=3D -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_=
CFLAGS}
+.if !${PORT_OPTIONS:MDEBUG}
+CFLAGS+=3D -DNDEBUG
.endif
=20
-.include <bsd.port.pre.mk>
.if ${ARCH} =3D=3D "ia64"
-BROKEN=3D does not compile on ia64
+BROKEN=3D does not compile on ia64
.endif
=20
.if ((${ARCH} !=3D i386) && (${ARCH} !=3D powerpc))
-MAKE_ENV=3D LP64=3Dyes
+MAKE_ENV=3D LP64=3Dyes
.endif
=20
-.if empty(PORT_OPTIONS:MDOCS)
-MAKE_ENV+=3D NOPORTDOCS=3Dyes
+.if !${PORT_OPTIONS:MDOCS}
+MAKE_ENV+=3D NOPORTDOCS=3Dyes
.endif
=20
post-patch:
- ${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
+ @${SED} 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
+ s|%%PREFIX%%|${PREFIX}|g; \
+ s|%%DATADIR%%|${DATADIR}|g; \
+ s|%%DOCSDIR%%|${DOCSDIR}|g; \
+ s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
+ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g' \
+ ${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD
+ @${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g; \
s|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/py/config/Make.rules
- ${REINPLACE_CMD} 's|.(ice_dir).slice|${DATADIR}|g; \
+ @${REINPLACE_CMD} 's|.(ice_dir).slice|${DATADIR}|g; \
s|.(prefix).slice|${DATADIR}|g; \
s|.(prefix).[ICE_]*LICENSE|${DATADIR}/LICENSE|g;' \
${WRKSRC}/py/config/Make.rules.mak \
@@ -64,4 +77,17 @@
post-install:
${ECHO} "Ice" > ${PYTHON_SITELIBDIR}/Ice.pth
=20
-.include <bsd.port.post.mk>
+.if ${PORT_OPTIONS:MTESTS}
+TEST_CMD=3D @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
+.endif
+
+post-build:
+ @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/py/python
+ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/py/python
+.if ${PORT_OPTIONS:MTESTS}
+ ${TEST_CMD}
+regression-test test: build
+ ${TEST_CMD}
+.endif
+
+.include <bsd.port.mk>
diff -ruN --exclude=3DCVS ../py-ice.orig/files/Make.rules.FreeBSD ./files/M=
ake.rules.FreeBSD
--- ../py-ice.orig/files/Make.rules.FreeBSD 1970-01-01 01:00:00.000000000 +=
0100
+++ ./files/Make.rules.FreeBSD 2012-09-11 20:00:05.000000000 +0200
@@ -0,0 +1,21 @@
+mkshlib =3D $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) =
$(3) $(4)
+
+BASELIBS =3D -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv
+LIBS =3D -lIce $(BASELIBS)=20
+
+ICEUTIL_OS_LIBS =3D %%PTHREAD_LIBS%%
+
+PLATFORM_HAS_READLINE :=3D yes
+
+export LD_LIBRARY_PATH :=3D $(libdir):$(LD_LIBRARY_PATH)
+
+lp64suffix =3D
+create_runpath_symlink =3D no
+prefix =3D %%PREFIX%%
+install_slicedir =3D %%DATADIR%%
+install_configdir =3D %%DATADIR%%/config
+install_docdir =3D %%DOCSDIR%%
+EXPAT_HOME =3D $(LOCALBASE)
+INSTALL =3D %%INSTALL_DATA%%
+INSTALL_PROGRAM =3D %%INSTALL_PROGRAM%%
+MCPP_HOME =3D $(LOCALBASE)
diff -ruN --exclude=3DCVS ../py-ice.orig/files/patch-config+Make.common.rul=
es ./files/patch-config+Make.common.rules
--- ../py-ice.orig/files/patch-config+Make.common.rules 2010-08-15 14:04:13=
.000000000 +0200
+++ ./files/patch-config+Make.common.rules 1970-01-01 01:00:00.000000000 +0=
100
@@ -1,11 +0,0 @@
---- 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 =3D 3.4
- SOVERSION =3D 34
-=20
--INSTALL =3D cp -fp
-+INSTALL =3D install
- INSTALL_PROGRAM =3D ${INSTALL}
- INSTALL_LIBRARY =3D ${INSTALL}
- INSTALL_DATA =3D ${INSTALL}
diff -ruN --exclude=3DCVS ../py-ice.orig/files/patch-config-Make.common.rul=
es ./files/patch-config-Make.common.rules
--- ../py-ice.orig/files/patch-config-Make.common.rules 1970-01-01 01:00:00=
.000000000 +0100
+++ ./files/patch-config-Make.common.rules 2010-08-15 14:04:13.000000000 +0=
200
@@ -0,0 +1,11 @@
+--- 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 =3D 3.4
+ SOVERSION =3D 34
+=20
+-INSTALL =3D cp -fp
++INSTALL =3D install
+ INSTALL_PROGRAM =3D ${INSTALL}
+ INSTALL_LIBRARY =3D ${INSTALL}
+ INSTALL_DATA =3D ${INSTALL}
diff -ruN --exclude=3DCVS ../py-ice.orig/files/patch-cpp+config+Make.rules.=
FreeBSD ./files/patch-cpp+config+Make.rules.FreeBSD
--- ../py-ice.orig/files/patch-cpp+config+Make.rules.FreeBSD 2010-08-15 14:=
04:13.000000000 +0200
+++ ./files/patch-cpp+config+Make.rules.FreeBSD 1970-01-01 01:00:00.0000000=
00 +0100
@@ -1,30 +0,0 @@
---- 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
-=20
- ifeq ($(OPTIMIZE),yes)
-- CXXFLAGS +=3D -O3 -DNDEBUG
-+ CXXFLAGS +=3D -O2 -DNDEBUG
- else
- CXXFLAGS +=3D -g
- endif
-@@ -37,15 +37,15 @@
- #
- CXXLIBS =3D
-=20
--mkshlib =3D $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lc=
_r
-+mkshlib =3D $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
-=20
- mklib =3D ar cr $(1) $(2)
-=20
--BASELIBS =3D -lIceUtil -lc_r
-+BASELIBS =3D -lIceUtil %%PTHREAD_LIBS%%
- LIBS =3D -lIce $(BASELIBS)
-=20
- ICEUTIL_OS_LIBS =3D=20
--ICE_OS_LIBS =3D=20
-+ICE_OS_LIBS =3D %%PTHREAD_LIBS%%
-=20
- PLATFORM_HAS_READLINE =3D yes
-=20
diff -ruN --exclude=3DCVS ../py-ice.orig/files/patch-py+config+Make.rules .=
/files/patch-py+config+Make.rules
--- ../py-ice.orig/files/patch-py+config+Make.rules 2010-08-15 14:04:13.000=
000000 +0200
+++ ./files/patch-py+config+Make.rules 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
---- 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.
- #
-=20
--prefix ?=3D /opt/Ice-$(VERSION)
-+ICE_HOME =3D %%LOCALBASE%%
-+prefix ?=3D %%PREFIX%%
-=20
- #
- # The "root directory" for runpath embedded in executables. Can be unset
-@@ -80,8 +81,8 @@
- endif
-=20
- libdir =3D $(top_srcdir)/python
--install_pythondir =3D $(prefix)/python
--install_libdir =3D $(prefix)/python
-+install_pythondir =3D %%PYTHON_SITELIBDIR%%/Ice
-+install_libdir =3D %%PYTHON_SITELIBDIR%%/Ice
-=20
- #
- # Platform specific definitions
-@@ -105,7 +106,7 @@
- ICE_LIB_DIR =3D -L$(ice_dir)/$(libsubdir)
- ICE_FLAGS =3D -I$(ice_dir)/include
- endif
--ICE_LIBS =3D $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
-+ICE_LIBS =3D $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil -liconv
-=20
- ifneq ($(embedded_runpath_prefix),)
- runpath_libdir :=3D $(embedded_runpath_prefix)/$(libsubdir)
diff -ruN --exclude=3DCVS ../py-ice.orig/files/patch-py+python+Makefile ./f=
iles/patch-py+python+Makefile
--- ../py-ice.orig/files/patch-py+python+Makefile 2010-08-15 14:04:13.00000=
0000 +0200
+++ ./files/patch-py+python+Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
---- 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 \
-- $(INSTALL_DATA) -r $$i $(install_pythondir) ; \
-+ $(INSTALL_DATA) -d $(install_pythondir)/$$i ; \
-+ $(INSTALL_DATA) $$i/*.py $(install_pythondir)/$$i ; \
- done
-=20
- depend:: $(ICE_SLICE) $(GLACIER2_SLICE) $(ICEBOX_SLICE) $(ICEGRID_SLICE)=
$(ICEPATCH2_SLICE) $(ICESTORM_SLICE)
diff -ruN --exclude=3DCVS ../py-ice.orig/files/patch-py-config-Make.rules .=
/files/patch-py-config-Make.rules
--- ../py-ice.orig/files/patch-py-config-Make.rules 1970-01-01 01:00:00.000=
000000 +0100
+++ ./files/patch-py-config-Make.rules 2010-08-15 14:04:13.000000000 +0200
@@ -0,0 +1,32 @@
+--- 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.
+ #
+=20
+-prefix ?=3D /opt/Ice-$(VERSION)
++ICE_HOME =3D %%LOCALBASE%%
++prefix ?=3D %%PREFIX%%
+=20
+ #
+ # The "root directory" for runpath embedded in executables. Can be unset
+@@ -80,8 +81,8 @@
+ endif
+=20
+ libdir =3D $(top_srcdir)/python
+-install_pythondir =3D $(prefix)/python
+-install_libdir =3D $(prefix)/python
++install_pythondir =3D %%PYTHON_SITELIBDIR%%/Ice
++install_libdir =3D %%PYTHON_SITELIBDIR%%/Ice
+=20
+ #
+ # Platform specific definitions
+@@ -105,7 +106,7 @@
+ ICE_LIB_DIR =3D -L$(ice_dir)/$(libsubdir)
+ ICE_FLAGS =3D -I$(ice_dir)/include
+ endif
+-ICE_LIBS =3D $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
++ICE_LIBS =3D $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil -liconv
+=20
+ ifneq ($(embedded_runpath_prefix),)
+ runpath_libdir :=3D $(embedded_runpath_prefix)/$(libsubdir)
diff -ruN --exclude=3DCVS ../py-ice.orig/files/patch-py-python-Makefile ./f=
iles/patch-py-python-Makefile
--- ../py-ice.orig/files/patch-py-python-Makefile 1970-01-01 01:00:00.00000=
0000 +0100
+++ ./files/patch-py-python-Makefile 2012-09-11 23:05:59.000000000 +0200
@@ -0,0 +1,16 @@
+--- py/python/Makefile.orig 2010-07-11 13:05:38.000000000 +1000
++++ py/python/Makefile 2012-09-11 00:09:09.000000000 +2000
+@@ -118,10 +118,11 @@
+=20
+ install:: $(ALL_SRCS)
+ @echo "Installing generated code"
+- $(INSTALL_DATA) *.py $(install_pythondir)
++ $(INSTALL_DATA) *.py* $(install_pythondir)
+ @for i in $(PACKAGES) ; \
+ do \
+- $(INSTALL_DATA) -r $$i $(install_pythondir) ; \
++ $(INSTALL_DATA) -d $(install_pythondir)/$$i ; \
++ $(INSTALL_DATA) $$i/*.py* $(install_pythondir)/$$i ; \
+ done
+=20
+ depend:: $(ICE_SLICE) $(GLACIER2_SLICE) $(ICEBOX_SLICE) $(ICEGRID_SLICE)=
$(ICEPATCH2_SLICE) $(ICESTORM_SLICE)
diff -ruN --exclude=3DCVS ../py-ice.orig/files/patch-py-test-Ice-info-AllTe=
sts.py ./files/patch-py-test-Ice-info-AllTests.py
--- ../py-ice.orig/files/patch-py-test-Ice-info-AllTests.py 1970-01-01 01:0=
0:00.000000000 +0100
+++ ./files/patch-py-test-Ice-info-AllTests.py 2012-09-11 21:23:47.00000000=
0 +0200
@@ -0,0 +1,79 @@
+--- py/test/Ice/info/AllTests.py.orig 2011-06-15 19:44:00.000000000 +0000
++++ py/test/Ice/info/AllTests.py 2012-09-11 19:18:30.188273390 +0000
+@@ -7,12 +7,31 @@
+ #
+ # **********************************************************************
+=20
+-import Ice, Test, threading
++import Ice, Test, threading, sys, subprocess
+=20
+ def test(b):
+ if not b:
+ raise RuntimeError('test assertion failed')
+=20
++def isFreeBSD():
++ return sys.platform.startswith("freebsd")
++
++def sysctl(key):
++ p =3D subprocess.Popen("sysctl "+key, shell=3D1, stdout=3Dsubprocess.=
PIPE)
++ try:
++ result =3D p.communicate()[0].strip().split()[1]
++ except IndexError:
++ return 0 =20
++ if sys.version_info >=3D (3,):
++ result =3D str(result, sys.stdout.encoding)
++ try:
++ return int(result)
++ except ValueError:
++ return result
++
++def isFreeBSDJail():
++ return isFreeBSD() and sysctl("security.jail.jailed")
++
+ def allTests(communicator, collocated):
+ print "testing proxy endpoint information...",
+=20
+@@ -64,12 +83,12 @@
+=20
+ ipEndpoint =3D endpoints[0].getInfo()
+ test(ipEndpoint.type() =3D=3D Ice.TCPEndpointType or ipEndpoint.type(=
) =3D=3D 2)
+- test(ipEndpoint.host =3D=3D defaultHost)
++ test(ipEndpoint.host =3D=3D defaultHost or isFreeBSDJail())
+ test(ipEndpoint.port > 0)
+ test(ipEndpoint.timeout =3D=3D 15000)
+=20
+ udpEndpoint =3D endpoints[1].getInfo()
+- test(udpEndpoint.host =3D=3D defaultHost)
++ test(udpEndpoint.host =3D=3D defaultHost or isFreeBSDJail())
+ test(udpEndpoint.datagram())
+ test(udpEndpoint.port > 0)
+=20
+@@ -104,7 +123,7 @@
+ ipinfo =3D base.ice_getConnection().getEndpoint().getInfo()
+ test(ipinfo.port =3D=3D 12010)
+ test(not ipinfo.compress)
+- test(ipinfo.host =3D=3D defaultHost)
++ test(ipinfo.host =3D=3D defaultHost or isFreeBSDJail())
+=20
+ ctx =3D testIntf.getEndpointInfoAsContext()
+ test(ctx["host"] =3D=3D ipinfo.host)
+@@ -114,7 +133,7 @@
+=20
+ udp =3D base.ice_datagram().ice_getConnection().getEndpoint().getInfo=
()
+ test(udp.port =3D=3D 12010)
+- test(udp.host =3D=3D defaultHost)
++ test(udp.host =3D=3D defaultHost or isFreeBSDJail())
+=20
+ print "ok"
+=20
+@@ -124,8 +143,8 @@
+ test(not info.incoming)
+ test(len(info.adapterName) =3D=3D 0)
+ test(info.remotePort =3D=3D 12010)
+- test(info.remoteAddress =3D=3D defaultHost)
+- test(info.localAddress =3D=3D defaultHost)
++ test(info.remoteAddress =3D=3D defaultHost or isFreeBSDJail())
++ test(info.localAddress =3D=3D defaultHost or isFreeBSDJail())
+=20
+ ctx =3D testIntf.getConnectionInfoAsContext()
+ test(ctx["incoming"] =3D=3D "true")
diff -ruN --exclude=3DCVS ../py-ice.orig/files/patch-py-test-Ice-properties=
-run.py ./files/patch-py-test-Ice-properties-run.py
--- ../py-ice.orig/files/patch-py-test-Ice-properties-run.py 1970-01-01 01:=
00:00.000000000 +0100
+++ ./files/patch-py-test-Ice-properties-run.py 2012-09-11 21:07:04.0000000=
00 +0200
@@ -0,0 +1,19 @@
+--- py/test/Ice/properties/run.py.orig 2011-06-15 19:44:00.000000000 +0000
++++ py/test/Ice/properties/run.py 2012-09-11 19:05:41.531273236 +0000
+@@ -24,14 +24,14 @@
+ #
+ # Write config
+ #
+-configPath =3D u"./config/=E4=B8=AD=E5=9B=BD_client.config"
++configPath =3D u"./config/=E4=B8=AD=E5=9B=BD_client.config".encode("utf-8=
")
+=20
+ TestUtil.createConfig(configPath,=20
+ ["# Automatically generated by Ice test driver.",=20
+ "Ice.Trace.Protocol=3D1",
+ "Ice.Trace.Network=3D1",=20
+ "Ice.ProgramName=3DPropertiesClient",=20
+- "Config.Path=3D./config/=E4=B8=AD=E5=9B=BD_client.=
config"])
++ "Config.Path=3D"+configPath])
+=20
+ TestUtil.simpleTest()
+=20
diff -ruN --exclude=3DCVS ../py-ice.orig/pkg-plist ./pkg-plist
--- ../py-ice.orig/pkg-plist 2012-08-21 21:29:17.000000000 +0200
+++ ./pkg-plist 2012-09-11 23:15:48.000000000 +0200
@@ -1,64 +1,186 @@
%%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifierF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifierF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifierF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Glacier2.py
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Glacier2.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.py
+%%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.py
+%%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.pyo
%%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.py
+%%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.pyo
%%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_BuiltinSequences_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_BuiltinSequences_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_BuiltinSequences_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_CommunicatorF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_CommunicatorF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_CommunicatorF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Communicator_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Communicator_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Communicator_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ConnectionF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ConnectionF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ConnectionF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointTypes_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointTypes_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointTypes_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Locator_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Locator_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Locator_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_LoggerF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_LoggerF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_LoggerF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Logger_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Logger_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Logger_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapterF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapterF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapterF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapter_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapter_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapter_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactoryF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactoryF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactoryF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactory_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactory_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactory_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_PluginF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_PluginF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_PluginF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.py
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.pyc
+%%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.pyo
%%PYTHON_SITELIBDIR%%/Ice/IcePy.so
%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VERSION%%
%%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VRS%%
@@ -172,13 +294,23 @@
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_StatsF_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Ice_Stats_ice.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2/__init__.py
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2/__init__.pyc
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2/__init__.pyo
@rmtry %%PYTHON_SITELIBDIR%%/Ice/Glacier2
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.py
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.pyc
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.pyo
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceBox
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.py
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.pyc
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.pyo
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceGrid
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.py
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.pyc
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.pyo
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IcePatch2
@rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.py
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.pyc
+ at rmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.pyo
@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm
@dirrmtry %%PYTHO
--MP_/l2SRWsGWoVAuwHaSxfL=MMK--
More information about the freebsd-python
mailing list