From owner-svn-ports-all@FreeBSD.ORG  Fri Nov 15 10:08:04 2013
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 25D1E57C;
 Fri, 15 Nov 2013 10:08:04 +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 EFDEE2D3D;
 Fri, 15 Nov 2013 10:08:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAFA83rT052102;
 Fri, 15 Nov 2013 10:08:03 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAFA83YV052097;
 Fri, 15 Nov 2013 10:08:03 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201311151008.rAFA83YV052097@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Fri, 15 Nov 2013 10:08:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333833 - head/textproc/aspell
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.16
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: Fri, 15 Nov 2013 10:08:04 -0000

Author: sunpoet
Date: Fri Nov 15 10:08:03 2013
New Revision: 333833
URL: http://svnweb.freebsd.org/changeset/ports/333833

Log:
  - Convert to new options helper
  - Pet portlint: use a tab (not space) after a variable name

Modified:
  head/textproc/aspell/Makefile
  head/textproc/aspell/pkg-plist   (contents, props changed)

Modified: head/textproc/aspell/Makefile
==============================================================================
--- head/textproc/aspell/Makefile	Fri Nov 15 10:08:00 2013	(r333832)
+++ head/textproc/aspell/Makefile	Fri Nov 15 10:08:03 2013	(r333833)
@@ -14,6 +14,7 @@ COMMENT=	Spelling checker with better su
 LICENSE=	LGPL21
 
 OPTIONS_DEFINE=	NLS DOCS ISPELL
+OPTIONS_SUB=	yes
 
 ISPELL_DESC=	Install the ispell wrapper
 
@@ -33,22 +34,14 @@ PLIST_SUB=	VER=${VERINST}
 SUB_LIST=	VERINST=${VERINST}
 INFO=	aspell-dev aspell
 
-.include <bsd.port.options.mk>
+NLS_USES=		gettext
+NLS_CONFIGURE_ARGS=	--disable-nls
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MISPELL}
-CONFLICTS+=            ispell* ??-ispell*
-SCRIPTS=               ispell spell
-PLIST_SUB+=            SCRIPTS=""
-.else
-PLIST_SUB+=            SCRIPTS="@comment "
+CONFLICTS+=	ispell* ??-ispell*
+SCRIPTS=	ispell spell
 .endif
 
 # Does not link without at least -O

Modified: head/textproc/aspell/pkg-plist
==============================================================================
--- head/textproc/aspell/pkg-plist	Fri Nov 15 10:08:00 2013	(r333832)
+++ head/textproc/aspell/pkg-plist	Fri Nov 15 10:08:03 2013	(r333833)
@@ -1,13 +1,13 @@
 bin/aspell
 bin/aspell-import
-%%SCRIPTS%%bin/ispell
+%%ISPELL%%bin/ispell
 bin/precat
 bin/preunzip
 bin/prezip
 bin/prezip-bin
 bin/pspell-config
 bin/run-with-aspell
-%%SCRIPTS%%bin/spell
+%%ISPELL%%bin/spell
 bin/word-list-compress
 etc/aspell.ver
 include/aspell.h