1 files changed, 13 insertions, 22 deletions
diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index 3923208b815f..567c23f2eb9c 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -1,7 +1,7 @@
 # Created by: Stefan Ehmann <shoesoft@gmx.net>
 
 PORTNAME=		Ice
-PORTVERSION=		3.6.4
+PORTVERSION=		3.6.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel
 
@@ -27,24 +27,22 @@ PLIST_SUB+=		LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 
 OPTIONS_DEFINE?=	DEBUG TEST
 
-.include <bsd.port.options.mk>
-
-USES+=			iconv gmake
-
-.if ${PORT_OPTIONS:MTEST} && ${SLAVE_PORT} == "no"
-USES+=			python:build
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR}
-.endif
-
-USES+=			bdb:5
+USES+=			bdb:5 iconv gmake
 INVALID_BDB_VER=	48 6
 USE_LDCONFIG=		yes
 BUILD_WRKSRC?=		${WRKSRC}/cpp
 INSTALL_WRKSRC?=	${WRKSRC}/cpp
 PORTSCOUT=		limit:^3\.6\.
 USE_GITHUB=		yes
-GH_ACCOUNT=		zeroc-ice
-GH_PROJECT=		ice
+GH_TUPLE=		zeroc-ice:ice:${DISTVERSIONFULL}
+TEST_GH_TUPLE=		zeroc-ice:ice:v3.7.6:CERTS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTEST} && ${SLAVE_PORT} == "no"
+USES+=			python:build
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR}
+.endif
 
 CFLAGS+=		-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
 
@@ -73,15 +71,6 @@ PYSITEDIR=	${PREFIX}${PYTHON_SITELIBDIR:S|^${LOCALBASE}||}
 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; \
@@ -121,6 +110,8 @@ post-patch:
 		s|%%LOCALBASE%%|${LOCALBASE}|g;' ${WRKSRC}/php/config/Make.rules.php
 
 do-test-TEST-on:
+	@${RM} -r ${WRKSRC}/certs
+	@${CP} -r ${WRKSRC_CERTS}/certs ${WRKSRC}/certs
 	@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
 
 .if ${SLAVE_PORT} == "no"