Support building against LibreSSL and OpenSSL from ports.

Also fixes building against iconv from ports.

PR:		203163
Approved by:	mentors (implicit)

1 files changed, 14 insertions, 5 deletions

diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index fe1b74a17576..71a8c8d5043d 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		Ice
 PORTVERSION=		3.6.0
+PORTREVISION=		1
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel
 
@@ -102,29 +103,37 @@ post-patch:
 		s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g; \
 		s|%%ICONV_LIB%%|${ICONV_LIB}|g; \
 		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \
-		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g' \
+		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
+		s|%%OPENSSLLIB%%|${OPENSSLLIB}|g; \
+		s|%%OPENSSLINC%%|${OPENSSLINC}|g; \
+		s|%%OPENSSLRPATH%%|${OPENSSLRPATH}|g;' \
 		${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD
 	@${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; \
+		s|%%OPENSSLLIB%%|${OPENSSLLIB}|g; \
+		s|%%OPENSSLINC%%|${OPENSSLINC}|g; \
+		s|%%OPENSSLRPATH%%|${OPENSSLRPATH}|g; \
 		/install_docdir/d' \
 		${WRKSRC}/cpp/config/Make.rules
+	@${REINPLACE_CMD} 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g;' \
+		${WRKSRC}/cpp/test/IceSSL/configuration/run.py
 	@${REINPLACE_CMD} '/install_configdir/d' \
 		${WRKSRC}/cpp/config/Make.rules
 	@${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/; \
-		s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; ' \
+		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_CMD%%|${PYTHON_CMD}|g; \
 		s|%%PYTHON_SITELIBDIR%%|${STAGEDIR}${PYSITEDIR}|g; \
-		s|%%PREFIX%%|${PREFIX}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/python/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
+		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