summaryrefslogtreecommitdiff
path: root/textproc/aspell
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/aspell')
-rw-r--r--textproc/aspell/Makefile10
-rw-r--r--textproc/aspell/PLIST16
-rw-r--r--textproc/aspell/distinfo10
-rw-r--r--textproc/aspell/options.mk18
4 files changed, 12 insertions, 42 deletions
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index ea4b291e8b5..8f88c3ddd28 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2019/09/15 06:53:36 maya Exp $
-#
+# $NetBSD: Makefile,v 1.74 2019/10/19 10:43:28 nia Exp $
-DISTNAME= aspell-0.60.7
+DISTNAME= aspell-0.60.8
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU:=aspell/}
@@ -15,6 +14,7 @@ CONFLICTS= libpspell-[0-9]*
GNU_CONFIGURE= yes
USE_FEATURES= snprintf vsnprintf
USE_TOOLS+= gmake
+USE_TOOLS+= msgfmt msgmerge xgettext
# for bin/aspell-import
USE_TOOLS+= perl:run
USE_LIBTOOL= yes
@@ -27,6 +27,8 @@ CONFIGURE_ARGS+= --enable-doc-dir=${PREFIX}/share/doc/aspell
CONFIGURE_ARGS+= --enable-curses=${CURSES_TYPE}
CONFIGURE_ARGS+= --enable-pkgdatadir=${PREFIX}/share/aspell
CONFIGURE_ARGS+= --enable-dict-dir=${PREFIX}/lib/aspell
+# https://github.com/GNUAspell/aspell/issues/336
+CONFIGURE_ARGS+= --enable-compile-in-filters
CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes
.include "../../mk/bsd.prefs.mk"
@@ -43,8 +45,6 @@ CPPFLAGS+= -DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF
CPPFLAGS+= -DHAVE_OLD_SIGNAL
.endif
-.include "options.mk"
-
REPLACE_PERL= scripts/aspell-import
NOT_FOR_COMPILER= xlc
diff --git a/textproc/aspell/PLIST b/textproc/aspell/PLIST
index dd51167d6a3..e447847e854 100644
--- a/textproc/aspell/PLIST
+++ b/textproc/aspell/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/09/15 06:53:36 maya Exp $
+@comment $NetBSD: PLIST,v 1.18 2019/10/19 10:43:28 nia Exp $
bin/aspell
bin/aspell-import
bin/precat
@@ -14,19 +14,14 @@ info/aspell-dev.info
info/aspell.info
lib/aspell/ccpp.amf
lib/aspell/comment.amf
-${PLIST.filters}lib/aspell/context-filter.la
-${PLIST.filters}lib/aspell/email-filter.la
lib/aspell/email.amf
lib/aspell/html.amf
+lib/aspell/markdown.amf
lib/aspell/none.amf
-${PLIST.filters}lib/aspell/nroff-filter.la
lib/aspell/nroff.amf
lib/aspell/perl.amf
-${PLIST.filters}lib/aspell/sgml-filter.la
lib/aspell/sgml.amf
-${PLIST.filters}lib/aspell/tex-filter.la
lib/aspell/tex.amf
-${PLIST.filters}lib/aspell/texinfo-filter.la
lib/aspell/texinfo.amf
lib/aspell/url.amf
lib/libaspell.la
@@ -37,7 +32,6 @@ man/man1/prezip-bin.1
man/man1/pspell-config.1
man/man1/run-with-aspell.1
man/man1/word-list-compress.1
-${PLIST.filters}share/aspell/context-filter.info
share/aspell/cp1250.cmap
share/aspell/cp1250.cset
share/aspell/cp1251.cmap
@@ -57,8 +51,6 @@ share/aspell/cp1257.cset
share/aspell/cp1258.cmap
share/aspell/cp1258.cset
share/aspell/dvorak.kbd
-${PLIST.filters}share/aspell/email-filter.info
-${PLIST.filters}share/aspell/html-filter.info
share/aspell/iso-8859-1.cmap
share/aspell/iso-8859-1.cset
share/aspell/iso-8859-10.cmap
@@ -94,13 +86,9 @@ share/aspell/koi8-r.cmap
share/aspell/koi8-r.cset
share/aspell/koi8-u.cmap
share/aspell/koi8-u.cset
-${PLIST.filters}share/aspell/nroff-filter.info
-${PLIST.filters}share/aspell/sgml-filter.info
share/aspell/spell
share/aspell/split.kbd
share/aspell/standard.kbd
-${PLIST.filters}share/aspell/tex-filter.info
-${PLIST.filters}share/aspell/texinfo-filter.info
share/locale/ast/LC_MESSAGES/aspell.mo
share/locale/be/LC_MESSAGES/aspell.mo
share/locale/ca/LC_MESSAGES/aspell.mo
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index b7d3912993a..2a4f27a3f8a 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.30 2019/09/15 06:53:36 maya Exp $
+$NetBSD: distinfo,v 1.31 2019/10/19 10:43:28 nia Exp $
-SHA1 (aspell-0.60.7.tar.gz) = 80ef99a68e7e672f0eb06fac844387494e594948
-RMD160 (aspell-0.60.7.tar.gz) = 9463ce8f8f5db73e403cc8ee4ea9f4c66fb1ed25
-SHA512 (aspell-0.60.7.tar.gz) = 6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535
-Size (aspell-0.60.7.tar.gz) = 2071890 bytes
+SHA1 (aspell-0.60.8.tar.gz) = ae554df297aee676b4d16f261fa5c60e285478f6
+RMD160 (aspell-0.60.8.tar.gz) = 331a10149aa4efe9b6798137d6a56a0a44fcf570
+SHA512 (aspell-0.60.8.tar.gz) = 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
+Size (aspell-0.60.8.tar.gz) = 3486448 bytes
SHA1 (patch-ab) = 615a676128dab7d79e697f56330c8aaa6c901d3f
SHA1 (patch-ac) = e748877b22ca116454155d3659c16efaf02e7963
SHA1 (patch-ad) = 5e525ed1e91b3271567f4255729e94159be86f58
diff --git a/textproc/aspell/options.mk b/textproc/aspell/options.mk
deleted file mode 100644
index b647d607cca..00000000000
--- a/textproc/aspell/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2008/04/29 11:40:50 wiz Exp $
-
-# Loadable filter currently don't work on NetBSD, see
-# https://sourceforge.net/tracker/?func=detail&atid=100245&aid=1336865&group_id=245
-# Disable dynamic loading of filters until it is fixed.
-PKG_OPTIONS_VAR= PKG_OPTIONS.aspell
-PKG_SUPPORTED_OPTIONS= # none
-#PKG_SUPPORTED_OPTIONS= aspell-loadable-filters
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= filters
-.if !empty(PKG_OPTIONS:Maspell-loadable-filters)
-CONFIGURE_ARGS+= --disable-compile-in-filters
-PLIST.filters= yes
-.else
-CONFIGURE_ARGS+= --enable-compile-in-filters
-.endif