svn commit: r421731 - in head/mail: archiveopteryx archiveopteryx-devel

[John Marino]

Author: marino
Date: Sat Sep 10 19:37:13 2016
New Revision: 421731
URL: https://svnweb.freebsd.org/changeset/ports/421731

Log:
  mail/archiveopteryx(-devel): document SSL requirement, sed in related flags
  
  While here, couple OSVERSION with OPSYS
  
  Approved by:	SSL blanket

Modified:
  head/mail/archiveopteryx-devel/Makefile
  head/mail/archiveopteryx/Makefile

Modified: head/mail/archiveopteryx-devel/Makefile
==============================================================================
--- head/mail/archiveopteryx-devel/Makefile	Sat Sep 10 19:23:23 2016	(r421730)
+++ head/mail/archiveopteryx-devel/Makefile	Sat Sep 10 19:37:13 2016	(r421731)
@@ -21,8 +21,7 @@ GH_ACCOUNT=	aox
 GH_PROJECT=	aox
 GH_TAGNAME=	e10c73a
 
-USES=		perl5 tar:bzip2 pgsql:9.1+
-USE_OPENSSL=	yes
+USES=		perl5 pgsql:9.1+ ssl tar:bzip2
 USE_PERL5=	build
 
 PORTDOCS=	COPYING README license.txt
@@ -43,14 +42,18 @@ JAM?=		${LOCALBASE}/bin/jam
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD 10+
-.if ${OSVERSION} >= 1000000
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 JAMARG=	"-sCLANG=1"
 .endif
 
 post-patch:
 	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
 		-e 's,%%PREFIX%%,${PREFIX},g'
-	${REINPLACE_CMD} "s|INSTALLROOT ?= \"\" ;|INSTALLROOT = \"${STAGEDIR}\" ;|" ${WRKSRC}/Jamsettings
+	${REINPLACE_CMD} -e "s|\(C++FLAGS =\)|\1 -I${OPENSSLINC}|g" \
+		-e"s|INSTALLROOT ?= \"\" ;|INSTALLROOT = \"${STAGEDIR}\" ;|" \
+		${WRKSRC}/Jamsettings
+	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
+		${WRKSRC}/server/Jamfile
 
 do-build:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG}

Modified: head/mail/archiveopteryx/Makefile
==============================================================================
--- head/mail/archiveopteryx/Makefile	Sat Sep 10 19:23:23 2016	(r421730)
+++ head/mail/archiveopteryx/Makefile	Sat Sep 10 19:37:13 2016	(r421731)
@@ -16,8 +16,7 @@ BROKEN_powerpc64=	Does not build
 
 BUILD_DEPENDS=	jam:devel/jam
 
-USES=		perl5 tar:bzip2 pgsql:9.1+
-USE_OPENSSL=	yes
+USES=		perl5 pgsql:9.1+ ssl tar:bzip2
 USE_PERL5=	build
 
 PORTDOCS=	COPYING README bsd.txt
@@ -36,14 +35,18 @@ JAM?=		${LOCALBASE}/bin/jam
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD 10+
-.if ${OSVERSION} >= 1000000
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 JAMARG=	"-sCLANG=1"
 .endif
 
 post-patch:
 	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
 		-e 's,%%PREFIX%%,${PREFIX},g'
-	${REINPLACE_CMD} "s|INSTALLROOT ?= \"\" ;|INSTALLROOT = \"${STAGEDIR}\" ;|" ${WRKSRC}/Jamsettings
+	${REINPLACE_CMD} -e "s|\(C++FLAGS =\)|\1 -I${OPENSSLINC}|g" \
+		-e"s|INSTALLROOT ?= \"\" ;|INSTALLROOT = \"${STAGEDIR}\" ;|" \
+		${WRKSRC}/Jamsettings
+	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
+		${WRKSRC}/server/Jamfile
 
 do-build:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG}