Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Oct 2012 14:37:44 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306238 - head/net/haproxy-devel
Message-ID:  <201210211437.q9LEbipx096345@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210211437.q9LEbipx096345>