From owner-svn-ports-branches@freebsd.org  Thu Mar 10 15:09:18 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@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 7E150ACB285;
 Thu, 10 Mar 2016 15:09:18 +0000 (UTC)
 (envelope-from feld@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 4F790E3D;
 Thu, 10 Mar 2016 15:09:18 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2AF9HS5093024;
 Thu, 10 Mar 2016 15:09:17 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2AF9HJA093023;
 Thu, 10 Mar 2016 15:09:17 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201603101509.u2AF9HJA093023@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 10 Mar 2016 15:09:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r410759 - branches/2016Q1/security/pidgin-otr
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Mar 2016 15:09:18 -0000

Author: feld
Date: Thu Mar 10 15:09:17 2016
New Revision: 410759
URL: https://svnweb.freebsd.org/changeset/ports/410759

Log:
  MFH: r409519
  
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Fix build with disabled NLS
  
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2016Q1/security/pidgin-otr/Makefile
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/security/pidgin-otr/Makefile
==============================================================================
--- branches/2016Q1/security/pidgin-otr/Makefile	Thu Mar 10 15:08:28 2016	(r410758)
+++ branches/2016Q1/security/pidgin-otr/Makefile	Thu Mar 10 15:09:17 2016	(r410759)
@@ -10,7 +10,8 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows deniable private conversations using Pidgin
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # only
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 # explicitly use libotr.so.5 (see ports/186944)
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
@@ -19,10 +20,6 @@ LIB_DEPENDS=	libotr.so.5:${PORTSDIR}/sec
 		libpurple.so:${PORTSDIR}/net-im/libpurple
 
 USES=		cpe gmake libtool pkgconfig
-OPTIONS_DEFINE=	NLS
-NLS_USES=	gettext
-OPTIONS_SUB=	yes
-
 CPE_VENDOR=	cypherpunks
 CPE_PRODUCT=	${PKGNAMEPREFIX}${PORTNAME}
 USE_GNOME=	gtk20 intltool
@@ -34,6 +31,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib \
 		--with-libotr-inc-prefix=${LOCALBASE}/include
 
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
+NLS_USES_OFF=	gettext-tools
+
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000036 && ${ARCH} == i386