svn commit: r333833 - head/textproc/aspell

[Sunpoet Po-Chuan Hsieh]

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