From owner-svn-ports-all@freebsd.org  Sat Mar 19 10:59:48 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 A2504AD5347;
 Sat, 19 Mar 2016 10:59:48 +0000 (UTC)
 (envelope-from dinoex@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 62710E64;
 Sat, 19 Mar 2016 10:59:48 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2JAxlCT038860;
 Sat, 19 Mar 2016 10:59:47 GMT (envelope-from dinoex@FreeBSD.org)
Received: (from dinoex@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2JAxlfU038859;
 Sat, 19 Mar 2016 10:59:47 GMT (envelope-from dinoex@FreeBSD.org)
Message-Id: <201603191059.u2JAxlfU038859@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dinoex set sender to
 dinoex@FreeBSD.org using -f
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sat, 19 Mar 2016 10:59:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r411389 - head/net-im/licq
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.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Mar 2016 10:59:48 -0000

Author: dinoex
Date: Sat Mar 19 10:59:47 2016
New Revision: 411389
URL: https://svnweb.freebsd.org/changeset/ports/411389

Log:
  - remove option to disable OpenSSL
  - add option for gpgme support
  - cleanup option NLS
  PR:		207713

Modified:
  head/net-im/licq/Makefile

Modified: head/net-im/licq/Makefile
==============================================================================
--- head/net-im/licq/Makefile	Sat Mar 19 10:43:47 2016	(r411388)
+++ head/net-im/licq/Makefile	Sat Mar 19 10:59:47 2016	(r411389)
@@ -3,7 +3,7 @@
 
 PORTNAME=	base
 PORTVERSION=	${LICQ_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 PKGNAMESUFFIX=	${SOCKS_SUFFIX}${PKGNAMESUFFIX2}
 
@@ -15,29 +15,28 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
 
 USES=		cmake iconv
+USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 LICQ_PORT?=	net-im/licq
 
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-DGTEST_USE_OWN_TR1_TUPLE
 
-OPTIONS_DEFINE=	NLS OPENSSL
-OPTIONS_DEFAULT=OPENSSL
-
-OPENSSL_USE=	OPENSSL=yes
+OPTIONS_DEFINE=	NLS GPGME
+OPTIONS_DEFAULT=NLS GPGME
+OPTIONS_SUB=yes
+GPGME_DESC=	Build support for gpgme
+NLS_USES=	gettext
+NLS_CMAKE_OFF=	-DENABLE_NLS:BOOL=OFF
+
+GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
+			libassuan.so:${PORTSDIR}/security/libassuan \
+			libgpg-error.so:${PORTSDIR}/security/libgpg-error
 
 .include <bsd.port.options.mk>
 
 .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CMAKE_ARGS+=	-DENABLE_NLS:BOOL=OFF
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} -e 's=!/bin/bash=!${LOCALBASE}/bin/bash=' \
 		${WRKSRC}/bin/sidclean.sh