Overhaul devel/ice, devel/py-ice and devel/php5-ice:

Changes from [*]:
- Update Ice to 3.5.1.
- Stageify all three ports.
- Convert py-ice and php5-ice to slave ports.
- Use ICONV_LIB, so it builds ok with native iconv [1].
- Workaround for FreeBSD 10's static destructor order disaster [2].
- Install man pages.
- Allow package build for non-root users.
[1] http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/using-iconv.html
[2] http://lists.freebsd.org/pipermail/freebsd-ports/2013-June/084580.html

Changes from [3]:
- Convert LIB_DEPENDS to new syntax.
- USE_GMAKE -> USES
- list Berkeley DB 6 invalid, requires upstream changes, but upstream is
  loathe to make those due to licensing change in BDB
- remove BDB 2 and 3 from invalid listing, we no longer have these ports

PR:		ports/184453 [*]
PR:		ports/185569 [3]
Submitted by:	Michael Gmelin (maintainer) [*]
Submitted by:	mandree [3]
Approved by:	Michael Gmelin (maintainer) [3]

15 files changed, 279 insertions, 74 deletions

diff --git a/devel/ice/files/Make.rules.FreeBSD b/devel/ice/files/Make.rules.FreeBSD
index 03ca1908b79b..ab9b61f69399 100644
--- a/devel/ice/files/Make.rules.FreeBSD
+++ b/devel/ice/files/Make.rules.FreeBSD
@@ -1,6 +1,6 @@
 mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4)
 
-BASELIBS		= -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv
+BASELIBS		= -lIceUtil -pthread -L$(LOCALBASE)/lib %%ICONV_LIB%%
 LIBS			= -lIce $(BASELIBS) 
 
 ICEUTIL_OS_LIBS         = -pthread
@@ -19,3 +19,4 @@ EXPAT_HOME		= $(LOCALBASE)
 INSTALL			= %%INSTALL_DATA%%
 INSTALL_PROGRAM		= %%INSTALL_PROGRAM%%
 MCPP_HOME		= $(LOCALBASE)
+override DESTDIR	=
diff --git a/devel/ice/files/patch-config-Make.common.rules b/devel/ice/files/patch-config-Make.common.rules
index 7ba9dd1fadd1..8dd6eb5c8451 100644
--- a/devel/ice/files/patch-config-Make.common.rules
+++ b/devel/ice/files/patch-config-Make.common.rules
@@ -1,18 +1,45 @@
 --- 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
-@@ -378,11 +378,15 @@
+@@ -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 $(install_slicedir)..." ; \
- 	    $(call mkdir, $(install_slicedir)) ; \
+ 	    echo "Creating $(DESTDIR)$(install_slicedir)..." ; \
+ 	    $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \
 +	fi
 +
-+	@if test -d $(install_slicedir) ; \
++	@if test -d $(DESTDIR)$(install_slicedir) ; \
 +	then \
  	    cd $(top_srcdir)/../slice ; \
  	    for subdir in * ; \
  	    do \
- 	        echo "Copying slice/$$subdir to $(install_slicedir)..." ; \
- 	        cp -fpr $$subdir $(install_slicedir) ; \
+ 	        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
diff --git a/devel/ice/files/patch-cpp-Makefile b/devel/ice/files/patch-cpp-Makefile
index d1512e00c888..4857584e8327 100644
--- a/devel/ice/files/patch-cpp-Makefile
+++ b/devel/ice/files/patch-cpp-Makefile
@@ -17,7 +17,7 @@
  endif
 +endif
 +
-+ifeq ($(NOPORTDOCS),)
++ifeq ($(NOICEDOCS),)
 +SUBDIRS		:= $(SUBDIRS) doc
 +endif
 +
diff --git a/devel/ice/files/patch-cpp-allTests.py b/devel/ice/files/patch-cpp-allTests.py
index f996d9806203..2b9a4cbf333a 100644
--- a/devel/ice/files/patch-cpp-allTests.py
+++ b/devel/ice/files/patch-cpp-allTests.py
@@ -9,6 +9,15 @@
      ("Ice/defaultServant", ["core"]),
      ("Ice/defaultValue", ["core"]),
      ("Ice/invoke", ["core", "novc6"]),
+@@ -85,7 +85,7 @@
+     ("IceStorm/federation2", ["service", "novc90", "nomingw"]),
+     ("IceStorm/stress", ["service", "stress", "novc90", "noappverifier", "nomingw"]), # Too slow with appverifier.
+     ("IceStorm/rep1", ["service", "novc90", "nomingw"]),
+-    ("IceStorm/repgrid", ["service", "novc90", "nomingw"]),
++    ("IceStorm/repgrid", ["service", "novc90", "nomingw", "nofreebsd"]),
+     ("IceStorm/repstress", ["service", "noipv6", "stress", "novc90", "nomingw"]),
+     ("FreezeScript/dbmap", ["once", "novc90", "nomingw"]),
+     ("FreezeScript/evictor", ["once", "novc90", "nomingw"]),
 @@ -106,8 +107,8 @@
  #
  if TestUtil.isWin32() or os.getuid() == 0:
