From owner-svn-ports-all@FreeBSD.ORG  Sun Oct 21 14:37:45 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5741DF8E;
 Sun, 21 Oct 2012 14:37:45 +0000 (UTC)
 (envelope-from demon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 3EF378FC12;
 Sun, 21 Oct 2012 14:37:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9LEbjlJ096347;
 Sun, 21 Oct 2012 14:37:45 GMT (envelope-from demon@svn.freebsd.org)
Received: (from demon@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9LEbipx096345;
 Sun, 21 Oct 2012 14:37:44 GMT (envelope-from demon@svn.freebsd.org)
Message-Id: <201210211437.q9LEbipx096345@svn.freebsd.org>
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Sun, 21 Oct 2012 14:37:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306238 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
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: Sun, 21 Oct 2012 14:37:45 -0000

Author: demon
Date: Sun Oct 21 14:37:44 2012
New Revision: 306238
URL: http://svn.freebsd.org/changeset/ports/306238

Log:
  Make OpenSSL support optional + minor Makefile nits.
  
  PR:     172897
  Submitted by:   Kubilay Kocak <koobs.freebsd@gmail.com>
  Feature safe:	yes

Modified:
  head/net/haproxy-devel/Makefile

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Sun Oct 21 14:12:26 2012	(r306237)
+++ head/net/haproxy-devel/Makefile	Sun Oct 21 14:37:44 2012	(r306238)
@@ -23,17 +23,17 @@ USE_GMAKE=	YES
 SUB_FILES=	pkg-message
 MAN1=		haproxy.1
 
-OPTIONS_DEFINE=		PCRE
+OPTIONS_DEFINE=		PCRE OPENSSL
 OPTIONS_SINGLE=		PCRE
 OPTIONS_SINGLE_PCRE=	DPCRE SPCRE
-DPCRE_DESC=	Link dynamically
-SPCRE_DESC=	Link statically
-OPTIONS_DEFAULT=PCRE DPCRE
+DPCRE_DESC=		Link dynamically
+SPCRE_DESC=		Link statically
+OPTIONS_DEFAULT=	PCRE DPCRE OPENSSL
 
 .include <bsd.port.options.mk>
 
 MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
-		USE_OPENSSL=1 CC="${CC}" CFLAGS="${CFLAGS}"
+		CC="${CC}" CFLAGS="${CFLAGS}"
 
 .if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
@@ -46,6 +46,11 @@ MAKE_ARGS+=	"USE_STATIC_PCRE=1"
 .endif
 .endif
 
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL=	yes
+MAKE_ARGS+=	USE_OPENSSL=1
+.endif
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin/
 	@${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${MAN1PREFIX}/man/man1