Attachment #138485 for bug #184453

View | Details | Raw Unified | Return to bug 184453
Collapse All | Expand All




# $FreeBSD: devel/ice/Makefile 327723 2013-09-20 17:04:43Z bapt $

PORTNAME=		Ice
PORTVERSION=		3.5.1
CATEGORIES=		devel
MASTER_SITES=		http://download.zeroc.com/Ice/3.5/


LIB_DEPENDS=		expat:${PORTSDIR}/textproc/expat2 \
			mcpp:${PORTSDIR}/devel/mcpp

OPTIONS_DEFINE?=	DEBUG DEMOS DOCS TESTS
OPTIONS_DEFAULT?=	DEMOS TESTS
TESTS_DESC?=		Build and run tests (requires lang/python)
DEMOS_DESC?=		Build demos

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MTESTS}

USE_BDB=		5
INVALID_BDB_VER=	2 3 40 41 42 43 44 46 47 48
USE_LDCONFIG=		yes
BUILD_WRKSRC?=		${WRKSRC}/cpp
INSTALL_WRKSRC?=	${WRKSRC}/cpp

CFLAGS+=		-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
.if ${PORT_OPTIONS:MDEBUG}
CFLAGS+=		-g
.else
CFLAGS+=		-DNDEBUG
.endif


BROKEN=			fails to link
.endif

.if ${OSVERSION} >= 1000000
BROKEN=			Does not work on FreeBSD 10
.endif

.if ((${ARCH} != i386) && (${ARCH} != powerpc))
MAKE_ENV+=		LP64=yes
.endif

.if !${PORT_OPTIONS:MTESTS}

.endif

.if !${PORT_OPTIONS:MDOCS}
MAKE_ENV+=		NOICEDOCS=yes
.endif

.include <bsd.port.pre.mk>

.if defined(PYTHON_REL) && ${PYTHON_REL} >= 320
PLIST_SUB+=	PYTHON32=""
PLIST_SUB+=	PYTHONPRE32="@comment "
.else
PLIST_SUB+=	PYTHON32="@comment "
PLIST_SUB+=	PYTHONPRE32=""
.endif

PLIST_SUB+=	PYTHON_SUFFIX=${PYTHON_SUFFIX}

.if ${PREFIX} != ${LOCALBASE} && !defined(NO_STAGE)
PYSITEDIR=	${PREFIX}${PYTHON_SITELIBDIR:S|^${LOCALBASE}||}
.else
PYSITEDIR=	${PYTHON_SITELIBDIR}
.endif

.if ${PORT_OPTIONS:MNAMESPACES}
MAKE_ARGS+=	USE_NAMESPACES=yes
PLIST_SUB+=	NAMESPACES=""
PLIST_SUB+=	NONAMESPACES="@comment "
.else
PLIST_SUB+=	NAMESPACES="@comment "
PLIST_SUB+=	NONAMESPACES=""
.endif