diff --git a/devel/ice/files/patch-cpp-include-IceUtil-Config.h b/devel/ice/files/patch-cpp-include-IceUtil-Config.h
deleted file mode 100644
index 625a440fb38d..000000000000
--- a/devel/ice/files/patch-cpp-include-IceUtil-Config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpp.orig/include/IceUtil/Config.h	2013-03-11 15:19:46.000000000 +0000
-+++ cpp/include/IceUtil/Config.h	2013-05-20 02:09:58.239194578 +0000
-@@ -51,7 +51,7 @@
- // Check for C++ 11 support
- //
- #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
--    (defined(__clang__) && (__clang_major__ >= 4) && __cplusplus >= 201103) || \
-+    (defined(__clang__) && ((defined(__APPLE__) && __clang_major__ >= 4) || (!defined(__APPLE__) && __clang_major__ >= 3)) && __cplusplus >= 201103) || \
-     (defined(_MSC_VER) && (_MSC_VER >= 1600))
- #   define ICE_CPP11
- #endif
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-FileCache.cpp b/devel/ice/files/patch-cpp-src-IceGrid-FileCache.cpp
deleted file mode 100644
index 304dc947f2f1..000000000000
--- a/devel/ice/files/patch-cpp-src-IceGrid-FileCache.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- cpp.orig/src/IceGrid/FileCache.cpp	2013-03-11 15:19:12.271195149 +0000
-+++ cpp/src/IceGrid/FileCache.cpp	2013-06-01 17:47:48.636196265 +0000
-@@ -195,11 +195,11 @@
-         // Some eofbit cases will also set failbit. So first
-         // check eof.
-         //
--        if(is.eof())
-+        if(is.eof() || is.fail())
-         {
-             newOffset += line.size();
-         }
--        else if(!is.fail())
-+        else
-         {
-             newOffset = is.tellg();
-         }
diff --git a/devel/ice/files/patch-cpp-src-slice2cpp-Gen.cpp b/devel/ice/files/patch-cpp-src-slice2cpp-Gen.cpp
index 100cc8d65a21..882245e5bfea 100644
--- a/devel/ice/files/patch-cpp-src-slice2cpp-Gen.cpp
+++ b/devel/ice/files/patch-cpp-src-slice2cpp-Gen.cpp
@@ -1,13 +1,44 @@
 --- 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
-@@ -385,6 +385,10 @@
-         H << "\n#include <Ice/Proxy.h>";
-         H << "\n#include <Ice/OutgoingAsync.h>";
-     }
-+    else if(p->hasNonLocalClassDecls())
-+    {
-+        H << "\n#include <Ice/Proxy.h>";
-+    }
+@@ -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())
-     {
diff --git a/devel/ice/files/patch-cpp-test-Ice-properties-run.py b/devel/ice/files/patch-cpp-test-Ice-properties-run.py
deleted file mode 100644
index 9537cffd0de1..000000000000
--- a/devel/ice/files/patch-cpp-test-Ice-properties-run.py
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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"))
diff --git a/devel/ice/files/patch-php-Makefile b/devel/ice/files/patch-php-Makefile
new file mode 100644
index 000000000000..84e8c66df005
--- /dev/null
+++ b/devel/ice/files/patch-php-Makefile
@@ -0,0 +1,11 @@
+--- php/Makefile.orig	2013-10-04 15:48:15.000000000 +0000
++++ php/Makefile	2013-12-01 21:19:31.863489109 +0000
+@@ -14,7 +14,7 @@
+ SUBDIRS		= src lib demo test
+ INSTALL_SUBDIRS = $(install_phpdir) $(install_libdir)
+ 
+-install:: install-common
++install::
+ 	@for subdir in $(INSTALL_SUBDIRS); \
+ 	do \
+ 	    if test ! -d $(DESTDIR)$$subdir ; \
diff --git a/devel/ice/files/patch-php-config-Make.rules.php b/devel/ice/files/patch-php-config-Make.rules.php
new file mode 100644
index 000000000000..9b2a08c7e276
--- /dev/null
+++ b/devel/ice/files/patch-php-config-Make.rules.php
@@ -0,0 +1,23 @@
+--- 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
+ 
diff --git a/devel/ice/files/patch-php-lib-Makefile b/devel/ice/files/patch-php-lib-Makefile
new file mode 100644
index 000000000000..33344eec336c
--- /dev/null
+++ b/devel/ice/files/patch-php-lib-Makefile
@@ -0,0 +1,12 @@
+--- 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 \
diff --git a/devel/ice/files/patch-py-Makefile b/devel/ice/files/patch-py-Makefile
new file mode 100644
index 000000000000..7f929446e128
--- /dev/null
+++ b/devel/ice/files/patch-py-Makefile
@@ -0,0 +1,11 @@
+--- py/Makefile.orig	2013-10-04 15:48:15.000000000 +0000
++++ py/Makefile	2013-12-01 16:37:09.381657035 +0000
+@@ -15,7 +15,7 @@
+ 
+ INSTALL_SUBDIRS = $(install_pythondir) $(install_libdir)
+ 
+-install:: install-common
++install::
+ 	@for subdir in $(INSTALL_SUBDIRS); \
+ 	do \
+ 	    if test ! -d $(DESTDIR)$$subdir ; \
diff --git a/devel/ice/files/patch-py-config-Make.rules b/devel/ice/files/patch-py-config-Make.rules
new file mode 100644
index 000000000000..d6085067d160
--- /dev/null
+++ b/devel/ice/files/patch-py-config-Make.rules
@@ -0,0 +1,41 @@
+--- 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) $<
+ 
diff --git a/devel/ice/files/patch-py-python-Makefile b/devel/ice/files/patch-py-python-Makefile
new file mode 100644
index 000000000000..3afcfe039544
--- /dev/null
+++ b/devel/ice/files/patch-py-python-Makefile
@@ -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 @@
+ 
+ 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)
diff --git a/devel/ice/files/patch-py-test-Ice-info-AllTests.py b/devel/ice/files/patch-py-test-Ice-info-AllTests.py
new file mode 100644
index 000000000000..5c04fe28227f
--- /dev/null
+++ b/devel/ice/files/patch-py-test-Ice-info-AllTests.py
@@ -0,0 +1,79 @@
+--- 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")