From owner-svn-ports-all@freebsd.org  Sat Feb 25 13:47:28 2017
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 4B9BDCEC839;
 Sat, 25 Feb 2017 13:47:28 +0000 (UTC)
 (envelope-from amdmi3@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 1895CA33;
 Sat, 25 Feb 2017 13:47:28 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1PDlRE3064316;
 Sat, 25 Feb 2017 13:47:27 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1PDlRoW064315;
 Sat, 25 Feb 2017 13:47:27 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201702251347.v1PDlRoW064315@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sat, 25 Feb 2017 13:47:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r434805 - head/textproc/wdiff
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.23
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, 25 Feb 2017 13:47:28 -0000

Author: amdmi3
Date: Sat Feb 25 13:47:26 2017
New Revision: 434805
URL: https://svnweb.freebsd.org/changeset/ports/434805

Log:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers

Modified:
  head/textproc/wdiff/Makefile

Modified: head/textproc/wdiff/Makefile
==============================================================================
--- head/textproc/wdiff/Makefile	Sat Feb 25 13:46:48 2017	(r434804)
+++ head/textproc/wdiff/Makefile	Sat Feb 25 13:47:26 2017	(r434805)
@@ -10,25 +10,19 @@ MASTER_SITES=	GNU
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display word differences between text files
 
-LICENSE=	GPLv3
-
-GNU_CONFIGURE=	yes
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		charsetfix makeinfo
-
-OPTIONS_DEFINE=	NLS
+GNU_CONFIGURE=	yes
 
 INFO=		wdiff
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CFLAGS+=	-I${LOCALBASE}/include
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_CFLAGS=		-isystem${LOCALBASE}/include
+NLS_USES=		gettext
 
 .include <bsd.port.mk>