post-patch:
	@${SED} 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g; \
		s|%%DATADIR%%|${STAGEDIR}${DATADIR}|g; \
		s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g; \
		s|%%ICONV_LIB%%|${ICONV_LIB}|g; \
		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g' \
		${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD

		${WRKSRC}/cpp/config/Make.rules
	@${REINPLACE_CMD} 's|INSTALL_PROGRAM|INSTALL_DATA|g' \
		${WRKSRC}/cpp/src/ca/Makefile
	@${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/; \
		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; ' \
		${WRKSRC}/config/Make.common.rules
	@${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
		s|%%ICONV_LIB%%|${ICONV_LIB}|g; \
		s|%%PYTHON_SITELIBDIR%%|${STAGEDIR}${PYSITEDIR}|g; \
		s|%%PREFIX%%|${PREFIX}|g ; \
		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/py/config/Make.rules
	@${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
		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

Lines 1-2 Link Here

(-)devel/ice/distinfo (-2 / +2 lines)
1	SHA256 (Ice-3.5.0.tar.gz) = bbde6b5a87f5abc8d9105468731f1419829bc22b5d23b8fdef553967a2eebdb0	1	SHA256 (Ice-3.5.1.tar.gz) = 989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
2	SIZE (Ice-3.5.0.tar.gz) = 4790555	2	SIZE (Ice-3.5.1.tar.gz) = 4799296

Lines 1-6 Link Here

(-)devel/ice/files/Make.rules.FreeBSD (-1 / +2 lines)
1	mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)	1	mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
2		2
3	BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv	3	BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib %%ICONV_LIB%%
4	LIBS = -lIce $(BASELIBS)	4	LIBS = -lIce $(BASELIBS)
5		5
6	ICEUTIL_OS_LIBS = -pthread	6	ICEUTIL_OS_LIBS = -pthread
Lines 19-21 Link Here
19	INSTALL = %%INSTALL_DATA%%	19	INSTALL = %%INSTALL_DATA%%
20	INSTALL_PROGRAM = %%INSTALL_PROGRAM%%	20	INSTALL_PROGRAM = %%INSTALL_PROGRAM%%
21	MCPP_HOME = $(LOCALBASE)	21	MCPP_HOME = $(LOCALBASE)
		22	override DESTDIR =




--- config.orig/Make.common.rules	2013-05-20 22:21:58.666286011 +0000
+++ config/Make.common.rules	2013-05-20 22:20:50.897196090 +0000
@@ -19,7 +19,7 @@
 SHORT_VERSION           = 3.4
 SOVERSION		= 34
 
-INSTALL			= cp -fp
+INSTALL			= %%INSTALL_PROGRAM%%
 INSTALL_PROGRAM		= ${INSTALL}
 INSTALL_LIBRARY		= ${INSTALL}
 INSTALL_DATA		= ${INSTALL}
@@ -386,11 +386,15 @@
 	then \
 	    echo "Creating $(DESTDIR)$(install_slicedir)..." ; \
 	    $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \
+	fi
+
+	@if test -d $(DESTDIR)$(install_slicedir) ; \
+	then \
 	    cd $(top_srcdir)/../slice ; \
 	    for subdir in * ; \
 	    do \
 	        echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \
 	        cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \
 	    done ; \
-	    fi
+	fi
 
@@ -410,12 +410,12 @@
     fi
 
 
-	@if test ! -f $(DESTDIR)$(prefix)/CHANGES$(TEXT_EXTENSION) ; \
+	@if test ! -f $(DESTDIR)$(install_slicedir)/CHANGES$(TEXT_EXTENSION) ; \
 	then \
-		$(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \
+		$(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
 	fi
 
-	@if test ! -f $(DESTDIR)$(prefix)/RELEASE_NOTES$(TEXT_EXTENSION) ; \
+	@if test ! -f $(DESTDIR)$(install_slicedir)/RELEASE_NOTES$(TEXT_EXTENSION) ; \
 	then \
-		$(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \
+		$(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
 	fi

Lines 17-23 Link Here

(-)devel/ice/files/patch-cpp-Makefile (-1 / +1 lines)
17	endif	17	endif
18	+endif	18	+endif
19	+	19	+
20	+ifeq ($(NOPORTDOCS),)	20	+ifeq ($(NOICEDOCS),)
21	+SUBDIRS := $(SUBDIRS) doc	21	+SUBDIRS := $(SUBDIRS) doc
22	+endif	22	+endif
23	+	23	+

Lines 9-14 Link Here

(-)devel/ice/files/patch-cpp-allTests.py (+9 lines)
9	("Ice/defaultServant", ["core"]),	9	("Ice/defaultServant", ["core"]),
10	("Ice/defaultValue", ["core"]),	10	("Ice/defaultValue", ["core"]),
11	("Ice/invoke", ["core", "novc6"]),	11	("Ice/invoke", ["core", "novc6"]),
		12	@@ -85,7 +85,7 @@
		13	("IceStorm/federation2", ["service", "novc90", "nomingw"]),
		14	("IceStorm/stress", ["service", "stress", "novc90", "noappverifier", "nomingw"]), # Too slow with appverifier.
		15	("IceStorm/rep1", ["service", "novc90", "nomingw"]),
		16	- ("IceStorm/repgrid", ["service", "novc90", "nomingw"]),
		17	+ ("IceStorm/repgrid", ["service", "novc90", "nomingw", "nofreebsd"]),
		18	("IceStorm/repstress", ["service", "noipv6", "stress", "novc90", "nomingw"]),
		19	("FreezeScript/dbmap", ["once", "novc90", "nomingw"]),
		20	("FreezeScript/evictor", ["once", "novc90", "nomingw"]),
12	@@ -106,8 +107,8 @@	21	@@ -106,8 +107,8 @@
13	#	22	#
14	if TestUtil.isWin32() or os.getuid() == 0:	23	if TestUtil.isWin32() or os.getuid() == 0:

Lines 1-11 Link Here

(-)devel/ice/files/patch-cpp-include-IceUtil-Config.h (-11 lines)
1	--- cpp.orig/include/IceUtil/Config.h 2013-03-11 15:19:46.000000000 +0000
2	+++ cpp/include/IceUtil/Config.h 2013-05-20 02:09:58.239194578 +0000
3	@@ -51,7 +51,7 @@
4	// Check for C++ 11 support
5	//
6	#if (defined(__GNUC__) && (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) \|\| \
7	- (defined(__clang__) && (__clang_major__ >= 4) && __cplusplus >= 201103) \|\| \
8	+ (defined(__clang__) && ((defined(__APPLE__) && __clang_major__ >= 4) \|\| (!defined(__APPLE__) && __clang_major__ >= 3)) && __cplusplus >= 201103) \|\| \
9	(defined(_MSC_VER) && (_MSC_VER >= 1600))
10	# define ICE_CPP11
11	#endif

Lines 1-16 Link Here

(-)devel/ice/files/patch-cpp-src-IceGrid-FileCache.cpp (-16 lines)
1	--- cpp.orig/src/IceGrid/FileCache.cpp 2013-03-11 15:19:12.271195149 +0000
2	+++ cpp/src/IceGrid/FileCache.cpp 2013-06-01 17:47:48.636196265 +0000
3	@@ -195,11 +195,11 @@
4	// Some eofbit cases will also set failbit. So first
5	// check eof.
6	//
7	- if(is.eof())
8	+ if(is.eof() \|\| is.fail())
9	{
10	newOffset += line.size();
11	}
12	- else if(!is.fail())
13	+ else
14	{
15	newOffset = is.tellg();
16	}




--- cpp.orig/src/slice2cpp/Gen.cpp	2013-03-11 15:19:46.000000000 +0000
+++ cpp/src/slice2cpp/Gen.cpp	2013-05-20 19:51:48.109197053 +0000
@@ -756,10 +756,11 @@
 
         C << sp << nl << "class " << factoryName << "__Init";
         C << sb;
+        C << nl << "IceInternal::FactoryTableInit* _ftableinit;";
         C.dec();
         C << nl << "public:";
         C.inc();
-        C << sp << nl << factoryName << "__Init()";
+        C << sp << nl << factoryName << "__Init(): _ftableinit(new IceInternal::FactoryTableInit)";
         C << sb;
         C << nl << "::IceInternal::factoryTable->addExceptionFactory(\"" << p->scoped() << "\", new "
           << factoryName << ");";
@@ -767,6 +768,7 @@
         C << sp << nl << "~" << factoryName << "__Init()";
         C << sb;
         C << nl << "::IceInternal::factoryTable->removeExceptionFactory(\"" << p->scoped() << "\");";
+        C << nl << "delete _ftableinit;";
         C << eb;
         C << eb << ';';
 
@@ -3976,10 +3978,11 @@
             C << sp;
             C << nl << "class " << factoryName << "__Init";
             C << sb;
+            C << nl << "IceInternal::FactoryTableInit* _ftableinit;";
             C.dec();
             C << nl << "public:";
             C.inc();
-            C << sp << nl << factoryName << "__Init()";
+            C << sp << nl << factoryName << "__Init(): _ftableinit(new IceInternal::FactoryTableInit)";
             C << sb;
             if(!p->isAbstract())
             {
@@ -4002,6 +4005,7 @@
             {
                 C << nl << "::IceInternal::factoryTable->removeTypeId(" << p->compactId() << ");";
             }
+            C << nl << "delete _ftableinit;";
             C << eb;
             C << eb << ';';
 
     if(p->hasNonLocalDataOnlyClasses() || p->hasNonLocalExceptions())
     {




--- cpp.orig/test/Ice/properties/run.py	2013-03-11 15:19:47.000000000 +0000
+++ cpp/test/Ice/properties/run.py	2013-05-21 03:48:13.020195761 +0000
@@ -28,15 +28,15 @@
 #
 if sys.version_info[0] == 2:
     configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
-    TestUtil.createConfig(configPath, 
+    TestUtil.createConfig(configPath.encode("utf-8"), 
                           ["# Automatically generated by Ice test driver.", 
                            "Ice.Trace.Protocol=1",
                            "Ice.Trace.Network=1", 
                            "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=./config/中国_client.config"])
+                           "Config.Path=" + configPath.encode("utf-8")])
 else:
     configPath = "./config/\u4e2d\u56fd_client.config"
-    TestUtil.createConfig(configPath, 
+    TestUtil.createConfig(configPath.encode("utf-8"), 
                           ["# Automatically generated by Ice test driver.", 
                            "Ice.Trace.Protocol=1",
                            "Ice.Trace.Network=1", 
@@ -46,5 +46,5 @@
 
 TestUtil.simpleTest(client)
 
-if os.path.exists(configPath):
-    os.remove(configPath)
+if os.path.exists(configPath.encode("utf-8")):
+    os.remove(configPath.encode("utf-8"))

Line 0 Link Here

(-)devel/ice/files/patch-php-Makefile (+11 lines)
	1	--- php/Makefile.orig 2013-10-04 15:48:15.000000000 +0000
	2	+++ php/Makefile 2013-12-01 21:19:31.863489109 +0000
	3	@@ -14,7 +14,7 @@
	4	SUBDIRS = src lib demo test
	5	INSTALL_SUBDIRS = $(install_phpdir) $(install_libdir)
	6
	7	-install:: install-common
	8	+install::
	9	@for subdir in $(INSTALL_SUBDIRS); \
	10	do \
	11	if test ! -d $(DESTDIR)$$subdir ; \




--- php/config/Make.rules.php.orig	2013-03-11 15:19:47.000000000 +0000
+++ php/config/Make.rules.php	2013-06-02 14:36:13.744196194 +0000
@@ -100,8 +100,8 @@
 endif
 
 libdir			= $(top_srcdir)/lib
 ifneq ($(prefix), /usr)
-install_phpdir      = $(prefix)/php
-install_libdir      = $(prefix)/php
+install_phpdir		= $(prefix)/share/pear
+install_libdir		= $(prefix)/lib/php/$(PHP_EXT_DIR)
 else

@@ -155,7 +155,8 @@
 endif
 
 ifeq ($(installphplib),)
-    installphplib	= $(INSTALL) $(1) $(2); \
+    installphplib	= mkdir -p $(2) ; \
+			  $(INSTALL) $(1) $(2); \
 			  chmod a+rx $(2)/$(notdir $(1))
 endif
 




--- php/lib/Makefile.orig	2013-06-02 12:11:06.451195440 +0000
+++ php/lib/Makefile	2013-06-02 12:16:29.249191742 +0000
@@ -167,7 +167,8 @@
 	@echo "Installing generated code"
 	@for i in $(MODULES) ; \
 	do \
-	    $(INSTALL_DATA) -r $$i $(DESTDIR)$(install_phpdir) ; \
+	    mkdir -p $(DESTDIR)$(install_phpdir)/$$i ; \
+	    $(INSTALL_DATA) $$i/*.php $(DESTDIR)$(install_phpdir)/$$i ; \
 	done
 	@for i in $(MODULE_SRCS) ; \
 	do \

Line 0 Link Here

(-)devel/ice/files/patch-py-Makefile (+11 lines)
	1	--- py/Makefile.orig 2013-10-04 15:48:15.000000000 +0000
	2	+++ py/Makefile 2013-12-01 16:37:09.381657035 +0000
	3	@@ -15,7 +15,7 @@
	4
	5	INSTALL_SUBDIRS = $(install_pythondir) $(install_libdir)
	6
	7	-install:: install-common
	8	+install::
	9	@for subdir in $(INSTALL_SUBDIRS); \
	10	do \
	11	if test ! -d $(DESTDIR)$$subdir ; \




--- py/config/Make.rules.orig	2013-03-11 15:19:47.000000000 +0000
+++ py/config/Make.rules	2013-05-20 14:21:13.335195726 +0000
@@ -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
@@ -96,8 +97,8 @@
 
 libdir                  = $(top_srcdir)/python
 ifneq ($(prefix), /usr)
-install_pythondir       = $(prefix)/python
-install_libdir          = $(prefix)/python
+install_pythondir       = %%PYTHON_SITELIBDIR%%/Ice
+install_libdir          = %%PYTHON_SITELIBDIR%%/Ice
 else
     ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0)
         install_pythondir       = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
@@ -128,7 +129,7 @@
     ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
     ICE_FLAGS	= -I$(ice_dir)/include
 endif
-ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
+ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil %%ICONV_LIB%%
 
 ifneq ($(embedded_runpath_prefix),)
    runpath_libdir	:= $(embedded_runpath_prefix)/$(libsubdir)
@@ -167,7 +167,7 @@
 
 all:: $(SRCS)
 
-%_ice.py: $(slicedir)/%.ice
+%_ice.py: $(ICE_HOME)/%.ice
 	rm -f $(*F).py
 	$(SLICE2PY) $(SLICE2PYFLAGS) $<
 




--- 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 @@
 
 install:: $(ALL_SRCS)
 	@echo "Installing generated code"
-	$(INSTALL_DATA) *.py $(DESTDIR)$(install_pythondir)
+	$(INSTALL_DATA) *.py* $(DESTDIR)$(install_pythondir)
 	@for i in $(PACKAGES) ; \
 	do \
-	    $(INSTALL_DATA) -r $$i $(DESTDIR)$(install_pythondir) ; \
+	    mkdir -p $(DESTDIR)$(install_pythondir)/$$i ; \
+	    $(INSTALL_DATA) $$i/*.py* $(DESTDIR)$(install_pythondir)/$$i ; \
 	done
 
 depend::  $(ICE_SLICE) $(GLACIER2_SLICE) $(ICEBOX_SLICE) $(ICEGRID_SLICE) $(ICEPATCH2_SLICE) $(ICESTORM_SLICE)




--- py/test/Ice/info/AllTests.py.orig	2013-03-11 15:19:47.000000000 +0000
+++ py/test/Ice/info/AllTests.py	2013-05-20 14:25:56.860196743 +0000
@@ -7,12 +7,31 @@
 #
 # **********************************************************************
 
-import Ice, Test, sys, threading
+import Ice, Test, sys, threading, subprocess
 
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
+def isFreeBSD():
+    return sys.platform.startswith("freebsd")
+
+def sysctl(key):
+    p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE)
+    try:
+        result = p.communicate()[0].strip().split()[1]
+    except IndexError:
+        return 0    
+    if sys.version_info >= (3,):
+        result = 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):
     sys.stdout.write("testing proxy endpoint information... ")
     sys.stdout.flush()
@@ -67,12 +86,12 @@
 
     ipEndpoint = endpoints[0].getInfo()
     test(ipEndpoint.type() == Ice.TCPEndpointType or ipEndpoint.type() == 2)
-    test(ipEndpoint.host == defaultHost)
+    test(ipEndpoint.host == defaultHost or isFreeBSDJail())
     test(ipEndpoint.port > 0)
     test(ipEndpoint.timeout == 15000)
 
     udpEndpoint = endpoints[1].getInfo()
-    test(udpEndpoint.host == defaultHost)
+    test(udpEndpoint.host == defaultHost or isFreeBSDJail())
     test(udpEndpoint.datagram())
     test(udpEndpoint.port > 0)
 
@@ -108,7 +127,7 @@
     ipinfo = base.ice_getConnection().getEndpoint().getInfo()
     test(ipinfo.port == 12010)
     test(not ipinfo.compress)
-    test(ipinfo.host == defaultHost)
+    test(ipinfo.host == defaultHost or isFreeBSDJail())
 
     ctx = testIntf.getEndpointInfoAsContext()
     test(ctx["host"] == ipinfo.host)
@@ -118,7 +137,7 @@
 
     udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
     test(udp.port == 12010)
-    test(udp.host == defaultHost)
+    test(udp.host == defaultHost or isFreeBSDJail())
 
     print("ok")
 
@@ -129,8 +148,8 @@
     test(not info.incoming)
     test(len(info.adapterName) == 0)
     test(info.remotePort == 12010)
-    test(info.remoteAddress == defaultHost)
-    test(info.localAddress == defaultHost)
+    test(info.remoteAddress == defaultHost or isFreeBSDJail())
+    test(info.localAddress == defaultHost or isFreeBSDJail())
 
     ctx = testIntf.getConnectionInfoAsContext()
     test(ctx["incoming"] == "true")




include/Ice/MetricsAdminI.h
include/Ice/MetricsFunctional.h
include/Ice/MetricsObserverI.h
include/Ice/NativePropertiesAdmin.h
include/Ice/NetworkF.h
include/Ice/Object.h
include/Ice/ObjectAdapter.h
include/Ice/ObjectAdapterF.h

include/Slice/Util.h
lib/ImportKey.class
lib/libFreeze.so
lib/libFreeze.so.3.5.1
lib/libFreeze.so.35
lib/libGlacier2.so
lib/libGlacier2.so.3.5.1
lib/libGlacier2.so.35
lib/libIce.so
lib/libIce.so.3.5.1
lib/libIce.so.35
lib/libIceBox.so
lib/libIceBox.so.3.5.1
lib/libIceBox.so.35
lib/libIceDB.so
lib/libIceDB.so.3.5.1
lib/libIceDB.so.35
lib/libIceGrid.so
lib/libIceGrid.so.3.5.1
lib/libIceGrid.so.35
lib/libIceGridFreezeDB.so
lib/libIceGridFreezeDB.so.3.5.1
lib/libIceGridFreezeDB.so.35
lib/libIcePatch2.so
lib/libIcePatch2.so.3.5.1
lib/libIcePatch2.so.35
lib/libIceSSL.so
lib/libIceSSL.so.3.5.1
lib/libIceSSL.so.35
lib/libIceStorm.so
lib/libIceStorm.so.3.5.1
lib/libIceStorm.so.35
lib/libIceStormFreezeDB.so
lib/libIceStormFreezeDB.so.3.5.1
lib/libIceStormFreezeDB.so.35
lib/libIceStormService.so
lib/libIceStormService.so.3.5.1
lib/libIceStormService.so.35
lib/libIceUtil.so
lib/libIceUtil.so.3.5.1
lib/libIceUtil.so.35
lib/libIceXML.so
lib/libIceXML.so.3.5.1
lib/libIceXML.so.35
lib/libSlice.so
lib/libSlice.so.3.5.1
lib/libSlice.so.35
man/man1/dumpdb.1.gz
man/man1/glacier2router.1.gz
man/man1/icebox.1.gz
man/man1/iceboxadmin.1.gz
man/man1/iceca.1.gz
man/man1/icegridadmin.1.gz
man/man1/icegridnode.1.gz
man/man1/icegridregistry.1.gz
man/man1/icepatch2calc.1.gz
man/man1/icepatch2client.1.gz
man/man1/icepatch2server.1.gz
man/man1/icestormadmin.1.gz
man/man1/icestormmigrate.1.gz
man/man1/slice2cpp.1.gz
man/man1/slice2cs.1.gz
man/man1/slice2freeze.1.gz
man/man1/slice2freezej.1.gz
man/man1/slice2html.1.gz
man/man1/slice2java.1.gz
man/man1/slice2php.1.gz
man/man1/slice2py.1.gz
man/man1/slice2rb.1.gz
man/man1/transformdb.1.gz
%%DATADIR%%/CHANGES
%%DATADIR%%/Freeze/BackgroundSaveEvictor.ice
%%DATADIR%%/Freeze/CatalogData.ice
%%DATADIR%%/Freeze/Connection.ice

%%DATADIR%%/Ice/PluginF.ice
%%DATADIR%%/Ice/Process.ice
%%DATADIR%%/Ice/ProcessF.ice
%%DATADIR%%/Ice/PropertiesAdmin.ice
%%DATADIR%%/Ice/Properties.ice
%%DATADIR%%/Ice/PropertiesF.ice
%%DATADIR%%/Ice/Router.ice

%%DATADIR%%/IceStorm/IceStorm.ice
%%DATADIR%%/IceStorm/Metrics.ice
%%DATADIR%%/LICENSE
%%DATADIR%%/RELEASE_NOTES
%%DATADIR%%/config/convertssl.py
%%DATADIR%%/config/icegrid-slice.3.1.ice.gz
%%DATADIR%%/config/icegrid-slice.3.2.ice.gz




# Created by: DIrk Ye <dirk.ye@gmail.com>
# $FreeBSD: devel/php5-ice/Makefile 327724 2013-09-20 17:13:42Z bapt $

PORTNAME=	Ice
PORTVERSION=	3.5.0
CATEGORIES=	devel
MASTER_SITES=	http://download.zeroc.com/Ice/3.5/
PKGNAMEPREFIX=	php5-

MAINTAINER=	freebsd@grem.de


LICENSE=	GPLv2

BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp \
		slice2php:${PORTSDIR}/devel/ice
LIB_DEPENDS=	Ice.${LIB_VRS}:${PORTSDIR}/devel/ice

OPTIONS_DEFINE=	DEBUG DOCS NAMESPACES
OPTIONS_DEFAULT=
NAMESPACES_DESC=	Use PHP namespaces (recommended)

USE_GMAKE=	yes
SLAVE_PORT=	yes
MASTERDIR=	${.CURDIR}/../ice
PLIST=		${.CURDIR}/pkg-plist

MAKE_ARGS+=	PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${LOCALBASE} \
		PHP_HOME=${LOCALBASE} OPTIMIZE=yes
USE_PHP=	yes
USE_PHP_BUILD=	yes
DEFAULT_PHP_VER=5

LIB_VRS=	${PORTVERSION:S|.||g:C|0$||}
PHP_MODNAME?=	IcePHP

NO_STAGE=	yes
.include <bsd.port.options.mk>

CFLAGS+=	-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT
.if ${PORT_OPTIONS:MDEBUG}
CFLAGS+=	-g
.else
CFLAGS+=	-DNDEBUG
.endif

.if ${ARCH} == "ia64"
BROKEN=		does not compile on ia64
.endif

.if ((${ARCH} != i386) && (${ARCH} != powerpc))
MAKE_ENV=	LP64=yes
.endif

.if ${PORT_OPTIONS:MNAMESPACES}
MAKE_ARGS+=	USE_NAMESPACES=yes
PLIST_SUB+=	NAMESPACES=""
PLIST_SUB+=	NONAMESPACES="@comment "
.else
PLIST_SUB+=	NAMESPACES="@comment "
PLIST_SUB+=	NONAMESPACES=""
.endif

.if empty(PORT_OPTIONS:MDOCS)
MAKE_ENV+=	NOPORTDOCS=yes
.endif

post-patch:
	@${SED} '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|%%PREFIX%%|${PREFIX}|g ; \
		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/php/config/Make.rules.php

post-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
	@${ECHO_CMD} extension=${PHP_MODNAME}.so \
		>> ${PREFIX}/etc/php/extensions.ini

add-plist-info:
	@${ECHO_CMD} "@exec mkdir -p %D/etc/php" \

	@${ECHO_CMD} ""
	@${ECHO_CMD} "****************************************************************************"

.include "${MASTERDIR}/Makefile"

Lines 1-2 Link Here

(-)devel/php5-ice/distinfo (-2 lines)
1	SHA256 (Ice-3.5.0.tar.gz) = bbde6b5a87f5abc8d9105468731f1419829bc22b5d23b8fdef553967a2eebdb0
2	SIZE (Ice-3.5.0.tar.gz) = 4790555




mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)

BASELIBS		= -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv
LIBS			= -lIce $(BASELIBS) 

ICEUTIL_OS_LIBS         = -pthread

PLATFORM_HAS_READLINE   := yes

export LD_LIBRARY_PATH	:= $(libdir):$(LD_LIBRARY_PATH)

lp64suffix		=
create_runpath_symlink	= no
prefix			= %%PREFIX%%
install_slicedir	= %%DATADIR%%
install_configdir	= %%DATADIR%%/config
install_docdir		= %%DOCSDIR%%
EXPAT_HOME		= $(LOCALBASE)
INSTALL			= %%INSTALL_DATA%%
INSTALL_PROGRAM		= %%INSTALL_PROGRAM%%
MCPP_HOME		= $(LOCALBASE)




--- ./config/Make.common.rules.orig	2013-06-05 13:13:29.000000000 +0400
+++ ./config/Make.common.rules	2013-06-17 09:45:21.000000000 +0400
@@ -385,13 +385,3 @@
 	        cp -fpr $$subdir $(install_slicedir) ; \
 	    done ; \
 	    fi
-
-	@if test ! -f $(prefix)/ICE_LICENSE$(TEXT_EXTENSION) ; \
-	then \
-	    $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(prefix)) ; \
-	fi
-
-	@if test ! -f $(prefix)/LICENSE$(TEXT_EXTENSION) ; \
-	then \
-	    $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(prefix)) ; \
-	fi




--- cpp.orig/config/Make.rules	Fri Mar 11 16:19:00 2013
+++ cpp/config/Make.rules	Fri May 19 22:00:09 2013
@@ -233,7 +233,9 @@
           DB_FLAGS          = -I/usr/local/include/db53
           DB_LIBS           = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
       else
-        DB_LIBS      = -ldb_cxx
+        DB_FLAGS          = -I%%BDB_INCLUDE_DIR%%
+        DB_LIBS           = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
+        DB_RPATH_LINK     = $(call rpathlink,%%BDB_LIB_DIR%%)
       endif
    endif
 endif




--- php/config/Make.rules.php.orig	2013-03-11 15:19:47.000000000 +0000
+++ php/config/Make.rules.php	2013-06-02 14:36:13.744196194 +0000
@@ -100,8 +100,8 @@
 endif
 
 libdir			= $(top_srcdir)/lib
-install_phpdir		= $(prefix)/php
-install_libdir		= $(prefix)/php
+install_phpdir		= $(prefix)/share/pear
+install_libdir		= $(prefix)/lib/php/$(PHP_EXT_DIR)
 
 #
 # Platform specific definitions
@@ -155,7 +155,8 @@
 endif
 
 ifeq ($(installphplib),)
-    installphplib	= $(INSTALL) $(1) $(2); \
+    installphplib	= mkdir -p $(2) ; \
+			  $(INSTALL) $(1) $(2); \
 			  chmod a+rx $(2)/$(notdir $(1))
 endif
 

Lines 1-12 Link Here

(-)devel/php5-ice/files/patch-php-lib-Makefile (-12 lines)
1	--- php/lib/Makefile.orig 2013-06-02 12:11:06.451195440 +0000
2	+++ php/lib/Makefile 2013-06-02 12:16:29.249191742 +0000
3	@@ -167,7 +167,8 @@
4	@echo "Installing generated code"
5	@for i in $(MODULES) ; \
6	do \
7	- $(INSTALL_DATA) -r $$i $(install_phpdir) ; \
8	+ mkdir -p $(install_phpdir)/$$i ; \
9	+ $(INSTALL_DATA) $$i/*.php $(install_phpdir)/$$i ; \
10	done
11	@for i in $(MODULE_SRCS) ; \
12	do \

Lines 1-11 Link Here

(-)devel/php5-ice/files/patch-php-src-IcePHP-Communicator.cpp (-11 lines)
1	--- php/src/IcePHP/Communicator.cpp.orig 2013-06-02 11:48:21.990197196 +0000
2	+++ php/src/IcePHP/Communicator.cpp 2013-06-02 11:48:29.692195174 +0000
3	@@ -1341,7 +1341,7 @@
4	//
5	zend_class_entry ce;
6	#ifdef ICEPHP_USE_NAMESPACES
7	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Communicator"), _interfaceMethods);
8	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "Communicator", _interfaceMethods);
9	#else
10	INIT_CLASS_ENTRY(ce, "Ice_Communicator", _interfaceMethods);
11	#endif




--- php/src/IcePHP/Connection.cpp.orig	2013-06-02 11:48:58.022196354 +0000
+++ php/src/IcePHP/Connection.cpp	2013-06-02 11:50:59.494195380 +0000
@@ -360,7 +360,7 @@
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Connection"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Connection", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Connection", _interfaceMethods);
 #endif
@@ -380,7 +380,7 @@
     // Register the ConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("ConnectionInfo"), _connectionInfoClassMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "ConnectionInfo", _connectionInfoClassMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_ConnectionInfo", _connectionInfoClassMethods);
 #endif
@@ -396,7 +396,7 @@
     // Register the IPConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPConnectionInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "IPConnectionInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_IPConnectionInfo", NULL);
 #endif
@@ -415,7 +415,7 @@
     // Register the TCPConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPConnectionInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPConnectionInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_TCPConnectionInfo", NULL);
 #endif
@@ -426,7 +426,7 @@
     // Register the UDPConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPConnectionInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPConnectionInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_UDPConnectionInfo", NULL);
 #endif




--- php/src/IcePHP/Endpoint.cpp.orig	2013-06-02 11:51:19.569193334 +0000
+++ php/src/IcePHP/Endpoint.cpp	2013-06-02 11:52:06.348197336 +0000
@@ -274,7 +274,7 @@
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Endpoint"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Endpoint", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Endpoint", _interfaceMethods);
 #endif
@@ -293,7 +293,7 @@
     // Register the EndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("EndpointInfo"), _endpointInfoMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "EndpointInfo", _endpointInfoMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_EndpointInfo", _endpointInfoMethods);
 #endif
@@ -309,7 +309,7 @@
     // Register the IPEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "IPEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_IPEndpointInfo", NULL);
 #endif
@@ -324,7 +324,7 @@
     // Register the TCPEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_TCPEndpointInfo", NULL);
 #endif
@@ -335,7 +335,7 @@
     // Register the UDPEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_UDPEndpointInfo", NULL);
 #endif
@@ -350,7 +350,7 @@
     // Register the OpaqueEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("OpaqueEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "OpaqueEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_OpaqueEndpointInfo", NULL);
 #endif




--- php/src/IcePHP/Init.cpp.orig	2013-03-11 15:19:47.000000000 +0000
+++ php/src/IcePHP/Init.cpp	2013-06-02 11:44:16.052196522 +0000
@@ -22,10 +22,10 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(ice)
 
-ZEND_BEGIN_ARG_INFO(Ice_initialize_arginfo, 1)
+ZEND_BEGIN_ARG_INFO_EX(Ice_initialize_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1))
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(Ice_createProperties_arginfo, 1)
+ZEND_BEGIN_ARG_INFO_EX(Ice_createProperties_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1))
 ZEND_END_ARG_INFO()
 
 #define ICEPHP_COMMUNICATOR_FUNCTIONS \

Lines 1-11 Link Here

(-)devel/php5-ice/files/patch-php-src-IcePHP-Logger.cpp (-11 lines)
1	--- php/src/IcePHP/Logger.cpp.orig 2013-06-02 11:52:25.727195546 +0000
2	+++ php/src/IcePHP/Logger.cpp 2013-06-02 11:52:39.876195038 +0000
3	@@ -269,7 +269,7 @@
4	//
5	zend_class_entry ce;
6	#ifdef ICEPHP_USE_NAMESPACES
7	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Logger"), _interfaceMethods);
8	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "Logger", _interfaceMethods);
9	#else
10	INIT_CLASS_ENTRY(ce, "Ice_Logger", _interfaceMethods);
11	#endif

Lines 1-11 Link Here

(-)devel/php5-ice/files/patch-php-src-IcePHP-Properties.cpp (-11 lines)
1	--- php/src/IcePHP/Properties.cpp.orig 2013-06-02 11:52:55.531198249 +0000
2	+++ php/src/IcePHP/Properties.cpp 2013-06-02 11:53:07.786227648 +0000
3	@@ -641,7 +641,7 @@
4	//
5	zend_class_entry ce;
6	#ifdef ICEPHP_USE_NAMESPACES
7	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Properties"), _interfaceMethods);
8	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "Properties", _interfaceMethods);
9	#else
10	INIT_CLASS_ENTRY(ce, "Ice_Properties", _interfaceMethods);
11	#endif

Lines 1-11 Link Here

(-)devel/php5-ice/files/patch-php-src-IcePHP-Proxy.cpp (-11 lines)
1	--- php/src/IcePHP/Proxy.cpp.orig 2013-06-02 11:54:02.594196824 +0000
2	+++ php/src/IcePHP/Proxy.cpp 2013-06-02 11:53:46.793198453 +0000
3	@@ -1702,7 +1702,7 @@
4	//
5	zend_class_entry ce;
6	#ifdef ICEPHP_USE_NAMESPACES
7	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("ObjectPrx"), _proxyMethods);
8	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "ObjectPrx", _proxyMethods);
9	#else
10	INIT_CLASS_ENTRY(ce, "Ice_ObjectPrx", _proxyMethods);
11	#endif

Lines 38-43 Link Here

(-)devel/php5-ice/pkg-plist (+3 lines)
38	share/pear/Ice/Process.php	38	share/pear/Ice/Process.php
39	share/pear/Ice/ProcessF.php	39	share/pear/Ice/ProcessF.php
40	share/pear/Ice/Properties.php	40	share/pear/Ice/Properties.php
		41	share/pear/Ice/PropertiesAdmin.php
41	share/pear/Ice/PropertiesF.php	42	share/pear/Ice/PropertiesF.php
42	share/pear/Ice/Router.php	43	share/pear/Ice/Router.php
43	share/pear/Ice/RouterF.php	44	share/pear/Ice/RouterF.php
Lines 72-74 Link Here
72	@dirrmtry share/pear/IceStorm	73	@dirrmtry share/pear/IceStorm
73	@dirrmtry share/pear	74	@dirrmtry share/pear
74	@dirrmtry lib/php/%%PHP_EXT_DIR%%	75	@dirrmtry lib/php/%%PHP_EXT_DIR%%
		76	@dirrmtry lib/php
		77	@dirrmtry etc/php




# Created by: Boris B. Samorodov <bsam@ipt.ru>
# $FreeBSD: devel/py-ice/Makefile 327724 2013-09-20 17:13:42Z bapt $

PORTNAME=	Ice
PORTVERSION=	3.5.0
CATEGORIES=	devel python
MASTER_SITES=	http://download.zeroc.com/Ice/3.5/
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	freebsd@grem.de


LICENSE=	GPLv2

BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp \
		slice2py:${PORTSDIR}/devel/ice
LIB_DEPENDS=	Ice.${LIB_VRS}:${PORTSDIR}/devel/ice

USE_GMAKE=	yes
USE_PYTHON=	yes
SLAVE_PORT=	yes
MASTERDIR=	${.CURDIR}/../ice
PLIST=		${.CURDIR}/pkg-plist

BUILD_WRKSRC=	${WRKSRC}/py
INSTALL_WRKSRC=	${WRKSRC}/py

LIB_VRS=	${PORTVERSION:S|.||g:C|[0-9]$||}
PLIST_SUB=	LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
MAKE_ENV=	ICE_HOME="${LOCALBASE}/share/Ice"

# bypass infrastructure bug (taken from www/py-django)
OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options

OPTIONS_DEFAULT=TESTS
TESTS_DESC=	Run tests

NO_STAGE=	yes
.include <bsd.port.options.mk>

CFLAGS+=	-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT
.if empty(PORT_OPTIONS:MDEBUG)
CFLAGS+=	-DNDEBUG
.endif

.if ${ARCH} == "ia64"
BROKEN=		does not compile on ia64
.endif

.if ((${ARCH} != i386) && (${ARCH} != powerpc))
MAKE_ENV=	LP64=yes
.endif

.if empty(PORT_OPTIONS:MDOCS)
MAKE_ENV+=	NOPORTDOCS=yes
.endif

.include <bsd.port.pre.mk>

.if ${PYTHON_REL} >= 320
PLIST_SUB+=	PYTHON32=""
PLIST_SUB+=	PYTHONPRE32="@comment "
.else
PLIST_SUB+=	PYTHON32="@comment "
PLIST_SUB+=	PYTHONPRE32=""
.endif

PLIST_SUB+=	PYTHON_SUFFIX=${PYTHON_SUFFIX}

post-patch:
	@${SED} '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; \
		s|.(prefix).slice|${DATADIR}|g; \
		s|.(prefix).[ICE_]*LICENSE|${DATADIR}/LICENSE|g;' \
		${WRKSRC}/config/Make.common.rules

post-install:
	${ECHO} "Ice" > ${STAGEDIR}${PYSITEDIR}/Ice.pth
	@${FIND} ${STAGEDIR}${PYSITEDIR}/Ice \( -name "*.pyc" -or -name "*.pyo" \) \
		-exec ${CHMOD} u+w {} \;
	@${PYTHON_CMD} -m compileall ${STAGEDIR}${PYSITEDIR}/Ice
	@${PYTHON_CMD} -O -m compileall ${STAGEDIR}${PYSITEDIR}/Ice
TEST_CMD=	@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
.endif

.if ${PORT_OPTIONS:MTESTS}
post-build:
	${TEST_CMD}
regression-test test: build
	${TEST_CMD}
.endif

.include "${MASTERDIR}/Makefile"

Lines 1-2 Link Here

(-)devel/py-ice/distinfo (-2 lines)
1	SHA256 (Ice-3.5.0.tar.gz) = bbde6b5a87f5abc8d9105468731f1419829bc22b5d23b8fdef553967a2eebdb0
2	SIZE (Ice-3.5.0.tar.gz) = 4790555




mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)

BASELIBS		= -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv
LIBS			= -lIce $(BASELIBS) 

ICEUTIL_OS_LIBS         = -pthread

PLATFORM_HAS_READLINE   := yes

export LD_LIBRARY_PATH	:= $(libdir):$(LD_LIBRARY_PATH)

lp64suffix		=
create_runpath_symlink	= no
prefix			= %%PREFIX%%
install_slicedir	= %%DATADIR%%
install_configdir	= %%DATADIR%%/config
install_docdir		= %%DOCSDIR%%
EXPAT_HOME		= $(LOCALBASE)
INSTALL			= %%INSTALL_DATA%%
INSTALL_PROGRAM		= %%INSTALL_PROGRAM%%
MCPP_HOME		= $(LOCALBASE)

Lines 1-11 Link Here

(-)devel/py-ice/files/patch-config-Make.common.rules (-11 lines)
1	--- config/Make.common.rules.orig 2010-07-11 13:40:06.000000000 +1000
2	+++ config/Make.common.rules 2010-07-11 13:40:43.000000000 +1000
3	@@ -19,7 +19,7 @@
4	SHORT_VERSION = 3.4
5	SOVERSION = 34
6
7	-INSTALL = cp -fp
8	+INSTALL = install
9	INSTALL_PROGRAM = ${INSTALL}
10	INSTALL_LIBRARY = ${INSTALL}
11	INSTALL_DATA = ${INSTALL}

Lines 1-11 Link Here

(-)devel/py-ice/files/patch-cpp-include-IceUtil-Config.h (-11 lines)
1	--- cpp/include/IceUtil/Config.h.orig 2013-03-11 15:19:46.000000000 +0000
2	+++ cpp/include/IceUtil/Config.h 2013-05-20 02:09:58.239194578 +0000
3	@@ -51,7 +51,7 @@
4	// Check for C++ 11 support
5	//
6	#if (defined(__GNUC__) && (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) \|\| \
7	- (defined(__clang__) && (__clang_major__ >= 4) && __cplusplus >= 201103) \|\| \
8	+ (defined(__clang__) && ((defined(__APPLE__) && __clang_major__ >= 4) \|\| (!defined(__APPLE__) && __clang_major__ >= 3)) && __cplusplus >= 201103) \|\| \
9	(defined(_MSC_VER) && (_MSC_VER >= 1600))
10	# define ICE_CPP11
11	#endif




--- py/config/Make.rules.orig	2013-03-11 15:19:47.000000000 +0000
+++ py/config/Make.rules	2013-05-20 14:21:13.335195726 +0000
@@ -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
@@ -95,8 +96,8 @@
 endif 
 
 libdir                  = $(top_srcdir)/python
-install_pythondir       = $(prefix)/python
-install_libdir          = $(prefix)/python
+install_pythondir       = %%PYTHON_SITELIBDIR%%/Ice
+install_libdir          = %%PYTHON_SITELIBDIR%%/Ice
 
 ifeq ($(UNAME),SunOS)
    ifeq ($(LP64),yes)
@@ -118,7 +119,7 @@
     ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
     ICE_FLAGS	= -I$(ice_dir)/include
 endif
-ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
+ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil -liconv
 
 ifneq ($(embedded_runpath_prefix),)
    runpath_libdir	:= $(embedded_runpath_prefix)/$(libsubdir)




--- 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 @@
 
 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) ; \
+	    mkdir -p $(install_pythondir)/$$i ; \
+	    $(INSTALL_DATA) $$i/*.py* $(install_pythondir)/$$i ; \
 	done
 
 depend::  $(ICE_SLICE) $(GLACIER2_SLICE) $(ICEBOX_SLICE) $(ICEGRID_SLICE) $(ICEPATCH2_SLICE) $(ICESTORM_SLICE)




--- py/test/Ice/info/AllTests.py.orig	2013-03-11 15:19:47.000000000 +0000
+++ py/test/Ice/info/AllTests.py	2013-05-20 14:25:56.860196743 +0000
@@ -7,12 +7,31 @@
 #
 # **********************************************************************
 
-import Ice, Test, sys, threading
+import Ice, Test, sys, threading, subprocess
 
 def test(b):
     if not b:
         raise RuntimeError('test assertion failed')
 
+def isFreeBSD():
+    return sys.platform.startswith("freebsd")
+
+def sysctl(key):
+    p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE)
+    try:
+        result = p.communicate()[0].strip().split()[1]
+    except IndexError:
+        return 0    
+    if sys.version_info >= (3,):
+        result = 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):
     sys.stdout.write("testing proxy endpoint information... ")
     sys.stdout.flush()
@@ -67,12 +86,12 @@
 
     ipEndpoint = endpoints[0].getInfo()
     test(ipEndpoint.type() == Ice.TCPEndpointType or ipEndpoint.type() == 2)
-    test(ipEndpoint.host == defaultHost)
+    test(ipEndpoint.host == defaultHost or isFreeBSDJail())
     test(ipEndpoint.port > 0)
     test(ipEndpoint.timeout == 15000)
 
     udpEndpoint = endpoints[1].getInfo()
-    test(udpEndpoint.host == defaultHost)
+    test(udpEndpoint.host == defaultHost or isFreeBSDJail())
     test(udpEndpoint.datagram())
     test(udpEndpoint.port > 0)
 
@@ -108,7 +127,7 @@
     ipinfo = base.ice_getConnection().getEndpoint().getInfo()
     test(ipinfo.port == 12010)
     test(not ipinfo.compress)
-    test(ipinfo.host == defaultHost)
+    test(ipinfo.host == defaultHost or isFreeBSDJail())
 
     ctx = testIntf.getEndpointInfoAsContext()
     test(ctx["host"] == ipinfo.host)
@@ -118,7 +137,7 @@
 
     udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
     test(udp.port == 12010)
-    test(udp.host == defaultHost)
+    test(udp.host == defaultHost or isFreeBSDJail())
 
     print("ok")
 
@@ -129,8 +148,8 @@
     test(not info.incoming)
     test(len(info.adapterName) == 0)
     test(info.remotePort == 12010)
-    test(info.remoteAddress == defaultHost)
-    test(info.localAddress == defaultHost)
+    test(info.remoteAddress == defaultHost or isFreeBSDJail())
+    test(info.localAddress == defaultHost or isFreeBSDJail())
 
     ctx = testIntf.getConnectionInfoAsContext()
     test(ctx["incoming"] == "true")




--- py/test/Ice/properties/run.py.orig	2013-05-21 02:29:52.861195367 +0000
+++ py/test/Ice/properties/run.py	2013-05-21 02:30:44.972196471 +0000
@@ -26,15 +26,15 @@
 #
 if sys.version_info[0] == 2:
     configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
-    TestUtil.createConfig(configPath, 
+    TestUtil.createConfig(configPath.encode("utf-8"), 
                           ["# Automatically generated by Ice test driver.", 
                            "Ice.Trace.Protocol=1",
                            "Ice.Trace.Network=1", 
                            "Ice.ProgramName=PropertiesClient", 
-                           "Config.Path=./config/中国_client.config"])
+                           "Config.Path=" + configPath.encode("utf-8")])
 else:
     configPath = "./config/\u4e2d\u56fd_client.config"
-    TestUtil.createConfig(configPath, 
+    TestUtil.createConfig(configPath.encode("utf-8"), 
                           ["# Automatically generated by Ice test driver.", 
                            "Ice.Trace.Protocol=1",
                            "Ice.Trace.Network=1", 
@@ -44,5 +44,5 @@
 
 TestUtil.simpleTest()
 
-if os.path.exists(configPath):
-    os.remove(configPath)
+if os.path.exists(configPath.encode("utf-8")):
+    os.remove(configPath.encode("utf-8"))

Return to bug 184453

Lines 2-8 Link Here

(-)devel/ice/Makefile (-19 / +55 lines)
2	# $FreeBSD: devel/ice/Makefile 327723 2013-09-20 17:04:43Z bapt $	2	# $FreeBSD: devel/ice/Makefile 327723 2013-09-20 17:04:43Z bapt $
3		3
4	PORTNAME= Ice	4	PORTNAME= Ice
5	PORTVERSION= 3.5.0	5	PORTVERSION= 3.5.1
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= http://download.zeroc.com/Ice/3.5/	7	MASTER_SITES= http://download.zeroc.com/Ice/3.5/
8		8
Lines 14-25 Link Here
14	LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \	14	LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
15	mcpp:${PORTSDIR}/devel/mcpp	15	mcpp:${PORTSDIR}/devel/mcpp
16		16
17	OPTIONS_DEFINE= DEBUG DEMOS DOCS TESTS	17	OPTIONS_DEFINE?= DEBUG DEMOS DOCS TESTS
18	OPTIONS_DEFAULT= DEMOS TESTS	18	OPTIONS_DEFAULT?= DEMOS TESTS
19	TESTS_DESC= Build and run tests (requires lang/python)	19	TESTS_DESC?= Build and run tests (requires lang/python)
20	DEMOS_DESC= Build demos	20	DEMOS_DESC?= Build demos
21		21
22	NO_STAGE= yes
23	.include <bsd.port.options.mk>	22	.include <bsd.port.options.mk>
24		23
25	.if ${PORT_OPTIONS:MTESTS}	24	.if ${PORT_OPTIONS:MTESTS}
Lines 31-41 Link Here
31	USE_BDB= 5	30	USE_BDB= 5
32	INVALID_BDB_VER= 2 3 40 41 42 43 44 46 47 48	31	INVALID_BDB_VER= 2 3 40 41 42 43 44 46 47 48
33	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
34	BUILD_WRKSRC= ${WRKSRC}/cpp	33	BUILD_WRKSRC?= ${WRKSRC}/cpp
35	INSTALL_WRKSRC= ${WRKSRC}/cpp	34	INSTALL_WRKSRC?= ${WRKSRC}/cpp
36		35
37	CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include	36	CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
38	.if !${PORT_OPTIONS:MDEBUG}	37	.if ${PORT_OPTIONS:MDEBUG}
		38	CFLAGS+= -g
		39	.else
39	CFLAGS+= -DNDEBUG	40	CFLAGS+= -DNDEBUG
40	.endif	41	.endif
41		42
Lines 47-58 Link Here
47	BROKEN= fails to link	48	BROKEN= fails to link
48	.endif	49	.endif
49		50
50	.if ${OSVERSION} >= 1000000
51	BROKEN= Does not work on FreeBSD 10
52	.endif
53
54	.if ((${ARCH} != i386) && (${ARCH} != powerpc))	51	.if ((${ARCH} != i386) && (${ARCH} != powerpc))
55	MAKE_ENV= LP64=yes	52	MAKE_ENV+= LP64=yes
56	.endif	53	.endif
57		54
58	.if !${PORT_OPTIONS:MTESTS}	55	.if !${PORT_OPTIONS:MTESTS}
Lines 64-76 Link Here
64	.endif	61	.endif
65		62
66	.if !${PORT_OPTIONS:MDOCS}	63	.if !${PORT_OPTIONS:MDOCS}
67	MAKE_ENV+= NOPORTDOCS=yes	64	MAKE_ENV+= NOICEDOCS=yes
		65	.endif
		66
		67	.include <bsd.port.pre.mk>
		68
		69	.if defined(PYTHON_REL) && ${PYTHON_REL} >= 320
		70	PLIST_SUB+= PYTHON32=""
		71	PLIST_SUB+= PYTHONPRE32="@comment "
		72	.else
		73	PLIST_SUB+= PYTHON32="@comment "
		74	PLIST_SUB+= PYTHONPRE32=""
		75	.endif
		76
		77	PLIST_SUB+= PYTHON_SUFFIX=${PYTHON_SUFFIX}
		78
		79	.if ${PREFIX} != ${LOCALBASE} && !defined(NO_STAGE)
		80	PYSITEDIR= ${PREFIX}${PYTHON_SITELIBDIR:S\|^${LOCALBASE}\|\|}
		81	.else
		82	PYSITEDIR= ${PYTHON_SITELIBDIR}
		83	.endif
		84
		85	.if ${PORT_OPTIONS:MNAMESPACES}
		86	MAKE_ARGS+= USE_NAMESPACES=yes
		87	PLIST_SUB+= NAMESPACES=""
		88	PLIST_SUB+= NONAMESPACES="@comment "
		89	.else
		90	PLIST_SUB+= NAMESPACES="@comment "
		91	PLIST_SUB+= NONAMESPACES=""
68	.endif	92	.endif
69		93
70	post-patch:	94	post-patch:
71	@${SED} 's\|%%PREFIX%%\|${PREFIX}\|g; \	95	@${SED} 's\|%%PREFIX%%\|${STAGEDIR}${PREFIX}\|g; \
72	s\|%%DATADIR%%\|${DATADIR}\|g; \	96	s\|%%DATADIR%%\|${STAGEDIR}${DATADIR}\|g; \
73	s\|%%DOCSDIR%%\|${DOCSDIR}\|g; \	97	s\|%%DOCSDIR%%\|${STAGEDIR}${DOCSDIR}\|g; \
		98	s\|%%ICONV_LIB%%\|${ICONV_LIB}\|g; \
74	s\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \	99	s\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
75	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g' \	100	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g' \
76	${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD	101	${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD
Lines 83-90 Link Here
83	${WRKSRC}/cpp/config/Make.rules	108	${WRKSRC}/cpp/config/Make.rules
84	@${REINPLACE_CMD} 's\|INSTALL_PROGRAM\|INSTALL_DATA\|g' \	109	@${REINPLACE_CMD} 's\|INSTALL_PROGRAM\|INSTALL_DATA\|g' \
85	${WRKSRC}/cpp/src/ca/Makefile	110	${WRKSRC}/cpp/src/ca/Makefile
86	@${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/' \	111	@${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/; \
		112	s\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; ' \
87	${WRKSRC}/config/Make.common.rules	113	${WRKSRC}/config/Make.common.rules
		114	@${REINPLACE_CMD} 's\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
		115	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g; \
		116	s\|%%ICONV_LIB%%\|${ICONV_LIB}\|g; \
		117	s\|%%PYTHON_SITELIBDIR%%\|${STAGEDIR}${PYSITEDIR}\|g; \
		118	s\|%%PREFIX%%\|${PREFIX}\|g ; \
		119	s\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/py/config/Make.rules
		120	@${REINPLACE_CMD} 's\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
		121	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g; \
		122	s\|%%PREFIX%%\|${PREFIX}\|g ; \
		123	s\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/php/config/Make.rules.php
88		124
89	.if ${PORT_OPTIONS:MTESTS}	125	.if ${PORT_OPTIONS:MTESTS}
90	TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py	126	TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py

Lines 1-18 Link Here

(-)devel/ice/files/patch-config-Make.common.rules (-6 / +33 lines)
1	--- config.orig/Make.common.rules 2013-05-20 22:21:58.666286011 +0000	1	--- config.orig/Make.common.rules 2013-05-20 22:21:58.666286011 +0000
2	+++ config/Make.common.rules 2013-05-20 22:20:50.897196090 +0000	2	+++ config/Make.common.rules 2013-05-20 22:20:50.897196090 +0000
3	@@ -378,11 +378,15 @@	3	@@ -19,7 +19,7 @@
		4	SHORT_VERSION = 3.4
		5	SOVERSION = 34
		6
		7	-INSTALL = cp -fp
		8	+INSTALL = %%INSTALL_PROGRAM%%
		9	INSTALL_PROGRAM = ${INSTALL}
		10	INSTALL_LIBRARY = ${INSTALL}
		11	INSTALL_DATA = ${INSTALL}
		12	@@ -386,11 +386,15 @@
4	then \	13	then \
5	echo "Creating $(install_slicedir)..." ; \	14	echo "Creating $(DESTDIR)$(install_slicedir)..." ; \
6	$(call mkdir, $(install_slicedir)) ; \	15	$(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \
7	+ fi	16	+ fi
8	+	17	+
9	+ @if test -d $(install_slicedir) ; \	18	+ @if test -d $(DESTDIR)$(install_slicedir) ; \
10	+ then \	19	+ then \
11	cd $(top_srcdir)/../slice ; \	20	cd $(top_srcdir)/../slice ; \
12	for subdir in * ; \	21	for subdir in * ; \
13	do \	22	do \
14	echo "Copying slice/$$subdir to $(install_slicedir)..." ; \	23	echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \
15	cp -fpr $$subdir $(install_slicedir) ; \	24	cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \
16	done ; \	25	done ; \
17	- fi	26	- fi
18	+ fi	27	+ fi
		28
		29	@@ -410,12 +410,12 @@
		30	fi
		31
		32
		33	- @if test ! -f $(DESTDIR)$(prefix)/CHANGES$(TEXT_EXTENSION) ; \
		34	+ @if test ! -f $(DESTDIR)$(install_slicedir)/CHANGES$(TEXT_EXTENSION) ; \
		35	then \
		36	- $(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \
		37	+ $(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
		38	fi
		39
		40	- @if test ! -f $(DESTDIR)$(prefix)/RELEASE_NOTES$(TEXT_EXTENSION) ; \
		41	+ @if test ! -f $(DESTDIR)$(install_slicedir)/RELEASE_NOTES$(TEXT_EXTENSION) ; \
		42	then \
		43	- $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \
		44	+ $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
		45	fi

Lines 1-13 Link Here

(-)devel/ice/files/patch-cpp-src-slice2cpp-Gen.cpp (-10 / +41 lines)
1	--- cpp.orig/src/slice2cpp/Gen.cpp 2013-03-11 15:19:46.000000000 +0000	1	--- cpp.orig/src/slice2cpp/Gen.cpp 2013-03-11 15:19:46.000000000 +0000
2	+++ cpp/src/slice2cpp/Gen.cpp 2013-05-20 19:51:48.109197053 +0000	2	+++ cpp/src/slice2cpp/Gen.cpp 2013-05-20 19:51:48.109197053 +0000
3	@@ -385,6 +385,10 @@	3	@@ -756,10 +756,11 @@
4	H << "\n#include <Ice/Proxy.h>";	4
5	H << "\n#include <Ice/OutgoingAsync.h>";	5	C << sp << nl << "class " << factoryName << "__Init";
6	}	6	C << sb;
7	+ else if(p->hasNonLocalClassDecls())	7	+ C << nl << "IceInternal::FactoryTableInit* _ftableinit;";
8	+ {	8	C.dec();
9	+ H << "\n#include <Ice/Proxy.h>";	9	C << nl << "public:";
10	+ }	10	C.inc();
		11	- C << sp << nl << factoryName << "__Init()";
		12	+ C << sp << nl << factoryName << "__Init(): _ftableinit(new IceInternal::FactoryTableInit)";
		13	C << sb;
		14	C << nl << "::IceInternal::factoryTable->addExceptionFactory(\"" << p->scoped() << "\", new "
		15	<< factoryName << ");";
		16	@@ -767,6 +768,7 @@
		17	C << sp << nl << "~" << factoryName << "__Init()";
		18	C << sb;
		19	C << nl << "::IceInternal::factoryTable->removeExceptionFactory(\"" << p->scoped() << "\");";
		20	+ C << nl << "delete _ftableinit;";
		21	C << eb;
		22	C << eb << ';';
		23
		24	@@ -3976,10 +3978,11 @@
		25	C << sp;
		26	C << nl << "class " << factoryName << "__Init";
		27	C << sb;
		28	+ C << nl << "IceInternal::FactoryTableInit* _ftableinit;";
		29	C.dec();
		30	C << nl << "public:";
		31	C.inc();
		32	- C << sp << nl << factoryName << "__Init()";
		33	+ C << sp << nl << factoryName << "__Init(): _ftableinit(new IceInternal::FactoryTableInit)";
		34	C << sb;
		35	if(!p->isAbstract())
		36	{
		37	@@ -4002,6 +4005,7 @@
		38	{
		39	C << nl << "::IceInternal::factoryTable->removeTypeId(" << p->compactId() << ");";
		40	}
		41	+ C << nl << "delete _ftableinit;";
		42	C << eb;
		43	C << eb << ';';
11		44
12	if(p->hasNonLocalDataOnlyClasses() \|\| p->hasNonLocalExceptions())
13	{

Lines 1-29 Link Here

(-)devel/ice/files/patch-cpp-test-Ice-properties-run.py (-29 lines)
1	--- cpp.orig/test/Ice/properties/run.py 2013-03-11 15:19:47.000000000 +0000
2	+++ cpp/test/Ice/properties/run.py 2013-05-21 03:48:13.020195761 +0000
3	@@ -28,15 +28,15 @@
4	#
5	if sys.version_info[0] == 2:
6	configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
7	- TestUtil.createConfig(configPath,
8	+ TestUtil.createConfig(configPath.encode("utf-8"),
9	["# Automatically generated by Ice test driver.",
10	"Ice.Trace.Protocol=1",
11	"Ice.Trace.Network=1",
12	"Ice.ProgramName=PropertiesClient",
13	- "Config.Path=./config/中国_client.config"])
14	+ "Config.Path=" + configPath.encode("utf-8")])
15	else:
16	configPath = "./config/\u4e2d\u56fd_client.config"
17	- TestUtil.createConfig(configPath,
18	+ TestUtil.createConfig(configPath.encode("utf-8"),
19	["# Automatically generated by Ice test driver.",
20	"Ice.Trace.Protocol=1",
21	"Ice.Trace.Network=1",
22	@@ -46,5 +46,5 @@
23
24	TestUtil.simpleTest(client)
25
26	-if os.path.exists(configPath):
27	- os.remove(configPath)
28	+if os.path.exists(configPath.encode("utf-8")):
29	+ os.remove(configPath.encode("utf-8"))

Line 0 Link Here

(-)devel/ice/files/patch-php-config-Make.rules.php (+23 lines)
	1	--- php/config/Make.rules.php.orig 2013-03-11 15:19:47.000000000 +0000
	2	+++ php/config/Make.rules.php 2013-06-02 14:36:13.744196194 +0000
	3	@@ -100,8 +100,8 @@
	4	endif
	5
	6	libdir = $(top_srcdir)/lib
	7	ifneq ($(prefix), /usr)
	8	-install_phpdir = $(prefix)/php
	9	-install_libdir = $(prefix)/php
	10	+install_phpdir = $(prefix)/share/pear
	11	+install_libdir = $(prefix)/lib/php/$(PHP_EXT_DIR)
	12	else
	13
	14	@@ -155,7 +155,8 @@
	15	endif
	16
	17	ifeq ($(installphplib),)
	18	- installphplib = $(INSTALL) $(1) $(2); \
	19	+ installphplib = mkdir -p $(2) ; \
	20	+ $(INSTALL) $(1) $(2); \
	21	chmod a+rx $(2)/$(notdir $(1))
	22	endif
	23

Line 0 Link Here

(-)devel/ice/files/patch-php-lib-Makefile (+12 lines)
	1	--- php/lib/Makefile.orig 2013-06-02 12:11:06.451195440 +0000
	2	+++ php/lib/Makefile 2013-06-02 12:16:29.249191742 +0000
	3	@@ -167,7 +167,8 @@
	4	@echo "Installing generated code"
	5	@for i in $(MODULES) ; \
	6	do \
	7	- $(INSTALL_DATA) -r $$i $(DESTDIR)$(install_phpdir) ; \
	8	+ mkdir -p $(DESTDIR)$(install_phpdir)/$$i ; \
	9	+ $(INSTALL_DATA) $$i/*.php $(DESTDIR)$(install_phpdir)/$$i ; \
	10	done
	11	@for i in $(MODULE_SRCS) ; \
	12	do \

Line 0 Link Here

(-)devel/ice/files/patch-py-config-Make.rules (+41 lines)
	1	--- py/config/Make.rules.orig 2013-03-11 15:19:47.000000000 +0000
	2	+++ py/config/Make.rules 2013-05-20 14:21:13.335195726 +0000
	3	@@ -12,7 +12,8 @@
	4	# if it does not exist.
	5	#
	6
	7	-prefix ?= /opt/Ice-$(VERSION)
	8	+ICE_HOME = %%LOCALBASE%%
	9	+prefix ?= %%PREFIX%%
	10
	11	#
	12	# The "root directory" for runpath embedded in executables. Can be unset
	13	@@ -96,8 +97,8 @@
	14
	15	libdir = $(top_srcdir)/python
	16	ifneq ($(prefix), /usr)
	17	-install_pythondir = $(prefix)/python
	18	-install_libdir = $(prefix)/python
	19	+install_pythondir = %%PYTHON_SITELIBDIR%%/Ice
	20	+install_libdir = %%PYTHON_SITELIBDIR%%/Ice
	21	else
	22	ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0)
	23	install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
	24	@@ -128,7 +129,7 @@
	25	ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
	26	ICE_FLAGS = -I$(ice_dir)/include
	27	endif
	28	-ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
	29	+ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil %%ICONV_LIB%%
	30
	31	ifneq ($(embedded_runpath_prefix),)
	32	runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir)
	33	@@ -167,7 +167,7 @@
	34
	35	all:: $(SRCS)
	36
	37	-%_ice.py: $(slicedir)/%.ice
	38	+%_ice.py: $(ICE_HOME)/%.ice
	39	rm -f $(*F).py
	40	$(SLICE2PY) $(SLICE2PYFLAGS) $<
	41

Line 0 Link Here

(-)devel/ice/files/patch-py-python-Makefile (+16 lines)
	1	--- py/python/Makefile.orig 2010-07-11 13:05:38.000000000 +1000
	2	+++ py/python/Makefile 2012-09-11 00:09:09.000000000 +2000
	3	@@ -118,10 +118,11 @@
	4
	5	install:: $(ALL_SRCS)
	6	@echo "Installing generated code"
	7	- $(INSTALL_DATA) *.py $(DESTDIR)$(install_pythondir)
	8	+ $(INSTALL_DATA) .py $(DESTDIR)$(install_pythondir)
	9	@for i in $(PACKAGES) ; \
	10	do \
	11	- $(INSTALL_DATA) -r $$i $(DESTDIR)$(install_pythondir) ; \
	12	+ mkdir -p $(DESTDIR)$(install_pythondir)/$$i ; \
	13	+ $(INSTALL_DATA) $$i/.py $(DESTDIR)$(install_pythondir)/$$i ; \
	14	done
	15
	16	depend:: $(ICE_SLICE) $(GLACIER2_SLICE) $(ICEBOX_SLICE) $(ICEGRID_SLICE) $(ICEPATCH2_SLICE) $(ICESTORM_SLICE)

Line 0 Link Here

(-)devel/ice/files/patch-py-test-Ice-info-AllTests.py (+79 lines)
		1	--- py/test/Ice/info/AllTests.py.orig 2013-03-11 15:19:47.000000000 +0000
		2	+++ py/test/Ice/info/AllTests.py 2013-05-20 14:25:56.860196743 +0000
		3	@@ -7,12 +7,31 @@
		4	#
		5	# **********************************************************************
		6
		7	-import Ice, Test, sys, threading
		8	+import Ice, Test, sys, threading, subprocess
		9
		10	def test(b):
		11	if not b:
		12	raise RuntimeError('test assertion failed')
		13
		14	+def isFreeBSD():
		15	+ return sys.platform.startswith("freebsd")
		16	+
		17	+def sysctl(key):
		18	+ p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE)
		19	+ try:
		20	+ result = p.communicate()[0].strip().split()[1]
		21	+ except IndexError:
		22	+ return 0
		23	+ if sys.version_info >= (3,):
		24	+ result = str(result, sys.stdout.encoding)
		25	+ try:
		26	+ return int(result)
		27	+ except ValueError:
		28	+ return result
		29	+
		30	+def isFreeBSDJail():
		31	+ return isFreeBSD() and sysctl("security.jail.jailed")
		32	+
		33	def allTests(communicator, collocated):
		34	sys.stdout.write("testing proxy endpoint information... ")
		35	sys.stdout.flush()
		36	@@ -67,12 +86,12 @@
		37
		38	ipEndpoint = endpoints[0].getInfo()
		39	test(ipEndpoint.type() == Ice.TCPEndpointType or ipEndpoint.type() == 2)
		40	- test(ipEndpoint.host == defaultHost)
		41	+ test(ipEndpoint.host == defaultHost or isFreeBSDJail())
		42	test(ipEndpoint.port > 0)
		43	test(ipEndpoint.timeout == 15000)
		44
		45	udpEndpoint = endpoints[1].getInfo()
		46	- test(udpEndpoint.host == defaultHost)
		47	+ test(udpEndpoint.host == defaultHost or isFreeBSDJail())
		48	test(udpEndpoint.datagram())
		49	test(udpEndpoint.port > 0)
		50
		51	@@ -108,7 +127,7 @@
		52	ipinfo = base.ice_getConnection().getEndpoint().getInfo()
		53	test(ipinfo.port == 12010)
		54	test(not ipinfo.compress)
		55	- test(ipinfo.host == defaultHost)
		56	+ test(ipinfo.host == defaultHost or isFreeBSDJail())
		57
		58	ctx = testIntf.getEndpointInfoAsContext()
		59	test(ctx["host"] == ipinfo.host)
		60	@@ -118,7 +137,7 @@
		61
		62	udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
		63	test(udp.port == 12010)
		64	- test(udp.host == defaultHost)
65	+ test(udp.host == defaultHost or isFreeBSDJail())
66
67	print("ok")
68
69	@@ -129,8 +148,8 @@
70	test(not info.incoming)
71	test(len(info.adapterName) == 0)
72	test(info.remotePort == 12010)
73	- test(info.remoteAddress == defaultHost)
74	- test(info.localAddress == defaultHost)
75	+ test(info.remoteAddress == defaultHost or isFreeBSDJail())
76	+ test(info.localAddress == defaultHost or isFreeBSDJail())
77
78	ctx = testIntf.getConnectionInfoAsContext()
79	test(ctx["incoming"] == "true")

Lines 108-113 Link Here

(-)devel/ice/pkg-plist (-15 / +43 lines)
108	include/Ice/MetricsAdminI.h	108	include/Ice/MetricsAdminI.h
109	include/Ice/MetricsFunctional.h	109	include/Ice/MetricsFunctional.h
110	include/Ice/MetricsObserverI.h	110	include/Ice/MetricsObserverI.h
		111	include/Ice/NativePropertiesAdmin.h
		112	include/Ice/NetworkF.h
111	include/Ice/Object.h	113	include/Ice/Object.h
112	include/Ice/ObjectAdapter.h	114	include/Ice/ObjectAdapter.h
113	include/Ice/ObjectAdapterF.h	115	include/Ice/ObjectAdapterF.h
Lines 230-279 Link Here
230	include/Slice/Util.h	232	include/Slice/Util.h
231	lib/ImportKey.class	233	lib/ImportKey.class
232	lib/libFreeze.so	234	lib/libFreeze.so
233	lib/libFreeze.so.3.5.0	235	lib/libFreeze.so.3.5.1
234	lib/libFreeze.so.35	236	lib/libFreeze.so.35
235	lib/libGlacier2.so	237	lib/libGlacier2.so
236	lib/libGlacier2.so.3.5.0	238	lib/libGlacier2.so.3.5.1
237	lib/libGlacier2.so.35	239	lib/libGlacier2.so.35
238	lib/libIce.so	240	lib/libIce.so
239	lib/libIce.so.3.5.0	241	lib/libIce.so.3.5.1
240	lib/libIce.so.35	242	lib/libIce.so.35
241	lib/libIceBox.so	243	lib/libIceBox.so
242	lib/libIceBox.so.3.5.0	244	lib/libIceBox.so.3.5.1
243	lib/libIceBox.so.35	245	lib/libIceBox.so.35
244	lib/libIceDB.so	246	lib/libIceDB.so
245	lib/libIceDB.so.3.5.0	247	lib/libIceDB.so.3.5.1
246	lib/libIceDB.so.35	248	lib/libIceDB.so.35
247	lib/libIceGrid.so	249	lib/libIceGrid.so
248	lib/libIceGrid.so.3.5.0	250	lib/libIceGrid.so.3.5.1
249	lib/libIceGrid.so.35	251	lib/libIceGrid.so.35
250	lib/libIceGridFreezeDB.so	252	lib/libIceGridFreezeDB.so
251	lib/libIceGridFreezeDB.so.3.5.0	253	lib/libIceGridFreezeDB.so.3.5.1
252	lib/libIceGridFreezeDB.so.35	254	lib/libIceGridFreezeDB.so.35
253	lib/libIcePatch2.so	255	lib/libIcePatch2.so
254	lib/libIcePatch2.so.3.5.0	256	lib/libIcePatch2.so.3.5.1
255	lib/libIcePatch2.so.35	257	lib/libIcePatch2.so.35
256	lib/libIceSSL.so	258	lib/libIceSSL.so
257	lib/libIceSSL.so.3.5.0	259	lib/libIceSSL.so.3.5.1
258	lib/libIceSSL.so.35	260	lib/libIceSSL.so.35
259	lib/libIceStorm.so	261	lib/libIceStorm.so
260	lib/libIceStorm.so.3.5.0	262	lib/libIceStorm.so.3.5.1
261	lib/libIceStorm.so.35	263	lib/libIceStorm.so.35
262	lib/libIceStormFreezeDB.so	264	lib/libIceStormFreezeDB.so
263	lib/libIceStormFreezeDB.so.3.5.0	265	lib/libIceStormFreezeDB.so.3.5.1
264	lib/libIceStormFreezeDB.so.35	266	lib/libIceStormFreezeDB.so.35
265	lib/libIceStormService.so	267	lib/libIceStormService.so
266	lib/libIceStormService.so.3.5.0	268	lib/libIceStormService.so.3.5.1
267	lib/libIceStormService.so.35	269	lib/libIceStormService.so.35
268	lib/libIceUtil.so	270	lib/libIceUtil.so
269	lib/libIceUtil.so.3.5.0	271	lib/libIceUtil.so.3.5.1
270	lib/libIceUtil.so.35	272	lib/libIceUtil.so.35
271	lib/libIceXML.so	273	lib/libIceXML.so
272	lib/libIceXML.so.3.5.0	274	lib/libIceXML.so.3.5.1
273	lib/libIceXML.so.35	275	lib/libIceXML.so.35
274	lib/libSlice.so	276	lib/libSlice.so
275	lib/libSlice.so.3.5.0	277	lib/libSlice.so.3.5.1
276	lib/libSlice.so.35	278	lib/libSlice.so.35
		279	man/man1/dumpdb.1.gz
		280	man/man1/glacier2router.1.gz
		281	man/man1/icebox.1.gz
		282	man/man1/iceboxadmin.1.gz
		283	man/man1/iceca.1.gz
		284	man/man1/icegridadmin.1.gz
		285	man/man1/icegridnode.1.gz
		286	man/man1/icegridregistry.1.gz
		287	man/man1/icepatch2calc.1.gz
		288	man/man1/icepatch2client.1.gz
		289	man/man1/icepatch2server.1.gz
		290	man/man1/icestormadmin.1.gz
		291	man/man1/icestormmigrate.1.gz
		292	man/man1/slice2cpp.1.gz
		293	man/man1/slice2cs.1.gz
		294	man/man1/slice2freeze.1.gz
		295	man/man1/slice2freezej.1.gz
		296	man/man1/slice2html.1.gz
		297	man/man1/slice2java.1.gz
		298	man/man1/slice2php.1.gz
		299	man/man1/slice2py.1.gz
		300	man/man1/slice2rb.1.gz
		301	man/man1/transformdb.1.gz
		302	%%DATADIR%%/CHANGES
277	%%DATADIR%%/Freeze/BackgroundSaveEvictor.ice	303	%%DATADIR%%/Freeze/BackgroundSaveEvictor.ice
278	%%DATADIR%%/Freeze/CatalogData.ice	304	%%DATADIR%%/Freeze/CatalogData.ice
279	%%DATADIR%%/Freeze/Connection.ice	305	%%DATADIR%%/Freeze/Connection.ice
Lines 322-327 Link Here
322	%%DATADIR%%/Ice/PluginF.ice	348	%%DATADIR%%/Ice/PluginF.ice
323	%%DATADIR%%/Ice/Process.ice	349	%%DATADIR%%/Ice/Process.ice
324	%%DATADIR%%/Ice/ProcessF.ice	350	%%DATADIR%%/Ice/ProcessF.ice
		351	%%DATADIR%%/Ice/PropertiesAdmin.ice
325	%%DATADIR%%/Ice/Properties.ice	352	%%DATADIR%%/Ice/Properties.ice
326	%%DATADIR%%/Ice/PropertiesF.ice	353	%%DATADIR%%/Ice/PropertiesF.ice
327	%%DATADIR%%/Ice/Router.ice	354	%%DATADIR%%/Ice/Router.ice
Lines 350-355 Link Here
350	%%DATADIR%%/IceStorm/IceStorm.ice	377	%%DATADIR%%/IceStorm/IceStorm.ice
351	%%DATADIR%%/IceStorm/Metrics.ice	378	%%DATADIR%%/IceStorm/Metrics.ice
352	%%DATADIR%%/LICENSE	379	%%DATADIR%%/LICENSE
		380	%%DATADIR%%/RELEASE_NOTES
353	%%DATADIR%%/config/convertssl.py	381	%%DATADIR%%/config/convertssl.py
354	%%DATADIR%%/config/icegrid-slice.3.1.ice.gz	382	%%DATADIR%%/config/icegrid-slice.3.1.ice.gz
355	%%DATADIR%%/config/icegrid-slice.3.2.ice.gz	383	%%DATADIR%%/config/icegrid-slice.3.2.ice.gz

Lines 1-10 Link Here

(-)devel/php5-ice/Makefile (-53 / +11 lines)
1	# Created by: DIrk Ye <dirk.ye@gmail.com>	1	# Created by: DIrk Ye <dirk.ye@gmail.com>
2	# $FreeBSD: devel/php5-ice/Makefile 327724 2013-09-20 17:13:42Z bapt $	2	# $FreeBSD: devel/php5-ice/Makefile 327724 2013-09-20 17:13:42Z bapt $
3		3
4	PORTNAME= Ice
5	PORTVERSION= 3.5.0
6	CATEGORIES= devel	4	CATEGORIES= devel
7	MASTER_SITES= http://download.zeroc.com/Ice/3.5/
8	PKGNAMEPREFIX= php5-	5	PKGNAMEPREFIX= php5-
9		6
10	MAINTAINER= freebsd@grem.de	7	MAINTAINER= freebsd@grem.de
Lines 12-26 Link Here
12		9
13	LICENSE= GPLv2	10	LICENSE= GPLv2
14		11
15	BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp	12	BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp \
		13	slice2php:${PORTSDIR}/devel/ice
16	LIB_DEPENDS= Ice.${LIB_VRS}:${PORTSDIR}/devel/ice	14	LIB_DEPENDS= Ice.${LIB_VRS}:${PORTSDIR}/devel/ice
17		15
18	OPTIONS_DEFINE= DEBUG DOCS NAMESPACES	16	OPTIONS_DEFINE= DEBUG DOCS NAMESPACES
		17	OPTIONS_DEFAULT=
19	NAMESPACES_DESC= Use PHP namespaces (recommended)	18	NAMESPACES_DESC= Use PHP namespaces (recommended)
20		19
21	USE_GMAKE= yes	20	USE_GMAKE= yes
22	MAKE_ARGS+= PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${PREFIX} \	21	SLAVE_PORT= yes
23	PHP_HOME=${PREFIX} OPTIMIZE=yes	22	MASTERDIR= ${.CURDIR}/../ice
		23	PLIST= ${.CURDIR}/pkg-plist
		24
		25	MAKE_ARGS+= PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${LOCALBASE} \
		26	PHP_HOME=${LOCALBASE} OPTIMIZE=yes
24	USE_PHP= yes	27	USE_PHP= yes
25	USE_PHP_BUILD= yes	28	USE_PHP_BUILD= yes
26	DEFAULT_PHP_VER=5	29	DEFAULT_PHP_VER=5
Lines 31-83 Link Here
31	LIB_VRS= ${PORTVERSION:S\|.\|\|g:C\|0$\|\|}	34	LIB_VRS= ${PORTVERSION:S\|.\|\|g:C\|0$\|\|}
32	PHP_MODNAME?= IcePHP	35	PHP_MODNAME?= IcePHP
33		36
34	NO_STAGE= yes
35	.include <bsd.port.options.mk>
36
37	CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT
38	.if ${PORT_OPTIONS:MDEBUG}
39	CFLAGS+= -g
40	.else
41	CFLAGS+= -DNDEBUG
42	.endif
43
44	.if ${ARCH} == "ia64"
45	BROKEN= does not compile on ia64
46	.endif
47
48	.if ((${ARCH} != i386) && (${ARCH} != powerpc))
49	MAKE_ENV= LP64=yes
50	.endif
51
52	.if ${PORT_OPTIONS:MNAMESPACES}
53	MAKE_ARGS+= USE_NAMESPACES=yes
54	PLIST_SUB+= NAMESPACES=""
55	PLIST_SUB+= NONAMESPACES="@comment "
56	.else
57	PLIST_SUB+= NAMESPACES="@comment "
58	PLIST_SUB+= NONAMESPACES=""
59	.endif
60
61	.if empty(PORT_OPTIONS:MDOCS)
62	MAKE_ENV+= NOPORTDOCS=yes
63	.endif
64
65	post-patch:
66	@${SED} 's\|%%PREFIX%%\|${PREFIX}\|g; \
67	s\|%%DATADIR%%\|${DATADIR}\|g; \
68	s\|%%DOCSDIR%%\|${DOCSDIR}\|g; \
69	s\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
70	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g' \
71	${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD
72	@${REINPLACE_CMD} 's\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
73	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g; \
74	s\|%%PREFIX%%\|${PREFIX}\|g ; \
75	s\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/php/config/Make.rules.php
76
77	post-install:	37	post-install:
78	@${MKDIR} ${PREFIX}/etc/php	38	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
79	@${ECHO_CMD} extension=${PHP_MODNAME}.so \
80	>> ${PREFIX}/etc/php/extensions.ini
81		39
82	add-plist-info:	40	add-plist-info:
83	@${ECHO_CMD} "@exec mkdir -p %D/etc/php" \	41	@${ECHO_CMD} "@exec mkdir -p %D/etc/php" \
Lines 105-108 Link Here
105	@${ECHO_CMD} ""	63	@${ECHO_CMD} ""
106	@${ECHO_CMD} "****************************************************************************"	64	@${ECHO_CMD} "****************************************************************************"
107		65
108	.include <bsd.port.mk>	66	.include "${MASTERDIR}/Makefile"

Lines 1-21 Link Here

(-)devel/php5-ice/files/Make.rules.FreeBSD (-21 lines)
1	mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
2
3	BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv
4	LIBS = -lIce $(BASELIBS)
5
6	ICEUTIL_OS_LIBS = -pthread
7
8	PLATFORM_HAS_READLINE := yes
9
10	export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH)
11
12	lp64suffix =
13	create_runpath_symlink = no
14	prefix = %%PREFIX%%
15	install_slicedir = %%DATADIR%%
16	install_configdir = %%DATADIR%%/config
17	install_docdir = %%DOCSDIR%%
18	EXPAT_HOME = $(LOCALBASE)
19	INSTALL = %%INSTALL_DATA%%
20	INSTALL_PROGRAM = %%INSTALL_PROGRAM%%
21	MCPP_HOME = $(LOCALBASE)

Lines 1-16 Link Here

(-)devel/php5-ice/files/patch-config_Make.common.rules (-16 lines)
1	--- ./config/Make.common.rules.orig 2013-06-05 13:13:29.000000000 +0400
2	+++ ./config/Make.common.rules 2013-06-17 09:45:21.000000000 +0400
3	@@ -385,13 +385,3 @@
4	cp -fpr $$subdir $(install_slicedir) ; \
5	done ; \
6	fi
7	-
8	- @if test ! -f $(prefix)/ICE_LICENSE$(TEXT_EXTENSION) ; \
9	- then \
10	- $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(prefix)) ; \
11	- fi
12	-
13	- @if test ! -f $(prefix)/LICENSE$(TEXT_EXTENSION) ; \
14	- then \
15	- $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(prefix)) ; \
16	- fi

Lines 1-13 Link Here

(-)devel/php5-ice/files/patch-cpp-config-Make.rules (-13 lines)
1	--- cpp.orig/config/Make.rules Fri Mar 11 16:19:00 2013
2	+++ cpp/config/Make.rules Fri May 19 22:00:09 2013
3	@@ -233,7 +233,9 @@
4	DB_FLAGS = -I/usr/local/include/db53
5	DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
6	else
7	- DB_LIBS = -ldb_cxx
8	+ DB_FLAGS = -I%%BDB_INCLUDE_DIR%%
9	+ DB_LIBS = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%%
10	+ DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%)
11	endif
12	endif
13	endif

Lines 1-23 Link Here

(-)devel/php5-ice/files/patch-php-config-Make.rules.php (-23 lines)
1	--- php/config/Make.rules.php.orig 2013-03-11 15:19:47.000000000 +0000
2	+++ php/config/Make.rules.php 2013-06-02 14:36:13.744196194 +0000
3	@@ -100,8 +100,8 @@
4	endif
5
6	libdir = $(top_srcdir)/lib
7	-install_phpdir = $(prefix)/php
8	-install_libdir = $(prefix)/php
9	+install_phpdir = $(prefix)/share/pear
10	+install_libdir = $(prefix)/lib/php/$(PHP_EXT_DIR)
11
12	#
13	# Platform specific definitions
14	@@ -155,7 +155,8 @@
15	endif
16
17	ifeq ($(installphplib),)
18	- installphplib = $(INSTALL) $(1) $(2); \
19	+ installphplib = mkdir -p $(2) ; \
20	+ $(INSTALL) $(1) $(2); \
21	chmod a+rx $(2)/$(notdir $(1))
22	endif
23

Lines 1-47 Link Here

(-)devel/php5-ice/files/patch-php-src-IcePHP-Connection.cpp (-47 lines)
1	--- php/src/IcePHP/Connection.cpp.orig 2013-06-02 11:48:58.022196354 +0000
2	+++ php/src/IcePHP/Connection.cpp 2013-06-02 11:50:59.494195380 +0000
3	@@ -360,7 +360,7 @@
4	//
5	zend_class_entry ce;
6	#ifdef ICEPHP_USE_NAMESPACES
7	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Connection"), _interfaceMethods);
8	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "Connection", _interfaceMethods);
9	#else
10	INIT_CLASS_ENTRY(ce, "Ice_Connection", _interfaceMethods);
11	#endif
12	@@ -380,7 +380,7 @@
13	// Register the ConnectionInfo class.
14	//
15	#ifdef ICEPHP_USE_NAMESPACES
16	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("ConnectionInfo"), _connectionInfoClassMethods);
17	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "ConnectionInfo", _connectionInfoClassMethods);
18	#else
19	INIT_CLASS_ENTRY(ce, "Ice_ConnectionInfo", _connectionInfoClassMethods);
20	#endif
21	@@ -396,7 +396,7 @@
22	// Register the IPConnectionInfo class.
23	//
24	#ifdef ICEPHP_USE_NAMESPACES
25	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPConnectionInfo"), NULL);
26	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "IPConnectionInfo", NULL);
27	#else
28	INIT_CLASS_ENTRY(ce, "Ice_IPConnectionInfo", NULL);
29	#endif
30	@@ -415,7 +415,7 @@
31	// Register the TCPConnectionInfo class.
32	//
33	#ifdef ICEPHP_USE_NAMESPACES
34	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPConnectionInfo"), NULL);
35	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPConnectionInfo", NULL);
36	#else
37	INIT_CLASS_ENTRY(ce, "Ice_TCPConnectionInfo", NULL);
38	#endif
39	@@ -426,7 +426,7 @@
40	// Register the UDPConnectionInfo class.
41	//
42	#ifdef ICEPHP_USE_NAMESPACES
43	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPConnectionInfo"), NULL);
44	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPConnectionInfo", NULL);
45	#else
46	INIT_CLASS_ENTRY(ce, "Ice_UDPConnectionInfo", NULL);
47	#endif

Lines 1-56 Link Here

(-)devel/php5-ice/files/patch-php-src-IcePHP-Endpoint.cpp (-56 lines)
1	--- php/src/IcePHP/Endpoint.cpp.orig 2013-06-02 11:51:19.569193334 +0000
2	+++ php/src/IcePHP/Endpoint.cpp 2013-06-02 11:52:06.348197336 +0000
3	@@ -274,7 +274,7 @@
4	//
5	zend_class_entry ce;
6	#ifdef ICEPHP_USE_NAMESPACES
7	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Endpoint"), _interfaceMethods);
8	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "Endpoint", _interfaceMethods);
9	#else
10	INIT_CLASS_ENTRY(ce, "Ice_Endpoint", _interfaceMethods);
11	#endif
12	@@ -293,7 +293,7 @@
13	// Register the EndpointInfo class.
14	//
15	#ifdef ICEPHP_USE_NAMESPACES
16	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("EndpointInfo"), _endpointInfoMethods);
17	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "EndpointInfo", _endpointInfoMethods);
18	#else
19	INIT_CLASS_ENTRY(ce, "Ice_EndpointInfo", _endpointInfoMethods);
20	#endif
21	@@ -309,7 +309,7 @@
22	// Register the IPEndpointInfo class.
23	//
24	#ifdef ICEPHP_USE_NAMESPACES
25	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPEndpointInfo"), NULL);
26	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "IPEndpointInfo", NULL);
27	#else
28	INIT_CLASS_ENTRY(ce, "Ice_IPEndpointInfo", NULL);
29	#endif
30	@@ -324,7 +324,7 @@
31	// Register the TCPEndpointInfo class.
32	//
33	#ifdef ICEPHP_USE_NAMESPACES
34	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPEndpointInfo"), NULL);
35	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPEndpointInfo", NULL);
36	#else
37	INIT_CLASS_ENTRY(ce, "Ice_TCPEndpointInfo", NULL);
38	#endif
39	@@ -335,7 +335,7 @@
40	// Register the UDPEndpointInfo class.
41	//
42	#ifdef ICEPHP_USE_NAMESPACES
43	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPEndpointInfo"), NULL);
44	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPEndpointInfo", NULL);
45	#else
46	INIT_CLASS_ENTRY(ce, "Ice_UDPEndpointInfo", NULL);
47	#endif
48	@@ -350,7 +350,7 @@
49	// Register the OpaqueEndpointInfo class.
50	//
51	#ifdef ICEPHP_USE_NAMESPACES
52	- INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("OpaqueEndpointInfo"), NULL);
53	+ INIT_NS_CLASS_ENTRY(ce, "Ice", "OpaqueEndpointInfo", NULL);
54	#else
55	INIT_CLASS_ENTRY(ce, "Ice_OpaqueEndpointInfo", NULL);
56	#endif

Lines 1-15 Link Here

(-)devel/php5-ice/files/patch-php-src-IcePHP-Init.cpp (-15 lines)
1	--- php/src/IcePHP/Init.cpp.orig 2013-03-11 15:19:47.000000000 +0000
2	+++ php/src/IcePHP/Init.cpp 2013-06-02 11:44:16.052196522 +0000
3	@@ -22,10 +22,10 @@
4
5	ZEND_DECLARE_MODULE_GLOBALS(ice)
6
7	-ZEND_BEGIN_ARG_INFO(Ice_initialize_arginfo, 1)
8	+ZEND_BEGIN_ARG_INFO_EX(Ice_initialize_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1))
9	ZEND_END_ARG_INFO()
10
11	-ZEND_BEGIN_ARG_INFO(Ice_createProperties_arginfo, 1)
12	+ZEND_BEGIN_ARG_INFO_EX(Ice_createProperties_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1))
13	ZEND_END_ARG_INFO()
14
15	#define ICEPHP_COMMUNICATOR_FUNCTIONS \

Lines 1-10 Link Here

(-)devel/py-ice/Makefile (-71 / +13 lines)
1	# Created by: Boris B. Samorodov <bsam@ipt.ru>	1	# Created by: Boris B. Samorodov <bsam@ipt.ru>
2	# $FreeBSD: devel/py-ice/Makefile 327724 2013-09-20 17:13:42Z bapt $	2	# $FreeBSD: devel/py-ice/Makefile 327724 2013-09-20 17:13:42Z bapt $
3		3
4	PORTNAME= Ice
5	PORTVERSION= 3.5.0
6	CATEGORIES= devel python	4	CATEGORIES= devel python
7	MASTER_SITES= http://download.zeroc.com/Ice/3.5/
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9		6
10	MAINTAINER= freebsd@grem.de	7	MAINTAINER= freebsd@grem.de
Lines 12-28 Link Here
12		9
13	LICENSE= GPLv2	10	LICENSE= GPLv2
14		11
15	BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp	12	BUILD_DEPENDS= mcpp:${PORTSDIR}/devel/mcpp \
		13	slice2py:${PORTSDIR}/devel/ice
16	LIB_DEPENDS= Ice.${LIB_VRS}:${PORTSDIR}/devel/ice	14	LIB_DEPENDS= Ice.${LIB_VRS}:${PORTSDIR}/devel/ice
17		15
18	USE_GMAKE= yes
19	USE_PYTHON= yes	16	USE_PYTHON= yes
		17	SLAVE_PORT= yes
		18	MASTERDIR= ${.CURDIR}/../ice
		19	PLIST= ${.CURDIR}/pkg-plist
		20
20	BUILD_WRKSRC= ${WRKSRC}/py	21	BUILD_WRKSRC= ${WRKSRC}/py
21	INSTALL_WRKSRC= ${WRKSRC}/py	22	INSTALL_WRKSRC= ${WRKSRC}/py
22		23
23	LIB_VRS= ${PORTVERSION:S\|.\|\|g:C\|0$\|\|}	24	LIB_VRS= ${PORTVERSION:S\|.\|\|g:C\|[0-9]$\|\|}
24	PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"	25	PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
25	MAKE_ENV= ICE_HOME="${LOCALBASE}/share/Ice"
26		26
27	# bypass infrastructure bug (taken from www/py-django)	27	# bypass infrastructure bug (taken from www/py-django)
28	OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options	28	OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
Lines 30-98 Link Here
30	OPTIONS_DEFAULT=TESTS	30	OPTIONS_DEFAULT=TESTS
31	TESTS_DESC= Run tests	31	TESTS_DESC= Run tests
32		32
33	NO_STAGE= yes
34	.include <bsd.port.options.mk>
35
36	CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT
37	.if empty(PORT_OPTIONS:MDEBUG)
38	CFLAGS+= -DNDEBUG
39	.endif
40
41	.if ${ARCH} == "ia64"
42	BROKEN= does not compile on ia64
43	.endif
44
45	.if ((${ARCH} != i386) && (${ARCH} != powerpc))
46	MAKE_ENV= LP64=yes
47	.endif
48
49	.if empty(PORT_OPTIONS:MDOCS)
50	MAKE_ENV+= NOPORTDOCS=yes
51	.endif
52
53	.include <bsd.port.pre.mk>
54
55	.if ${PYTHON_REL} >= 320
56	PLIST_SUB+= PYTHON32=""
57	PLIST_SUB+= PYTHONPRE32="@comment "
58	.else
59	PLIST_SUB+= PYTHON32="@comment "
60	PLIST_SUB+= PYTHONPRE32=""
61	.endif
62
63	PLIST_SUB+= PYTHON_SUFFIX=${PYTHON_SUFFIX}
64
65	post-patch:
66	@${SED} 's\|%%PREFIX%%\|${PREFIX}\|g; \
67	s\|%%DATADIR%%\|${DATADIR}\|g; \
68	s\|%%DOCSDIR%%\|${DOCSDIR}\|g; \
69	s\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
70	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g' \
71	${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD
72	@${REINPLACE_CMD} 's\|%%INSTALL_PROGRAM%%\|${INSTALL_PROGRAM}\|g; \
73	s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g; \
74	s\|%%PYTHON_SITELIBDIR%%\|${PYTHON_SITELIBDIR}\|g; \
75	s\|%%PREFIX%%\|${PREFIX}\|g ; \
76	s\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/py/config/Make.rules
77	@${REINPLACE_CMD} 's\|.(ice_dir).slice\|${DATADIR}\|g; \
78	s\|.(prefix).slice\|${DATADIR}\|g; \
79	s\|.(prefix).[ICE_]*LICENSE\|${DATADIR}/LICENSE\|g;' \
80	${WRKSRC}/config/Make.common.rules
81
82	post-install:	33	post-install:
83	${ECHO} "Ice" > ${PYTHON_SITELIBDIR}/Ice.pth	34	${ECHO} "Ice" > ${STAGEDIR}${PYSITEDIR}/Ice.pth
84	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/Ice	35	@${FIND} ${STAGEDIR}${PYSITEDIR}/Ice \( -name ".pyc" -or -name ".pyo" \) \
85	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/Ice	36	-exec ${CHMOD} u+w {} \;
86		37	@${PYTHON_CMD} -m compileall ${STAGEDIR}${PYSITEDIR}/Ice
87	.if ${PORT_OPTIONS:MTESTS}	38	@${PYTHON_CMD} -O -m compileall ${STAGEDIR}${PYSITEDIR}/Ice
88	TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
89	.endif
90
91	.if ${PORT_OPTIONS:MTESTS}
92	post-build:
93	${TEST_CMD}
94	regression-test test: build
95	${TEST_CMD}
96	.endif
97		39
98	.include <bsd.port.post.mk>	40	.include "${MASTERDIR}/Makefile"

Lines 1-21 Link Here

(-)devel/py-ice/files/Make.rules.FreeBSD (-21 lines)
1	mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
2
3	BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv
4	LIBS = -lIce $(BASELIBS)
5
6	ICEUTIL_OS_LIBS = -pthread
7
8	PLATFORM_HAS_READLINE := yes
9
10	export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH)
11
12	lp64suffix =
13	create_runpath_symlink = no
14	prefix = %%PREFIX%%
15	install_slicedir = %%DATADIR%%
16	install_configdir = %%DATADIR%%/config
17	install_docdir = %%DOCSDIR%%
18	EXPAT_HOME = $(LOCALBASE)
19	INSTALL = %%INSTALL_DATA%%
20	INSTALL_PROGRAM = %%INSTALL_PROGRAM%%
21	MCPP_HOME = $(LOCALBASE)

Lines 1-32 Link Here

(-)devel/py-ice/files/patch-py-config-Make.rules (-32 lines)
1	--- py/config/Make.rules.orig 2013-03-11 15:19:47.000000000 +0000
2	+++ py/config/Make.rules 2013-05-20 14:21:13.335195726 +0000
3	@@ -12,7 +12,8 @@
4	# if it does not exist.
5	#
6
7	-prefix ?= /opt/Ice-$(VERSION)
8	+ICE_HOME = %%LOCALBASE%%
9	+prefix ?= %%PREFIX%%
10
11	#
12	# The "root directory" for runpath embedded in executables. Can be unset
13	@@ -95,8 +96,8 @@
14	endif
15
16	libdir = $(top_srcdir)/python
17	-install_pythondir = $(prefix)/python
18	-install_libdir = $(prefix)/python
19	+install_pythondir = %%PYTHON_SITELIBDIR%%/Ice
20	+install_libdir = %%PYTHON_SITELIBDIR%%/Ice
21
22	ifeq ($(UNAME),SunOS)
23	ifeq ($(LP64),yes)
24	@@ -118,7 +119,7 @@
25	ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
26	ICE_FLAGS = -I$(ice_dir)/include
27	endif
28	-ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
29	+ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil -liconv
30
31	ifneq ($(embedded_runpath_prefix),)
32	runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir)

Lines 1-16 Link Here

(-)devel/py-ice/files/patch-py-python-Makefile (-16 lines)
1	--- py/python/Makefile.orig 2010-07-11 13:05:38.000000000 +1000
2	+++ py/python/Makefile 2012-09-11 00:09:09.000000000 +2000
3	@@ -118,10 +118,11 @@
4
5	install:: $(ALL_SRCS)
6	@echo "Installing generated code"
7	- $(INSTALL_DATA) *.py $(install_pythondir)
8	+ $(INSTALL_DATA) .py $(install_pythondir)
9	@for i in $(PACKAGES) ; \
10	do \
11	- $(INSTALL_DATA) -r $$i $(install_pythondir) ; \
12	+ mkdir -p $(install_pythondir)/$$i ; \
13	+ $(INSTALL_DATA) $$i/.py $(install_pythondir)/$$i ; \
14	done
15
16	depend:: $(ICE_SLICE) $(GLACIER2_SLICE) $(ICEBOX_SLICE) $(ICEGRID_SLICE) $(ICEPATCH2_SLICE) $(ICESTORM_SLICE)

Lines 1-79 Link Here

(-)devel/py-ice/files/patch-py-test-Ice-info-AllTests.py (-79 lines)
1	--- py/test/Ice/info/AllTests.py.orig 2013-03-11 15:19:47.000000000 +0000
2	+++ py/test/Ice/info/AllTests.py 2013-05-20 14:25:56.860196743 +0000
3	@@ -7,12 +7,31 @@
4	#
5	# **********************************************************************
6
7	-import Ice, Test, sys, threading
8	+import Ice, Test, sys, threading, subprocess
9
10	def test(b):
11	if not b:
12	raise RuntimeError('test assertion failed')
13
14	+def isFreeBSD():
15	+ return sys.platform.startswith("freebsd")
16	+
17	+def sysctl(key):
18	+ p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE)
19	+ try:
20	+ result = p.communicate()[0].strip().split()[1]
21	+ except IndexError:
22	+ return 0
23	+ if sys.version_info >= (3,):
24	+ result = str(result, sys.stdout.encoding)
25	+ try:
26	+ return int(result)
27	+ except ValueError:
28	+ return result
29	+
30	+def isFreeBSDJail():
31	+ return isFreeBSD() and sysctl("security.jail.jailed")
32	+
33	def allTests(communicator, collocated):
34	sys.stdout.write("testing proxy endpoint information... ")
35	sys.stdout.flush()
36	@@ -67,12 +86,12 @@
37
38	ipEndpoint = endpoints[0].getInfo()
39	test(ipEndpoint.type() == Ice.TCPEndpointType or ipEndpoint.type() == 2)
40	- test(ipEndpoint.host == defaultHost)
41	+ test(ipEndpoint.host == defaultHost or isFreeBSDJail())
42	test(ipEndpoint.port > 0)
43	test(ipEndpoint.timeout == 15000)
44
45	udpEndpoint = endpoints[1].getInfo()
46	- test(udpEndpoint.host == defaultHost)
47	+ test(udpEndpoint.host == defaultHost or isFreeBSDJail())
48	test(udpEndpoint.datagram())
49	test(udpEndpoint.port > 0)
50
51	@@ -108,7 +127,7 @@
52	ipinfo = base.ice_getConnection().getEndpoint().getInfo()
53	test(ipinfo.port == 12010)
54	test(not ipinfo.compress)
55	- test(ipinfo.host == defaultHost)
56	+ test(ipinfo.host == defaultHost or isFreeBSDJail())
57
58	ctx = testIntf.getEndpointInfoAsContext()
59	test(ctx["host"] == ipinfo.host)
60	@@ -118,7 +137,7 @@
61
62	udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo()
63	test(udp.port == 12010)
64	- test(udp.host == defaultHost)
65	+ test(udp.host == defaultHost or isFreeBSDJail())
66
67	print("ok")
68
69	@@ -129,8 +148,8 @@
70	test(not info.incoming)
71	test(len(info.adapterName) == 0)
72	test(info.remotePort == 12010)
73	- test(info.remoteAddress == defaultHost)
74	- test(info.localAddress == defaultHost)
75	+ test(info.remoteAddress == defaultHost or isFreeBSDJail())
76	+ test(info.localAddress == defaultHost or isFreeBSDJail())
77
78	ctx = testIntf.getConnectionInfoAsContext()
79	test(ctx["incoming"] == "true")

Lines 1-29 Link Here

(-)devel/py-ice/files/patch-py-test-Ice-properties-run.py (-29 lines)
1	--- py/test/Ice/properties/run.py.orig 2013-05-21 02:29:52.861195367 +0000
2	+++ py/test/Ice/properties/run.py 2013-05-21 02:30:44.972196471 +0000
3	@@ -26,15 +26,15 @@
4	#
5	if sys.version_info[0] == 2:
6	configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config".decode("utf-8")
7	- TestUtil.createConfig(configPath,
8	+ TestUtil.createConfig(configPath.encode("utf-8"),
9	["# Automatically generated by Ice test driver.",
10	"Ice.Trace.Protocol=1",
11	"Ice.Trace.Network=1",
12	"Ice.ProgramName=PropertiesClient",
13	- "Config.Path=./config/中国_client.config"])
14	+ "Config.Path=" + configPath.encode("utf-8")])
15	else:
16	configPath = "./config/\u4e2d\u56fd_client.config"
17	- TestUtil.createConfig(configPath,
18	+ TestUtil.createConfig(configPath.encode("utf-8"),
19	["# Automatically generated by Ice test driver.",
20	"Ice.Trace.Protocol=1",
21	"Ice.Trace.Network=1",
22	@@ -44,5 +44,5 @@
23
24	TestUtil.simpleTest()
25
26	-if os.path.exists(configPath):
27	- os.remove(configPath)
28	+if os.path.exists(configPath.encode("utf-8")):
29	+ os.remove(configPath.encode("utf-8"))

Lines 115-120 Link Here

(-)devel/py-ice/pkg-plist (+7 lines)
115	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_ProcessF_ice.cpython-%%PYTHON_SUFFIX%%.pyo	115	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_ProcessF_ice.cpython-%%PYTHON_SUFFIX%%.pyo
116	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Process_ice.cpython-%%PYTHON_SUFFIX%%.pyc	116	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Process_ice.cpython-%%PYTHON_SUFFIX%%.pyc
117	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Process_ice.cpython-%%PYTHON_SUFFIX%%.pyo	117	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Process_ice.cpython-%%PYTHON_SUFFIX%%.pyo
		118	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_PropertiesAdmin_ice.cpython-%%PYTHON_SUFFIX%%.pyc
		119	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_PropertiesAdmin_ice.cpython-%%PYTHON_SUFFIX%%.pyo
118	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_PropertiesF_ice.cpython-%%PYTHON_SUFFIX%%.pyc	120	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_PropertiesF_ice.cpython-%%PYTHON_SUFFIX%%.pyc
119	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_PropertiesF_ice.cpython-%%PYTHON_SUFFIX%%.pyo	121	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_PropertiesF_ice.cpython-%%PYTHON_SUFFIX%%.pyo
120	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Properties_ice.cpython-%%PYTHON_SUFFIX%%.pyc	122	%%PYTHON32%%%%PYTHON_SITELIBDIR%%/Ice/__pycache__/Ice_Properties_ice.cpython-%%PYTHON_SUFFIX%%.pyc
Lines 251-256 Link Here
251	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.pyo	253	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.pyo
252	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyc	254	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyc
253	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyo	255	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyo
		256	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesAdmin_ice.pyc
		257	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesAdmin_ice.pyo
254	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyc	258	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyc
255	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyo	259	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyo
256	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyc	260	%%PYTHONPRE32%%%%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyc
Lines 332-337 Link Here
332	%%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.py	336	%%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.py
333	%%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.py	337	%%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.py
334	%%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.py	338	%%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.py
		339	%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesAdmin_ice.py
335	%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.py	340	%%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.py
336	%%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.py	341	%%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.py
337	%%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.py	342	%%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.py
Lines 354-356 Link Here
354	@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm	359	@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/IceStorm
355	%%PYTHON32%%@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/__pycache__	360	%%PYTHON32%%@dirrmtry %%PYTHON_SITELIBDIR%%/Ice/__pycache__
356	@dirrmtry %%PYTHON_SITELIBDIR%%/Ice	361	@dirrmtry %%PYTHON_SITELIBDIR%%/Ice
		362	@dirrmtry %%PYTHON_SITELIBDIR%%
		363	@dirrmtry %%PYTHON_LIBDIR%%