1 files changed, 60 insertions, 25 deletions

diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index e3209878c991..cfa1ef6a4139 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		Ice
-PORTVERSION=		3.5.0
+PORTVERSION=		3.5.1
 CATEGORIES=		devel
 MASTER_SITES=		http://download.zeroc.com/Ice/3.5/
 
@@ -11,31 +11,31 @@ COMMENT=		Modern alternative to object middleware such as CORBA/COM/DCOM/COM+
 
 LICENSE=		GPLv2
 
-LIB_DEPENDS=		expat:${PORTSDIR}/textproc/expat2 \
-			mcpp:${PORTSDIR}/devel/mcpp
+LIB_DEPENDS=		libexpat.so:${PORTSDIR}/textproc/expat2 \
+			libmcpp.so:${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
+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_PYTHON_BUILD=	yes
 .endif
 
-USE_GMAKE=		yes
-USES=			iconv
+USES=			iconv gmake
 USE_BDB=		5
-INVALID_BDB_VER=	2 3 40 41 42 43 44 46 47 48
+INVALID_BDB_VER=	40 41 42 43 44 46 47 48 6
 USE_LDCONFIG=		yes
-BUILD_WRKSRC=		${WRKSRC}/cpp
-INSTALL_WRKSRC=		${WRKSRC}/cpp
+BUILD_WRKSRC?=		${WRKSRC}/cpp
+INSTALL_WRKSRC?=	${WRKSRC}/cpp
 
 CFLAGS+=		-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
-.if !${PORT_OPTIONS:MDEBUG}
+.if ${PORT_OPTIONS:MDEBUG}
+CFLAGS+=		-g
+.else
 CFLAGS+=		-DNDEBUG
 .endif
 
@@ -47,12 +47,8 @@ BROKEN=			does not compile on ia64
 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
+MAKE_ENV+=		LP64=yes
 .endif
 
 .if !${PORT_OPTIONS:MTESTS}
@@ -64,13 +60,41 @@ MAKE_ENV+=		NODEMOS=yes
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
-MAKE_ENV+=		NOPORTDOCS=yes
+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%%|${PREFIX}|g; \
-		s|%%DATADIR%%|${DATADIR}|g; \
-		s|%%DOCSDIR%%|${DOCSDIR}|g; \
+	@${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
@@ -83,8 +107,19 @@ post-patch:
 		${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/' \
+	@${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
@@ -94,4 +129,4 @@ regression-test test: build
 	${TEST_CMD}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>