From owner-svn-ports-head@freebsd.org  Fri Oct 23 20:28:39 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 52279A1D4E8;
 Fri, 23 Oct 2015 20:28:39 +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 14C71E83;
 Fri, 23 Oct 2015 20:28:39 +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 t9NKScMv004275;
 Fri, 23 Oct 2015 20:28:38 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9NKScXO004273;
 Fri, 23 Oct 2015 20:28:38 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201510232028.t9NKScXO004273@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: Fri, 23 Oct 2015 20:28:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r400057 - head/textproc/ibus-m17n
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Oct 2015 20:28:39 -0000

Author: amdmi3
Date: Fri Oct 23 20:28:37 2015
New Revision: 400057
URL: https://svnweb.freebsd.org/changeset/ports/400057

Log:
  - Add LICENSE
  - Switch to options helpers
  - Drop @dirrm* from plist
  
  Approved by:	portmgr blanket

Modified:
  head/textproc/ibus-m17n/Makefile
  head/textproc/ibus-m17n/pkg-plist

Modified: head/textproc/ibus-m17n/Makefile
==============================================================================
--- head/textproc/ibus-m17n/Makefile	Fri Oct 23 20:25:05 2015	(r400056)
+++ head/textproc/ibus-m17n/Makefile	Fri Oct 23 20:28:37 2015	(r400057)
@@ -10,6 +10,9 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	The m17n IMEngine for IBus framework
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus \
 		libm17n.so:${PORTSDIR}/devel/m17n-lib
 RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus
@@ -20,16 +23,9 @@ USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	NLS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+OPTIONS_SUB=	yes
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/m17n|$${pkgdatadir}|g' \

Modified: head/textproc/ibus-m17n/pkg-plist
==============================================================================
--- head/textproc/ibus-m17n/pkg-plist	Fri Oct 23 20:25:05 2015	(r400056)
+++ head/textproc/ibus-m17n/pkg-plist	Fri Oct 23 20:28:37 2015	(r400057)
@@ -5,6 +5,3 @@ share/ibus/component/m17n.xml
 %%DATADIR%%/setup/default.xml
 %%DATADIR%%/setup/ibus-m17n-preferences.ui
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus-m17n.mo
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/setup
-@dirrm %%DATADIR%%