Changes from the PR:

. fix built using Clang in C++11 mode and libc++ (-std=c++11
-stdlib=libc++);
. incorporate a patch that fixes an assert bug in IceStrom;
. adopt new-style options;

While I'm here:
. adopt new-style headers;
. remove indefinite article form COMMENT;
. remove library versions from LIB_DEPENDS.

PR:		ports/171643
Submitted by:	Michael Gmelin <freebsd@grem.de> (maintainer)

1 files changed, 42 insertions, 47 deletions

diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index 660f1ff7b88b..82f3199c466f 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -1,97 +1,92 @@
-# New ports collection makefile for:	ice
-# Date created:		2004-02-02
-# Whom:			Stefan Ehmann <shoesoft@gmx.net>
-#
+# Created by: Stefan Ehmann <shoesoft@gmx.net>
 # $FreeBSD$
-#
 
-PORTNAME=	Ice
-PORTVERSION=	3.4.2
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	http://download.zeroc.com/Ice/3.4/
+PORTNAME=		Ice
+PORTVERSION=		3.4.2
+PORTREVISION=		3
+CATEGORIES=		devel
+MASTER_SITES=		http://download.zeroc.com/Ice/3.4/
 
-MAINTAINER=	freebsd@grem.de
-COMMENT=	A modern alternative to object middleware such as CORBA/COM/DCOM/COM+
+MAINTAINER=		freebsd@grem.de
+COMMENT=		Modern alternative to object middleware such as CORBA/COM/DCOM/COM+
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		mcpp.3:${PORTSDIR}/devel/mcpp
+LIB_DEPENDS=		expat:${PORTSDIR}/textproc/expat2 \
+			mcpp:${PORTSDIR}/devel/mcpp
 
-OPTIONS=	TESTS "Build and run tests (requires lang/python)" on \
-		DEMOS "Build demos" on
+OPTIONS_DEFINE=		DEBUG DEMOS DOCS TESTS
+OPTIONS_DEFAULT=	DEMOS TESTS
+TESTS_DESC=		Build and run tests (requires lang/python)
+DEMOS_DESC=		Build demos
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_TESTS)
+.if ${PORT_OPTIONS:MTESTS}
 USE_PYTHON_BUILD=	yes
 .endif
 
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_BDB=	42+
+USE_GMAKE=		yes
+USE_ICONV=		yes
+USE_BDB=		42+
 INVALID_BDB_VER=	2 3 40 41
-USE_LDCONFIG=	yes
-BUILD_WRKSRC=	${WRKSRC}/cpp
-INSTALL_WRKSRC=	${WRKSRC}/cpp
-
-CFLAGS+=	-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-.if defined(DEBUG)
-CFLAGS+=	-g
-.else
-CFLAGS+=	-DNDEBUG
+USE_LDCONFIG=		yes
+BUILD_WRKSRC=		${WRKSRC}/cpp
+INSTALL_WRKSRC=		${WRKSRC}/cpp
+
+CFLAGS+=		-ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+.if !${PORT_OPTIONS:MDEBUG}
+CFLAGS+=		-DNDEBUG
 .endif
 
-.include <bsd.port.pre.mk>
 .if ${ARCH} == "ia64"
-BROKEN=		does not compile on ia64
+BROKEN=			does not compile on ia64
 .endif
 
 .if ${ARCH} == "sparc64"
-BROKEN=		fails to link
+BROKEN=			fails to link
 .endif
 
 .if ((${ARCH} != i386) && (${ARCH} != powerpc))
-MAKE_ENV=	LP64=yes
+MAKE_ENV=		LP64=yes
 .endif
 
-.if !defined(WITH_TESTS)
-MAKE_ENV+=	NOTESTS=yes
+.if !${PORT_OPTIONS:MTESTS}
+MAKE_ENV+=		NOTESTS=yes
 .endif
 
-.if !defined(WITH_DEMOS)
-MAKE_ENV+=	NODEMOS=yes
+.if !${PORT_OPTIONS:MDEMOS}
+MAKE_ENV+=		NODEMOS=yes
 .endif
 
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	NOPORTDOCS=yes
+.if !${PORT_OPTIONS:MDOCS}
+MAKE_ENV+=		NOPORTDOCS=yes
 .endif
 
 post-patch:
-	${SED} 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
+	@${SED} 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
 		s|%%PREFIX%%|${PREFIX}|g; \
 		s|%%DATADIR%%|${DATADIR}|g; \
 		s|%%DOCSDIR%%|${DOCSDIR}|g; \
 		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g' \
 		${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD
-	${REINPLACE_CMD} 's|%%BDB_LIB_CXX_NAME%%|${BDB_LIB_CXX_NAME}|g; \
+	@${REINPLACE_CMD} 's|%%BDB_LIB_CXX_NAME%%|${BDB_LIB_CXX_NAME}|g; \
 		s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g; \
 		s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g; \
 		/install_docdir/d' \
 		${WRKSRC}/cpp/config/Make.rules
-	${REINPLACE_CMD} '/install_configdir/d' \
+	@${REINPLACE_CMD} '/install_configdir/d' \
 		${WRKSRC}/cpp/config/Make.rules
-	${REINPLACE_CMD} 's|INSTALL_PROGRAM|INSTALL_DATA|g' \
+	@${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/' \
 		${WRKSRC}/config/Make.common.rules
 
-.if defined(WITH_TESTS)
-TEST_CMD=	@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
+.if ${PORT_OPTIONS:MTESTS}
+TEST_CMD=		@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
 post-build:
 	${TEST_CMD}
 regression-test test: build
 	${TEST_CMD}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>