From owner-svn-ports-head@freebsd.org  Tue Nov 15 19:34:42 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 BA230C43F77;
 Tue, 15 Nov 2016 19:34:42 +0000 (UTC)
 (envelope-from demon@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 81052161B;
 Tue, 15 Nov 2016 19:34:42 +0000 (UTC)
 (envelope-from demon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAFJYfdR021110;
 Tue, 15 Nov 2016 19:34:41 GMT (envelope-from demon@FreeBSD.org)
Received: (from demon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAFJYfIp021108;
 Tue, 15 Nov 2016 19:34:41 GMT (envelope-from demon@FreeBSD.org)
Message-Id: <201611151934.uAFJYfIp021108@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: demon set sender to
 demon@FreeBSD.org using -f
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Tue, 15 Nov 2016 19:34:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r426177 - head/net/haproxy-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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Nov 2016 19:34:42 -0000

Author: demon
Date: Tue Nov 15 19:34:41 2016
New Revision: 426177
URL: https://svnweb.freebsd.org/changeset/ports/426177

Log:
  Stricter check for FreeBSD version when openssl was updated to 1.0 (thanks danfe)
  Fix plist; Mark BROKEN if libressl is detected (thanks jhale)

Modified:
  head/net/haproxy-devel/Makefile
  head/net/haproxy-devel/pkg-plist

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Tue Nov 15 15:59:02 2016	(r426176)
+++ head/net/haproxy-devel/Makefile	Tue Nov 15 19:34:41 2016	(r426177)
@@ -62,9 +62,12 @@ IGNORE?=	enable PCRE support to use Devi
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 MAKE_ARGS+=	USE_OPENSSL=1
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000015
 WITH_OPENSSL_PORT=	yes
 .endif
+.if ${SSL_DEFAULT:Mlibressl*}
+BROKEN= does not build with libressl
+.endif
 .endif
 
 .if ${PORT_OPTIONS:MLUA}

Modified: head/net/haproxy-devel/pkg-plist
==============================================================================
--- head/net/haproxy-devel/pkg-plist	Tue Nov 15 15:59:02 2016	(r426176)
+++ head/net/haproxy-devel/pkg-plist	Tue Nov 15 19:34:41 2016	(r426177)
@@ -1,6 +1,10 @@
 man/man1/haproxy.1.gz
 sbin/halog
 sbin/haproxy
+%%PORTDOCS%%%%DOCSDIR%%/51Degrees-device-detection.txt
+%%PORTDOCS%%%%DOCSDIR%%/DeviceAtlas-device-detection.txt
+%%PORTDOCS%%%%DOCSDIR%%/SPOE.txt
+%%PORTDOCS%%%%DOCSDIR%%/WURFL-device-detection.txt
 %%PORTDOCS%%%%DOCSDIR%%/acl.fig
 %%PORTDOCS%%%%DOCSDIR%%/architecture.txt
 %%PORTDOCS%%%%DOCSDIR%%/close-options.txt
@@ -94,3 +98,4 @@ sbin/haproxy
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats_haproxy.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wurfl-example.cfg