From owner-svn-ports-all@FreeBSD.ORG  Thu Jan 30 15:31:46 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BC8242BB;
 Thu, 30 Jan 2014 15:31:46 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A77B61764;
 Thu, 30 Jan 2014 15:31:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0UFVkb0004163;
 Thu, 30 Jan 2014 15:31:46 GMT (envelope-from decke@svn.freebsd.org)
Received: (from decke@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0UFVkG3004162;
 Thu, 30 Jan 2014 15:31:46 GMT (envelope-from decke@svn.freebsd.org)
Message-Id: <201401301531.s0UFVkG3004162@svn.freebsd.org>
From: Bernhard Froehlich <decke@FreeBSD.org>
Date: Thu, 30 Jan 2014 15:31:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341847 - head/www/libmicrohttpd
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.17
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, 30 Jan 2014 15:31:46 -0000

Author: decke
Date: Thu Jan 30 15:31:46 2014
New Revision: 341847
URL: http://svnweb.freebsd.org/changeset/ports/341847
QAT: https://qat.redports.org/buildarchive/r341847/

Log:
  - Fix handling of GNUTLS support
  
  PR:		ports/185950
  Submitted by:	Claus Endres <claus@endresconsulting.com>
  Approved by:	Hung-Yi Chen <gaod@hychen.org> (maintainer)

Modified:
  head/www/libmicrohttpd/Makefile

Modified: head/www/libmicrohttpd/Makefile
==============================================================================
--- head/www/libmicrohttpd/Makefile	Thu Jan 30 15:30:13 2014	(r341846)
+++ head/www/libmicrohttpd/Makefile	Thu Jan 30 15:31:46 2014	(r341847)
@@ -17,9 +17,13 @@ GNU_CONFIGURE=	yes
 MAKE_ARGS+=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
 USE_LDCONFIG=	yes
 
-GNUTLS_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGNUTLS}
+LIB_DEPENDS+=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 			libgnutls.so:${PORTSDIR}/security/gnutls
-GNUTLS_CONFIGURE_ARGS=	--with-gnutls=${LOCALBASE} --enable-https
+CONFIGURE_ARGS+=	--with-libgcrypt-prefix=${LOCALBASE} --with-gnutls=${LOCALBASE} --enable-https=yes
+.endif
 
 INFO=		libmicrohttpd libmicrohttpd-tutorial