From owner-svn-ports-all@freebsd.org Sat Sep 10 19:37:14 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A56ADBD52CB; Sat, 10 Sep 2016 19:37:14 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 695A6D99; Sat, 10 Sep 2016 19:37:14 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AJbDvW086790; Sat, 10 Sep 2016 19:37:13 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AJbDTG086788; Sat, 10 Sep 2016 19:37:13 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609101937.u8AJbDTG086788@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 10 Sep 2016 19:37:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421731 - in head/mail: archiveopteryx archiveopteryx-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 19:37:14 -0000 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 # 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 # 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}