From owner-svn-ports-all@FreeBSD.ORG  Thu Jan  1 16:10:49 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9972A1AC;
 Thu,  1 Jan 2015 16:10:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 85BE6169;
 Thu,  1 Jan 2015 16:10:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t01GAnlm006405;
 Thu, 1 Jan 2015 16:10:49 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t01GAn3h006404;
 Thu, 1 Jan 2015 16:10:49 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201501011610.t01GAn3h006404@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Thu, 1 Jan 2015 16:10:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r375948 - head/www/nghttp2
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jan 2015 16:10:49 -0000

Author: sunpoet
Date: Thu Jan  1 16:10:48 2015
New Revision: 375948
URL: https://svnweb.freebsd.org/changeset/ports/375948
QAT: https://qat.redports.org/buildarchive/r375948/

Log:
  - Fix OSVERSION and WITH_OPENSSL_PORT check
  
  We have 4 cases:
  1. OSVERSION >= 1000000 and WITH_OPENSSL_PORT undefined
  2. OSVERSION >= 1000000 and WITH_OPENSSL_PORT defined
  3. OSVERSION < 1000000 and WITH_OPENSSL_PORT undefined
  4. OSVERSION < 1000000 and WITH_OPENSSL_PORT defined
  
  nghttp2 builds fine in first 2 cases, and it fails in last 2 cases. The
  ".elif defined(WITH_OPENSSL_PORT)" in r347801 matches case 2 and 4, therefore
  users of case 2 are affected. We simplify the check to OSVERSION only since
  there is no need to check OpenSSL version.
  
  Notified by:	Beeblebrox <zaphod@berentweb.com>

Modified:
  head/www/nghttp2/Makefile

Modified: head/www/nghttp2/Makefile
==============================================================================
--- head/www/nghttp2/Makefile	Thu Jan  1 16:10:12 2015	(r375947)
+++ head/www/nghttp2/Makefile	Thu Jan  1 16:10:48 2015	(r375948)
@@ -50,9 +50,7 @@ HPACK_LIB_DEPENDS=	libjansson.so:${PORTS
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 1000000 && !defined(WITH_OPENSSL_PORT)
-IGNORE=		nghttp2 requires OpenSSL 1.0.1+
-.elif defined(WITH_OPENSSL_PORT)
+.if ${OSVERSION} < 1000000
 BROKEN=		Does not build
 .endif