aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING15
-rw-r--r--french/aspell/Makefile13
-rw-r--r--french/aspell/distinfo3
-rw-r--r--french/aspell/pkg-descr2
-rw-r--r--french/aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.fr)0
-rw-r--r--german/Makefile1
-rw-r--r--german/alt-aspell/Makefile18
-rw-r--r--german/alt-aspell/distinfo3
-rw-r--r--german/alt-aspell/pkg-descr1
-rw-r--r--german/alt-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.de)0
-rw-r--r--german/aspell/Makefile12
-rw-r--r--german/aspell/distinfo3
-rw-r--r--german/aspell/pkg-descr2
-rw-r--r--german/aspell/pkg-plist14
-rw-r--r--hebrew/aspell/Makefile12
-rw-r--r--hebrew/aspell/distinfo3
-rw-r--r--hebrew/aspell/pkg-descr2
-rw-r--r--hebrew/aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.he)0
-rw-r--r--hungarian/aspell/Makefile12
-rw-r--r--hungarian/aspell/distinfo3
-rw-r--r--hungarian/aspell/pkg-descr2
-rw-r--r--hungarian/aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.hu)0
-rw-r--r--polish/aspell/Makefile13
-rw-r--r--polish/aspell/distinfo3
-rw-r--r--polish/aspell/pkg-descr2
-rw-r--r--polish/aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.pl)0
-rw-r--r--portuguese/aspell-pt_PT/Makefile13
-rw-r--r--portuguese/aspell-pt_PT/distinfo3
-rw-r--r--portuguese/aspell-pt_PT/pkg-descr2
-rw-r--r--portuguese/aspell-pt_PT/pkg-plist (renamed from textproc/aspell/pkg-plist.pt)0
-rw-r--r--portuguese/aspell/Makefile13
-rw-r--r--portuguese/aspell/distinfo3
-rw-r--r--portuguese/aspell/pkg-descr2
-rw-r--r--portuguese/aspell/pkg-plist10
-rw-r--r--russian/aspell/Makefile12
-rw-r--r--russian/aspell/distinfo3
-rw-r--r--russian/aspell/pkg-descr2
-rw-r--r--russian/aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.ru)0
-rw-r--r--textproc/Makefile2
-rw-r--r--textproc/af-aspell/Makefile14
-rw-r--r--textproc/af-aspell/distinfo3
-rw-r--r--textproc/af-aspell/pkg-descr2
-rw-r--r--textproc/af-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.af)0
-rw-r--r--textproc/am-aspell/Makefile13
-rw-r--r--textproc/am-aspell/distinfo3
-rw-r--r--textproc/am-aspell/pkg-descr2
-rw-r--r--textproc/am-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.am)0
-rw-r--r--textproc/aspell-without-dicten/Makefile12
-rw-r--r--textproc/aspell/Makefile218
-rw-r--r--textproc/aspell/Makefile.inc23
-rw-r--r--textproc/aspell/distinfo231
-rw-r--r--textproc/aspell/files/aspell.ver.in3
-rw-r--r--textproc/aspell/files/verdict78
-rw-r--r--textproc/aspell/pkg-plist1
-rw-r--r--textproc/aspell/pkg-plist.de-alt7
-rw-r--r--textproc/az-aspell/Makefile13
-rw-r--r--textproc/az-aspell/distinfo3
-rw-r--r--textproc/az-aspell/pkg-descr2
-rw-r--r--textproc/az-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.az)0
-rw-r--r--textproc/be-aspell/Makefile13
-rw-r--r--textproc/be-aspell/distinfo3
-rw-r--r--textproc/be-aspell/pkg-descr2
-rw-r--r--textproc/be-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.be)0
-rw-r--r--textproc/bg-aspell/Makefile13
-rw-r--r--textproc/bg-aspell/distinfo3
-rw-r--r--textproc/bg-aspell/pkg-descr2
-rw-r--r--textproc/bg-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.bg)0
-rw-r--r--textproc/bn-aspell/Makefile13
-rw-r--r--textproc/bn-aspell/distinfo3
-rw-r--r--textproc/bn-aspell/pkg-descr2
-rw-r--r--textproc/bn-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.bn)0
-rw-r--r--textproc/br-aspell/Makefile14
-rw-r--r--textproc/br-aspell/distinfo3
-rw-r--r--textproc/br-aspell/pkg-descr2
-rw-r--r--textproc/br-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.br)0
-rw-r--r--textproc/ca-aspell/Makefile13
-rw-r--r--textproc/ca-aspell/distinfo3
-rw-r--r--textproc/ca-aspell/pkg-descr2
-rw-r--r--textproc/ca-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.ca)0
-rw-r--r--textproc/cs-aspell/Makefile14
-rw-r--r--textproc/cs-aspell/distinfo3
-rw-r--r--textproc/cs-aspell/pkg-descr2
-rw-r--r--textproc/cs-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.cs)0
-rw-r--r--textproc/csb-aspell/Makefile13
-rw-r--r--textproc/csb-aspell/distinfo3
-rw-r--r--textproc/csb-aspell/pkg-descr2
-rw-r--r--textproc/csb-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.csb)0
-rw-r--r--textproc/cy-aspell/Makefile14
-rw-r--r--textproc/cy-aspell/distinfo3
-rw-r--r--textproc/cy-aspell/pkg-descr2
-rw-r--r--textproc/cy-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.cy)0
-rw-r--r--textproc/da-aspell/Makefile13
-rw-r--r--textproc/da-aspell/distinfo3
-rw-r--r--textproc/da-aspell/pkg-descr2
-rw-r--r--textproc/da-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.da)0
-rw-r--r--textproc/el-aspell/Makefile14
-rw-r--r--textproc/el-aspell/distinfo3
-rw-r--r--textproc/el-aspell/pkg-descr2
-rw-r--r--textproc/el-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.el)0
-rw-r--r--textproc/en-aspell/Makefile18
-rw-r--r--textproc/en-aspell/distinfo3
-rw-r--r--textproc/en-aspell/pkg-descr7
-rw-r--r--textproc/en-aspell/pkg-plist57
-rw-r--r--textproc/eo-aspell/Makefile14
-rw-r--r--textproc/eo-aspell/distinfo3
-rw-r--r--textproc/eo-aspell/pkg-descr2
-rw-r--r--textproc/eo-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.eo)0
-rw-r--r--textproc/es-aspell/Makefile14
-rw-r--r--textproc/es-aspell/distinfo3
-rw-r--r--textproc/es-aspell/pkg-descr2
-rw-r--r--textproc/es-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.es)0
-rw-r--r--textproc/et-aspell/Makefile13
-rw-r--r--textproc/et-aspell/distinfo3
-rw-r--r--textproc/et-aspell/pkg-descr2
-rw-r--r--textproc/et-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.et)0
-rw-r--r--textproc/fa-aspell/Makefile13
-rw-r--r--textproc/fa-aspell/distinfo3
-rw-r--r--textproc/fa-aspell/pkg-descr2
-rw-r--r--textproc/fa-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.fa)0
-rw-r--r--textproc/fi-aspell/Makefile13
-rw-r--r--textproc/fi-aspell/distinfo3
-rw-r--r--textproc/fi-aspell/pkg-descr2
-rw-r--r--textproc/fi-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.fi)0
-rw-r--r--textproc/fo-aspell/Makefile13
-rw-r--r--textproc/fo-aspell/distinfo3
-rw-r--r--textproc/fo-aspell/pkg-descr2
-rw-r--r--textproc/fo-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.fo)0
-rw-r--r--textproc/ga-aspell/Makefile13
-rw-r--r--textproc/ga-aspell/distinfo3
-rw-r--r--textproc/ga-aspell/pkg-descr2
-rw-r--r--textproc/ga-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.ga)0
-rw-r--r--textproc/gd-aspell/Makefile13
-rw-r--r--textproc/gd-aspell/distinfo3
-rw-r--r--textproc/gd-aspell/pkg-descr2
-rw-r--r--textproc/gd-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.gd)0
-rw-r--r--textproc/gl-aspell/Makefile14
-rw-r--r--textproc/gl-aspell/distinfo3
-rw-r--r--textproc/gl-aspell/pkg-descr2
-rw-r--r--textproc/gl-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.gl)0
-rw-r--r--textproc/gu-aspell/Makefile13
-rw-r--r--textproc/gu-aspell/distinfo3
-rw-r--r--textproc/gu-aspell/pkg-descr2
-rw-r--r--textproc/gu-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.gu)0
-rw-r--r--textproc/gv-aspell/Makefile14
-rw-r--r--textproc/gv-aspell/distinfo3
-rw-r--r--textproc/gv-aspell/pkg-descr2
-rw-r--r--textproc/gv-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.gv)0
-rw-r--r--textproc/hi-aspell/Makefile13
-rw-r--r--textproc/hi-aspell/distinfo3
-rw-r--r--textproc/hi-aspell/pkg-descr2
-rw-r--r--textproc/hi-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.hi)0
-rw-r--r--textproc/hil-aspell/Makefile13
-rw-r--r--textproc/hil-aspell/distinfo3
-rw-r--r--textproc/hil-aspell/pkg-descr2
-rw-r--r--textproc/hil-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.hil)0
-rw-r--r--textproc/hr-aspell/Makefile14
-rw-r--r--textproc/hr-aspell/distinfo3
-rw-r--r--textproc/hr-aspell/pkg-descr2
-rw-r--r--textproc/hr-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.hr)0
-rw-r--r--textproc/hsb-aspell/Makefile13
-rw-r--r--textproc/hsb-aspell/distinfo3
-rw-r--r--textproc/hsb-aspell/pkg-descr2
-rw-r--r--textproc/hsb-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.hsb)0
-rw-r--r--textproc/ia-aspell/Makefile14
-rw-r--r--textproc/ia-aspell/distinfo3
-rw-r--r--textproc/ia-aspell/pkg-descr2
-rw-r--r--textproc/ia-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.ia)0
-rw-r--r--textproc/id-aspell/Makefile13
-rw-r--r--textproc/id-aspell/distinfo3
-rw-r--r--textproc/id-aspell/pkg-descr2
-rw-r--r--textproc/id-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.id)0
-rw-r--r--textproc/is-aspell/Makefile14
-rw-r--r--textproc/is-aspell/distinfo3
-rw-r--r--textproc/is-aspell/pkg-descr2
-rw-r--r--textproc/is-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.is)0
-rw-r--r--textproc/it-aspell/Makefile13
-rw-r--r--textproc/it-aspell/distinfo3
-rw-r--r--textproc/it-aspell/pkg-descr2
-rw-r--r--textproc/it-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.it)0
-rw-r--r--textproc/la-aspell/Makefile13
-rw-r--r--textproc/la-aspell/distinfo3
-rw-r--r--textproc/la-aspell/pkg-descr2
-rw-r--r--textproc/la-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.la)0
-rw-r--r--textproc/lt-aspell/Makefile13
-rw-r--r--textproc/lt-aspell/distinfo3
-rw-r--r--textproc/lt-aspell/pkg-descr2
-rw-r--r--textproc/lt-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.lt)0
-rw-r--r--textproc/lv-aspell/Makefile13
-rw-r--r--textproc/lv-aspell/distinfo3
-rw-r--r--textproc/lv-aspell/pkg-descr2
-rw-r--r--textproc/lv-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.lv)0
-rw-r--r--textproc/mi-aspell/Makefile14
-rw-r--r--textproc/mi-aspell/distinfo3
-rw-r--r--textproc/mi-aspell/pkg-descr2
-rw-r--r--textproc/mi-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.mi)0
-rw-r--r--textproc/mk-aspell/Makefile14
-rw-r--r--textproc/mk-aspell/distinfo3
-rw-r--r--textproc/mk-aspell/pkg-descr2
-rw-r--r--textproc/mk-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.mk)0
-rw-r--r--textproc/mn-aspell/Makefile13
-rw-r--r--textproc/mn-aspell/distinfo3
-rw-r--r--textproc/mn-aspell/pkg-descr2
-rw-r--r--textproc/mn-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.mn)0
-rw-r--r--textproc/mr-aspell/Makefile13
-rw-r--r--textproc/mr-aspell/distinfo3
-rw-r--r--textproc/mr-aspell/pkg-descr2
-rw-r--r--textproc/mr-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.mr)0
-rw-r--r--textproc/ms-aspell/Makefile14
-rw-r--r--textproc/ms-aspell/distinfo3
-rw-r--r--textproc/ms-aspell/pkg-descr2
-rw-r--r--textproc/ms-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.ms)0
-rw-r--r--textproc/mt-aspell/Makefile14
-rw-r--r--textproc/mt-aspell/distinfo3
-rw-r--r--textproc/mt-aspell/pkg-descr2
-rw-r--r--textproc/mt-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.mt)0
-rw-r--r--textproc/nb-aspell/Makefile14
-rw-r--r--textproc/nb-aspell/distinfo3
-rw-r--r--textproc/nb-aspell/pkg-descr2
-rw-r--r--textproc/nb-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.nb)0
-rw-r--r--textproc/nds-aspell/Makefile13
-rw-r--r--textproc/nds-aspell/distinfo3
-rw-r--r--textproc/nds-aspell/pkg-descr2
-rw-r--r--textproc/nds-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.nds)0
-rw-r--r--textproc/nl-aspell/Makefile14
-rw-r--r--textproc/nl-aspell/distinfo3
-rw-r--r--textproc/nl-aspell/pkg-descr2
-rw-r--r--textproc/nl-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.nl)0
-rw-r--r--textproc/nn-aspell/Makefile14
-rw-r--r--textproc/nn-aspell/distinfo3
-rw-r--r--textproc/nn-aspell/pkg-descr2
-rw-r--r--textproc/nn-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.nn)0
-rw-r--r--textproc/ny-aspell/Makefile13
-rw-r--r--textproc/ny-aspell/distinfo3
-rw-r--r--textproc/ny-aspell/pkg-descr2
-rw-r--r--textproc/ny-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.ny)0
-rw-r--r--textproc/or-aspell/Makefile13
-rw-r--r--textproc/or-aspell/distinfo3
-rw-r--r--textproc/or-aspell/pkg-descr2
-rw-r--r--textproc/or-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.or)0
-rw-r--r--textproc/pa-aspell/Makefile13
-rw-r--r--textproc/pa-aspell/distinfo3
-rw-r--r--textproc/pa-aspell/pkg-descr2
-rw-r--r--textproc/pa-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.pa)0
-rw-r--r--textproc/qu-aspell/Makefile13
-rw-r--r--textproc/qu-aspell/distinfo3
-rw-r--r--textproc/qu-aspell/pkg-descr2
-rw-r--r--textproc/qu-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.qu)0
-rw-r--r--textproc/ro-aspell/Makefile14
-rw-r--r--textproc/ro-aspell/distinfo3
-rw-r--r--textproc/ro-aspell/pkg-descr2
-rw-r--r--textproc/ro-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.ro)0
-rw-r--r--textproc/rw-aspell/Makefile14
-rw-r--r--textproc/rw-aspell/distinfo3
-rw-r--r--textproc/rw-aspell/pkg-descr2
-rw-r--r--textproc/rw-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.rw)0
-rw-r--r--textproc/sc-aspell/Makefile13
-rw-r--r--textproc/sc-aspell/distinfo3
-rw-r--r--textproc/sc-aspell/pkg-descr2
-rw-r--r--textproc/sc-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.sc)0
-rw-r--r--textproc/sk-aspell/Makefile14
-rw-r--r--textproc/sk-aspell/distinfo3
-rw-r--r--textproc/sk-aspell/pkg-descr2
-rw-r--r--textproc/sk-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.sk)0
-rw-r--r--textproc/sl-aspell/Makefile14
-rw-r--r--textproc/sl-aspell/distinfo3
-rw-r--r--textproc/sl-aspell/pkg-descr2
-rw-r--r--textproc/sl-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.sl)0
-rw-r--r--textproc/sr-aspell/Makefile13
-rw-r--r--textproc/sr-aspell/distinfo3
-rw-r--r--textproc/sr-aspell/pkg-descr2
-rw-r--r--textproc/sr-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.sr)0
-rw-r--r--textproc/sv-aspell/Makefile14
-rw-r--r--textproc/sv-aspell/distinfo3
-rw-r--r--textproc/sv-aspell/pkg-descr2
-rw-r--r--textproc/sv-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.sv)0
-rw-r--r--textproc/sw-aspell/Makefile14
-rw-r--r--textproc/sw-aspell/distinfo3
-rw-r--r--textproc/sw-aspell/pkg-descr2
-rw-r--r--textproc/sw-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.sw)0
-rw-r--r--textproc/ta-aspell/Makefile13
-rw-r--r--textproc/ta-aspell/distinfo3
-rw-r--r--textproc/ta-aspell/pkg-descr2
-rw-r--r--textproc/ta-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.ta)0
-rw-r--r--textproc/te-aspell/Makefile13
-rw-r--r--textproc/te-aspell/distinfo3
-rw-r--r--textproc/te-aspell/pkg-descr2
-rw-r--r--textproc/te-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.te)0
-rw-r--r--textproc/tet-aspell/Makefile13
-rw-r--r--textproc/tet-aspell/distinfo3
-rw-r--r--textproc/tet-aspell/pkg-descr2
-rw-r--r--textproc/tet-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.tet)0
-rw-r--r--textproc/tl-aspell/Makefile13
-rw-r--r--textproc/tl-aspell/distinfo3
-rw-r--r--textproc/tl-aspell/pkg-descr2
-rw-r--r--textproc/tl-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.tl)0
-rw-r--r--textproc/tn-aspell/Makefile13
-rw-r--r--textproc/tn-aspell/distinfo3
-rw-r--r--textproc/tn-aspell/pkg-descr2
-rw-r--r--textproc/tn-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.tn)0
-rw-r--r--textproc/tr-aspell/Makefile14
-rw-r--r--textproc/tr-aspell/distinfo3
-rw-r--r--textproc/tr-aspell/pkg-descr2
-rw-r--r--textproc/tr-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.tr)0
-rw-r--r--textproc/uz-aspell/Makefile13
-rw-r--r--textproc/uz-aspell/distinfo3
-rw-r--r--textproc/uz-aspell/pkg-descr2
-rw-r--r--textproc/uz-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.uz)0
-rw-r--r--textproc/wa-aspell/Makefile14
-rw-r--r--textproc/wa-aspell/distinfo3
-rw-r--r--textproc/wa-aspell/pkg-descr2
-rw-r--r--textproc/wa-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.wa)0
-rw-r--r--textproc/yi-aspell/Makefile13
-rw-r--r--textproc/yi-aspell/distinfo3
-rw-r--r--textproc/yi-aspell/pkg-descr2
-rw-r--r--textproc/yi-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.yi)0
-rw-r--r--textproc/zu-aspell/Makefile14
-rw-r--r--textproc/zu-aspell/distinfo3
-rw-r--r--textproc/zu-aspell/pkg-descr2
-rw-r--r--textproc/zu-aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.zu)0
-rw-r--r--ukrainian/aspell/Makefile12
-rw-r--r--ukrainian/aspell/distinfo3
-rw-r--r--ukrainian/aspell/pkg-descr2
-rw-r--r--ukrainian/aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.uk)0
-rw-r--r--vietnamese/aspell/Makefile12
-rw-r--r--vietnamese/aspell/distinfo3
-rw-r--r--vietnamese/aspell/pkg-descr2
-rw-r--r--vietnamese/aspell/pkg-plist (renamed from textproc/aspell/pkg-plist.vi)0
327 files changed, 1113 insertions, 1017 deletions
diff --git a/UPDATING b/UPDATING
index df4c8da63778..64f5af06fcf0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,21 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20060715:
+ AFFECTS: users of Aspell or its versions bundled with dictionaries
+ AUTHOR: thierry@FreeBSD.org
+
+ Since aspell-0.60.4_4, all dictionaries can be installed separately:
+
+ - by default, textproc/aspell installs the English dictionaries (no
+ change);
+ - thereafter you can install any foreign dictionary;
+ - when you install a foreign dictionary, i.e. french/aspell or
+ textproc/da-aspell, it installs only the dictionaries, and depends
+ upon textproc/aspell for the programs;
+ - if you don't need the English dictionaries, you can define
+ WITHOUT_DICTEN or install textproc/aspell-without-dicten.
+
20060714:
AFFECTS: users of security/krb5
AUTHOR: cy@FreeBSD.org
diff --git a/french/aspell/Makefile b/french/aspell/Makefile
index ad6d038e6a79..3aaed9062d67 100644
--- a/french/aspell/Makefile
+++ b/french/aspell/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= aspell
-CATEGORIES= french
+DISTVERSION= -fr-0.50-3
+PORTEPOCH= 1
+CATEGORIES= french textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with French dictionaries
+COMMENT= Aspell French dictionaries
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= fr
-ASPELL_FR= oui
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/french/aspell/distinfo b/french/aspell/distinfo
new file mode 100644
index 000000000000..f35b2f5f42ef
--- /dev/null
+++ b/french/aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-fr-0.50-3.tar.bz2) = 53a2d05c4e8f7fabd3cefe24db977be7
+SHA256 (aspell-fr-0.50-3.tar.bz2) = f9421047519d2af9a7a466e4336f6e6ea55206b356cd33c8bd18cb626bf2ce91
+SIZE (aspell-fr-0.50-3.tar.bz2) = 283086
diff --git a/french/aspell/pkg-descr b/french/aspell/pkg-descr
index 6ded4b5b7706..f93fd32a1268 100644
--- a/french/aspell/pkg-descr
+++ b/french/aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with French dictionaries.
+Aspell French dictionaries.
[Aspell avec des dictionnaires franēais]
diff --git a/textproc/aspell/pkg-plist.fr b/french/aspell/pkg-plist
index fa74ce9fe10e..fa74ce9fe10e 100644
--- a/textproc/aspell/pkg-plist.fr
+++ b/french/aspell/pkg-plist
diff --git a/german/Makefile b/german/Makefile
index b0806839dfbc..2e9d7bc6ec11 100644
--- a/german/Makefile
+++ b/german/Makefile
@@ -5,6 +5,7 @@
SUBDIR += BBBike
SUBDIR += acroread
+ SUBDIR += alt-aspell
SUBDIR += aspell
SUBDIR += bsdforen-firefox-searchplugin
SUBDIR += citrix_ica
diff --git a/german/alt-aspell/Makefile b/german/alt-aspell/Makefile
new file mode 100644
index 000000000000..be5a438dc31f
--- /dev/null
+++ b/german/alt-aspell/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: de-alt-aspell
+# Date created: 14 July 2006
+# Whom: Thierry Thomas <thierry@pompo.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= alt-aspell
+DISTVERSION= 6-de-20030222-1
+CATEGORIES= german textproc
+
+MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell German Old Spelling (Deutsch - Alter Spelling) dictionary
+
+DICT= de-alt
+
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/german/alt-aspell/distinfo b/german/alt-aspell/distinfo
new file mode 100644
index 000000000000..9bc174786e7b
--- /dev/null
+++ b/german/alt-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-de-20030222-1.tar.bz2) = 5950c5c8a36fc93d4d7616591bace6a6
+SHA256 (aspell6-de-20030222-1.tar.bz2) = ba6c94e11bc2e0e6e43ce0f7822c5bba5ca5ac77129ef90c190b33632416e906
+SIZE (aspell6-de-20030222-1.tar.bz2) = 274407
diff --git a/german/alt-aspell/pkg-descr b/german/alt-aspell/pkg-descr
new file mode 100644
index 000000000000..fc100a344ed6
--- /dev/null
+++ b/german/alt-aspell/pkg-descr
@@ -0,0 +1 @@
+Aspell German - Old Spelling (Deutsch - Alter Spelling) dictionary.
diff --git a/textproc/aspell/pkg-plist.de b/german/alt-aspell/pkg-plist
index e11f30c6942d..e11f30c6942d 100644
--- a/textproc/aspell/pkg-plist.de
+++ b/german/alt-aspell/pkg-plist
diff --git a/german/aspell/Makefile b/german/aspell/Makefile
index ec2ad4cb8e76..5f6098da2192 100644
--- a/german/aspell/Makefile
+++ b/german/aspell/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= aspell
-CATEGORIES= german
+DISTVERSION= 6-de-20030222-1
+CATEGORIES= german textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with German dictionary
+COMMENT= Aspell German dictionary
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= de
-ASPELL_DE= ja
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/german/aspell/distinfo b/german/aspell/distinfo
new file mode 100644
index 000000000000..9bc174786e7b
--- /dev/null
+++ b/german/aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-de-20030222-1.tar.bz2) = 5950c5c8a36fc93d4d7616591bace6a6
+SHA256 (aspell6-de-20030222-1.tar.bz2) = ba6c94e11bc2e0e6e43ce0f7822c5bba5ca5ac77129ef90c190b33632416e906
+SIZE (aspell6-de-20030222-1.tar.bz2) = 274407
diff --git a/german/aspell/pkg-descr b/german/aspell/pkg-descr
index 40b4036effd5..2f4877a9ea69 100644
--- a/german/aspell/pkg-descr
+++ b/german/aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with German dictionary.
+Aspell German dictionary.
WWW: http://lisa.goe.net/~bjacke/igerman98/
diff --git a/german/aspell/pkg-plist b/german/aspell/pkg-plist
new file mode 100644
index 000000000000..e11f30c6942d
--- /dev/null
+++ b/german/aspell/pkg-plist
@@ -0,0 +1,14 @@
+lib/aspell-%%VER%%/de_affix.dat
+lib/aspell-%%VER%%/de_phonet.dat
+lib/aspell-%%VER%%/de.dat
+share/aspell/de-common.rws
+share/aspell/de.multi
+share/aspell/de_AT-only.rws
+share/aspell/de_AT.multi
+share/aspell/de_CH-only.rws
+share/aspell/de_CH.multi
+share/aspell/de_DE-only.rws
+share/aspell/de_DE.multi
+share/aspell/deutsch.alias
+share/aspell/german.alias
+share/aspell/swiss.alias
diff --git a/hebrew/aspell/Makefile b/hebrew/aspell/Makefile
index aea7fd3e8790..8d60e95e989c 100644
--- a/hebrew/aspell/Makefile
+++ b/hebrew/aspell/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= aspell
-CATEGORIES= hebrew
+DISTVERSION= 6-he-0.9-0
+CATEGORIES= hebrew textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Hebrew dictionaries
+COMMENT= Aspell Hebrew dictionaries
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= he
-ASPELL_HE= ken
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/hebrew/aspell/distinfo b/hebrew/aspell/distinfo
new file mode 100644
index 000000000000..2b15f27eba2e
--- /dev/null
+++ b/hebrew/aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-he-0.9-0.tar.bz2) = f453989e1df364af9479e893c16ac9d8
+SHA256 (aspell6-he-0.9-0.tar.bz2) = 1960486db21a4ad273a0f91627c00afd9f49e5a27daf655e0ac8d6378e333b7f
+SIZE (aspell6-he-0.9-0.tar.bz2) = 144899
diff --git a/hebrew/aspell/pkg-descr b/hebrew/aspell/pkg-descr
index 17fbf3fcfa21..1b6c53204ba3 100644
--- a/hebrew/aspell/pkg-descr
+++ b/hebrew/aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Hebrew dictionaries.
+Aspell Hebrew dictionaries.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.he b/hebrew/aspell/pkg-plist
index a0c57884de62..a0c57884de62 100644
--- a/textproc/aspell/pkg-plist.he
+++ b/hebrew/aspell/pkg-plist
diff --git a/hungarian/aspell/Makefile b/hungarian/aspell/Makefile
index b87e3b9b8b5f..7cea5b07f332 100644
--- a/hungarian/aspell/Makefile
+++ b/hungarian/aspell/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= aspell
-CATEGORIES= hungarian
+DISTVERSION= 6-hu-0.99.4.2-0
+CATEGORIES= hungarian textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Hungarian dictionaries
+COMMENT= Aspell Hungarian dictionaries
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= hu
-ASPELL_HU= igen
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/hungarian/aspell/distinfo b/hungarian/aspell/distinfo
new file mode 100644
index 000000000000..361432bc4589
--- /dev/null
+++ b/hungarian/aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-hu-0.99.4.2-0.tar.bz2) = 4f4e1e98019a89d0ebf43ec59ae68254
+SHA256 (aspell6-hu-0.99.4.2-0.tar.bz2) = 3335a7b45cf9774bccf03740fbddeb7ec4752dd87178fa93f92d4c71e3f236b5
+SIZE (aspell6-hu-0.99.4.2-0.tar.bz2) = 375949
diff --git a/hungarian/aspell/pkg-descr b/hungarian/aspell/pkg-descr
index 540d1d608aa2..de0d6f413026 100644
--- a/hungarian/aspell/pkg-descr
+++ b/hungarian/aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Hungarian dictionaries.
+Aspell Hungarian dictionaries.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.hu b/hungarian/aspell/pkg-plist
index 6cbe45739c03..6cbe45739c03 100644
--- a/textproc/aspell/pkg-plist.hu
+++ b/hungarian/aspell/pkg-plist
diff --git a/polish/aspell/Makefile b/polish/aspell/Makefile
index 626bf8455aea..3602a6a44b75 100644
--- a/polish/aspell/Makefile
+++ b/polish/aspell/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= aspell
-CATEGORIES= polish
+DISTVERSION= -pl-0.51-0
+PORTEPOCH= 1
+CATEGORIES= polish textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Polish dictionary
+COMMENT= Aspell Polish dictionary
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= pl
-ASPELL_PL= tak
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/polish/aspell/distinfo b/polish/aspell/distinfo
new file mode 100644
index 000000000000..3f17d80eb1db
--- /dev/null
+++ b/polish/aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-pl-0.51-0.tar.bz2) = 5435be1c9c39326a02e2798d8b4d257b
+SHA256 (aspell-pl-0.51-0.tar.bz2) = a71ce4dbc3d6d0adcf386b1776e359fff57f0ba422d338e8d1fe9569a2646ca8
+SIZE (aspell-pl-0.51-0.tar.bz2) = 624458
diff --git a/polish/aspell/pkg-descr b/polish/aspell/pkg-descr
index 4f4b7ec4b9c4..5221c987470b 100644
--- a/polish/aspell/pkg-descr
+++ b/polish/aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Polish dictionary.
+Aspell Polish dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.pl b/polish/aspell/pkg-plist
index 590dba24d214..590dba24d214 100644
--- a/textproc/aspell/pkg-plist.pl
+++ b/polish/aspell/pkg-plist
diff --git a/portuguese/aspell-pt_PT/Makefile b/portuguese/aspell-pt_PT/Makefile
index 7bf49222e123..7e515a672b0d 100644
--- a/portuguese/aspell-pt_PT/Makefile
+++ b/portuguese/aspell-pt_PT/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= aspell
-CATEGORIES= portuguese
+DISTVERSION= -pt-0.50-2
+PORTEPOCH= 1
+CATEGORIES= portuguese textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Portuguese dictionary
+COMMENT= Aspell Portuguese dictionary
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= pt
-ASPELL_PT= sim
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/portuguese/aspell-pt_PT/distinfo b/portuguese/aspell-pt_PT/distinfo
new file mode 100644
index 000000000000..afa87a7c6fed
--- /dev/null
+++ b/portuguese/aspell-pt_PT/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-pt-0.50-2.tar.bz2) = e4e15179f90b76ec0336b687d1293edd
+SHA256 (aspell-pt-0.50-2.tar.bz2) = 4acbffe03b918cf32b340949d0f167df9073190d347a092f45d4e400a09b2fa6
+SIZE (aspell-pt-0.50-2.tar.bz2) = 201341
diff --git a/portuguese/aspell-pt_PT/pkg-descr b/portuguese/aspell-pt_PT/pkg-descr
index ea7a7c25bb77..fa0706a6ca2e 100644
--- a/portuguese/aspell-pt_PT/pkg-descr
+++ b/portuguese/aspell-pt_PT/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Portuguese dictionary.
+Aspell Portuguese dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.pt b/portuguese/aspell-pt_PT/pkg-plist
index 485942b2c486..485942b2c486 100644
--- a/textproc/aspell/pkg-plist.pt
+++ b/portuguese/aspell-pt_PT/pkg-plist
diff --git a/portuguese/aspell/Makefile b/portuguese/aspell/Makefile
index 7bf49222e123..7e515a672b0d 100644
--- a/portuguese/aspell/Makefile
+++ b/portuguese/aspell/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= aspell
-CATEGORIES= portuguese
+DISTVERSION= -pt-0.50-2
+PORTEPOCH= 1
+CATEGORIES= portuguese textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Portuguese dictionary
+COMMENT= Aspell Portuguese dictionary
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= pt
-ASPELL_PT= sim
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/portuguese/aspell/distinfo b/portuguese/aspell/distinfo
new file mode 100644
index 000000000000..afa87a7c6fed
--- /dev/null
+++ b/portuguese/aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-pt-0.50-2.tar.bz2) = e4e15179f90b76ec0336b687d1293edd
+SHA256 (aspell-pt-0.50-2.tar.bz2) = 4acbffe03b918cf32b340949d0f167df9073190d347a092f45d4e400a09b2fa6
+SIZE (aspell-pt-0.50-2.tar.bz2) = 201341
diff --git a/portuguese/aspell/pkg-descr b/portuguese/aspell/pkg-descr
index ea7a7c25bb77..fa0706a6ca2e 100644
--- a/portuguese/aspell/pkg-descr
+++ b/portuguese/aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Portuguese dictionary.
+Aspell Portuguese dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/portuguese/aspell/pkg-plist b/portuguese/aspell/pkg-plist
new file mode 100644
index 000000000000..485942b2c486
--- /dev/null
+++ b/portuguese/aspell/pkg-plist
@@ -0,0 +1,10 @@
+lib/aspell-%%VER%%/pt.dat
+share/aspell/brazilian.alias
+share/aspell/portuguźs.alias
+share/aspell/portuguese.alias
+share/aspell/pt-only.rws
+share/aspell/pt.multi
+share/aspell/pt_BR-only.rws
+share/aspell/pt_BR.multi
+share/aspell/pt_PT-only.rws
+share/aspell/pt_PT.multi
diff --git a/russian/aspell/Makefile b/russian/aspell/Makefile
index 755b2d601b8a..bef1ea5291f4 100644
--- a/russian/aspell/Makefile
+++ b/russian/aspell/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= aspell
-CATEGORIES= russian
+DISTVERSION= 6-ru-0.99f7-1
+CATEGORIES= russian textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Russian dictionary
+COMMENT= Aspell Russian dictionary
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= ru
-ASPELL_RU= da
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/russian/aspell/distinfo b/russian/aspell/distinfo
new file mode 100644
index 000000000000..82d4e304d668
--- /dev/null
+++ b/russian/aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-ru-0.99f7-1.tar.bz2) = c4c98eaa5e77ad3adccbc5c96cb57cb3
+SHA256 (aspell6-ru-0.99f7-1.tar.bz2) = 5c29b6ccce57bc3f7c4fb0510d330446b9c769e59c92bdfede27333808b6e646
+SIZE (aspell6-ru-0.99f7-1.tar.bz2) = 427312
diff --git a/russian/aspell/pkg-descr b/russian/aspell/pkg-descr
index d22f12707973..d8d65652c336 100644
--- a/russian/aspell/pkg-descr
+++ b/russian/aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Russian dictionary (charset koi8-r).
+Aspell Russian dictionary (charset koi8-r).
WWW: http://aspell.sourceforge.net/
diff --git a/textproc/aspell/pkg-plist.ru b/russian/aspell/pkg-plist
index 5a0567da6456..5a0567da6456 100644
--- a/textproc/aspell/pkg-plist.ru
+++ b/russian/aspell/pkg-plist
diff --git a/textproc/Makefile b/textproc/Makefile
index a3b87bfad039..9be6dd6d200a 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -20,6 +20,7 @@
SUBDIR += asciidoc
SUBDIR += asm2html
SUBDIR += aspell
+ SUBDIR += aspell-without-dicten
SUBDIR += az-aspell
SUBDIR += bar
SUBDIR += be-aspell
@@ -113,6 +114,7 @@
SUBDIR += ecromedos
SUBDIR += el-aspell
SUBDIR += emacs-wiki
+ SUBDIR += en-aspell
SUBDIR += enchant
SUBDIR += eo-aspell
SUBDIR += eruby
diff --git a/textproc/af-aspell/Makefile b/textproc/af-aspell/Makefile
index 0bbbe961bfd7..0d5994ff9a95 100644
--- a/textproc/af-aspell/Makefile
+++ b/textproc/af-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= af-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -af-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Afrikaans dictionary
+COMMENT= Aspell Afrikaans dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= af
-ASPELL_AF= ja
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/af-aspell/distinfo b/textproc/af-aspell/distinfo
new file mode 100644
index 000000000000..d170747ed995
--- /dev/null
+++ b/textproc/af-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-af-0.50-0.tar.bz2) = bde617a195e70364f96eea71cf71a333
+SHA256 (aspell-af-0.50-0.tar.bz2) = 9d6000aeca5911343278bd6ed9e21d42c8cb26247dafe94a76ff81d8ac98e602
+SIZE (aspell-af-0.50-0.tar.bz2) = 256111
diff --git a/textproc/af-aspell/pkg-descr b/textproc/af-aspell/pkg-descr
index 41f650bcc146..62cda53a826e 100644
--- a/textproc/af-aspell/pkg-descr
+++ b/textproc/af-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Afrikaans dictionary.
+Aspell Afrikaans dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.af b/textproc/af-aspell/pkg-plist
index 65f26b856490..65f26b856490 100644
--- a/textproc/aspell/pkg-plist.af
+++ b/textproc/af-aspell/pkg-plist
diff --git a/textproc/am-aspell/Makefile b/textproc/am-aspell/Makefile
index 66415c534af9..e18e261ea89c 100644
--- a/textproc/am-aspell/Makefile
+++ b/textproc/am-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= am-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-am-0.03-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Amharic dictionary
+COMMENT= Aspell Amharic dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= am
-ASPELL_AM= ow
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/am-aspell/distinfo b/textproc/am-aspell/distinfo
new file mode 100644
index 000000000000..83bbfae76a79
--- /dev/null
+++ b/textproc/am-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-am-0.03-1.tar.bz2) = 7e28708b53bd4bc3008dfb04237413ac
+SHA256 (aspell6-am-0.03-1.tar.bz2) = bf27dd21f8871e2b3332c211b402cd46604d431a7773e599729c242cdfb9d487
+SIZE (aspell6-am-0.03-1.tar.bz2) = 40493
diff --git a/textproc/am-aspell/pkg-descr b/textproc/am-aspell/pkg-descr
index d370704bcf90..fb328c49a694 100644
--- a/textproc/am-aspell/pkg-descr
+++ b/textproc/am-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Amharic dictionary.
+Aspell Amharic dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.am b/textproc/am-aspell/pkg-plist
index 8f43d1637f96..8f43d1637f96 100644
--- a/textproc/aspell/pkg-plist.am
+++ b/textproc/am-aspell/pkg-plist
diff --git a/textproc/aspell-without-dicten/Makefile b/textproc/aspell-without-dicten/Makefile
new file mode 100644
index 000000000000..89c6d2971609
--- /dev/null
+++ b/textproc/aspell-without-dicten/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for: aspell-without-dicten
+# Date created: 14 Jul 2006
+# Whom: Thierry Thomas <thierry@pompo.net>
+#
+# $FreeBSD$
+#
+
+MASTERDIR= ${.CURDIR}/../aspell
+
+WITHOUT_DICTEN= yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 233ef043905b..9ce6556fb99d 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -5,17 +5,20 @@
# $FreeBSD$
#
-PORTNAME?= aspell
+PORTNAME= aspell
PORTVERSION= 0.60.4
-PORTREVISION= 3
-CATEGORIES+= textproc
+PORTREVISION= 4
+CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= aspell
-DISTFILES= aspell-0.60.4.tar.gz # needed for slave ports / options
-EXTRACT_ONLY= aspell-0.60.4.tar.gz
+.if defined(WITHOUT_DICTEN)
+PKGNAMESUFFIX= -without-dicten
+.endif
+DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-MAINTAINER?= thierry@FreeBSD.org
-COMMENT?= Spelling checker with better suggestion logic than ispell
+MAINTAINER= thierry@FreeBSD.org
+COMMENT= Spelling checker with better suggestion logic than ispell
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
@@ -32,12 +35,30 @@ USE_GETTEXT= yes
USE_PERL5_BUILD= yes
INSTALLS_SHLIB= yes
+SLAVEDIRS= textproc/aspell-without-dicten
+
MAKE_ARGS= NOPORTDOCS=${NOPORTDOCS}
VERINST= ${PORTVERSION:R}
+SUB_FILES= aspell.ver
PLIST_SUB= VER=${VERINST}
+SUB_LIST= VERINST=${VERINST}
+
+.if defined(WITHOUT_DICTEN)
+CONFLICTS= aspell-0.*
+DICT_TARGET=
+.else
+VERDICT_EN= 6-en-6.0-0
+DICT_SUFFIX= .tar.bz2
+MASTER_SITES+= ${MASTER_SITE_GNU:S|%SUBDIR%/|%SUBDIR%/dict/en/:dicten|}
+DISTFILES+= aspell${VERDICT_EN}${DICT_SUFFIX}:dicten
+CONFLICTS= aspell-without-dicten-0.*
+DICT_TARGET= inst-dicten
+CONF_DICT_ENV= ASPELL="${PREFIX}/bin/aspell" \
+ WORD_LIST_COMPRESS="${PREFIX}/bin/word-list-compress"
+.endif
.if defined(WITH_ISPELL)
-CONFLICTS= ispell* ??-ispell*
+CONFLICTS+= ispell* ??-ispell*
SCRIPTS= ispell spell
PLIST_SUB+= SCRIPTS=""
.else
@@ -62,170 +83,43 @@ INFO= aspell-dev aspell
CFLAGS+= -O
.endif
-WRKSRC= ${WRKDIR}/aspell-${PORTVERSION} # needed for slave ports / options
-DOCSDIR= ${PREFIX}/share/doc/aspell
-DATADIR= ${PREFIX}/share/aspell
-DESCR= ${.CURDIR}/pkg-descr
-
-CONF_DICT_ENV= ASPELL="${PREFIX}/bin/aspell" \
- WORD_LIST_COMPRESS="${PREFIX}/bin/word-list-compress"
-AVAIL_DICT= af am az be bg bn br ca cs csb cy da de de-alt el en eo es et fa fi fo \
- fr ga gd gl gu gv he hi hil hr hsb hu ia id is it la lt lv mi mk mn mr \
- ms mt nb nds nl nn ny or pa pl pt qu ro ru rw sc sk sl sr sv sw ta te \
- tet tl tn tr uk uz vi wa yi zu
-DICT_SUFFIX= .tar.bz2
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/verdict"
-
-.if defined(LANG)
-. for i in ${AVAIL_DICT} no
-. if ${LANG:M${i}*} != ""
-DEF_DICT= ${i}
-. endif
-. endfor
-. if defined(DEF_DICT) && ${DEF_DICT} == no
-DEF_DICT= nn
-. endif
-.endif
-DEF_DICT?= en
-
pre-everything::
-.if defined(ASPELL_NO)
-ASPELL_NN= yes
+ @${ECHO_MSG} ""
+.if !defined(WITH_ISPELL)
+ @${ECHO_MSG} "Define WITH_ISPELL to install Ispell's wrapper."
+ @${ECHO_MSG} ""
.endif
-.if defined(WITH_ALL_DICTS)
-. for LG in ${AVAIL_DICT}
-ASPELL_${LG:U}= yes
-. endfor
+.if !defined(WITHOUT_DICTEN)
+ @${ECHO_MSG} "Define WITHOUT_DICTEN to not install english dictionary."
+ @${ECHO_MSG} ""
.endif
-.for LG in ${AVAIL_DICT}
-. if defined(ASPELL_${LG:U})
-DICTS+= ${LG}
-. endif
-.endfor
-.if !defined(DICTS)
- @${ECHO_MSG} '*********************************************************'
- @${ECHO_MSG} '* You can add further dictionaries: *'
- @${ECHO_MSG} '* Use make-flag: *'
- @${ECHO_MSG} '* - Afrikaans ASPELL_AF=yes *'
- @${ECHO_MSG} '* - Amharic ASPELL_AM=yes *'
- @${ECHO_MSG} '* - Azerbaijani ASPELL_AZ=yes *'
- @${ECHO_MSG} '* - Belarusian ASPELL_BE=yes *'
- @${ECHO_MSG} '* - Bengali ASPELL_BN=yes *'
- @${ECHO_MSG} '* - Bulgarian ASPELL_BG=yes *'
- @${ECHO_MSG} '* - Breton ASPELL_BR=yes *'
- @${ECHO_MSG} '* - Catalan / Valencian ASPELL_CA=yes *'
- @${ECHO_MSG} '* - Croatian ASPELL_HR=yes *'
- @${ECHO_MSG} '* - Czech ASPELL_CS=yes *'
- @${ECHO_MSG} '* - Danish ASPELL_DA=yes *'
- @${ECHO_MSG} '* - Dutch ASPELL_NL=yes *'
- @${ECHO_MSG} '* - English ASPELL_EN=yes *'
- @${ECHO_MSG} '* - Esperanto ASPELL_EO=yes *'
- @${ECHO_MSG} '* - Estonian ASPELL_ET=yes *'
- @${ECHO_MSG} '* - Faroese ASPELL_FO=yes *'
- @${ECHO_MSG} '* - Finnish ASPELL_FI=yes *'
- @${ECHO_MSG} '* - French ASPELL_FR=yes *'
- @${ECHO_MSG} '* - Galician ASPELL_GL=yes *'
- @${ECHO_MSG} '* - German ASPELL_DE=yes *'
- @${ECHO_MSG} '* - German (orig spelling rules) ASPELL_DE-ALT=yes *'
- @${ECHO_MSG} '* - Greek ASPELL_EL=yes *'
- @${ECHO_MSG} '* - Gujarati ASPELL_GU=yes *'
- @${ECHO_MSG} '* - Hebrew ASPELL_HE=yes *'
- @${ECHO_MSG} '* - Hiligaynon ASPELL_HIL=yes *'
- @${ECHO_MSG} '* - Hindi ASPELL_HI=yes *'
- @${ECHO_MSG} '* - Hungarian ASPELL_HU=yes *'
- @${ECHO_MSG} '* - Icelandic ASPELL_IS=yes *'
- @${ECHO_MSG} '* - Indonesian ASPELL_ID=yes *'
- @${ECHO_MSG} '* - Interlingua ASPELL_IA=yes *'
- @${ECHO_MSG} '* - Irish (Gaelic) ASPELL_GA=yes *'
- @${ECHO_MSG} '* - Italian ASPELL_IT=yes *'
- @${ECHO_MSG} '* - Kashubian ASPELL_CSB=yes *'
- @${ECHO_MSG} '* - Kinyarwanda ASPELL_RW=yes *'
- @${ECHO_MSG} '* - Latin ASPELL_LA=yes *'
- @${ECHO_MSG} '* - Latvian ASPELL_LV=yes *'
- @${ECHO_MSG} '* - Lithuanian ASPELL_LT=yes *'
- @${ECHO_MSG} '* - Low Saxon ASPELL_NDS=yes *'
- @${ECHO_MSG} '* - Macedonian ASPELL_MK=yes *'
- @${ECHO_MSG} '* - Maori ASPELL_MI=yes *'
- @${ECHO_MSG} '* - Malay ASPELL_MS=yes *'
- @${ECHO_MSG} '* - Maltese ASPELL_MT=yes *'
- @${ECHO_MSG} '* - Manx Gaelic ASPELL_GV=yes *'
- @${ECHO_MSG} '* - Marathi ASPELL_MR=yes *'
- @${ECHO_MSG} '* - Mongolian ASPELL_MN=yes *'
- @${ECHO_MSG} '* - Norwegian Bokmal ASPELL_NB=yes *'
- @${ECHO_MSG} '* - Norwegian Nynorsk ASPELL_NN=yes *'
- @${ECHO_MSG} '* - Nyanja (Chichewa) ASPELL_NY=yes *'
- @${ECHO_MSG} '* - Oriya ASPELL_OR=yes *'
- @${ECHO_MSG} '* - Persian (Farsi) ASPELL_FA=yes *'
- @${ECHO_MSG} '* - Polish ASPELL_PL=yes *'
- @${ECHO_MSG} '* - Portuguese ASPELL_PT=yes *'
- @${ECHO_MSG} '* - Punjabi ASPELL_PU=yes *'
- @${ECHO_MSG} '* - Quechua ASPELL_QU=yes *'
- @${ECHO_MSG} '* - Romanian ASPELL_RO=yes *'
- @${ECHO_MSG} '* - Russian ASPELL_RU=yes *'
- @${ECHO_MSG} '* - Sardinian ASPELL_SC=yes *'
- @${ECHO_MSG} '* - Scottish Gaelic ASPELL_GD=yes *'
- @${ECHO_MSG} '* - Serbian ASPELL_SR=yes *'
- @${ECHO_MSG} '* - Slovak ASPELL_SK=yes *'
- @${ECHO_MSG} '* - Slovenian ASPELL_SL=yes *'
- @${ECHO_MSG} '* - Swahili ASPELL_SW=yes *'
- @${ECHO_MSG} '* - Spanish ASPELL_ES=yes *'
- @${ECHO_MSG} '* - Swedish ASPELL_SV=yes *'
- @${ECHO_MSG} '* - Tagalog ASPELL_TL=yes *'
- @${ECHO_MSG} '* - Tamil ASPELL_TA=yes *'
- @${ECHO_MSG} '* - Telugu ASPELL_TE=yes *'
- @${ECHO_MSG} '* - Tetum ASPELL_TET=yes *'
- @${ECHO_MSG} '* - Tswana ASPELL_TN=yes *'
- @${ECHO_MSG} '* - Turkish ASPELL_TR=yes *'
- @${ECHO_MSG} '* - Ukrainian ASPELL_UK=yes *'
- @${ECHO_MSG} '* - Upper Sorbian ASPELL_HSB=yes *'
- @${ECHO_MSG} '* - Uzbek ASPELL_UZ=yes *'
- @${ECHO_MSG} '* - Vietnamese ASPELL_VI=yes *'
- @${ECHO_MSG} '* - Walloon ASPELL_WA=yes *'
- @${ECHO_MSG} '* - Welsh ASPELL_CY=yes *'
- @${ECHO_MSG} '* - Yiddish ASPELL_YI=yes *'
- @${ECHO_MSG} '* - Zulu ASPELL_ZU=yes *'
- @${ECHO_MSG} '* *'
- @${ECHO_MSG} '* Example: "make ASPELL_FR=yes ASPELL_EN=yes install" *'
- @${ECHO_MSG} '*********************************************************'
-. for LG in ${AVAIL_DICT}
-. if (${DEF_DICT} == ${LG})
-DICTS= ${LG}
-. endif
-. endfor
-.endif
-
-.for DICO in ${DICTS}
-MASTER_SITES+= ftp://ftp.gnu.org/gnu/aspell/dict/${DICO:S/-alt//}/:dict${DICO:S/-//} \
- http://gnu.mirror.mcgill.ca/aspell/dict/${DICO:S/-alt//}/:dict${DICO:S/-//} \
- http://mirrors.usc.edu/pub/gnu/aspell/dict/${DICO:S/-alt//}/:dict${DICO:S/-//} \
- ftp://ftp.sunsite.org.uk/package/gnu/aspell/dict/${DICO:S/-alt//}/:dict${DICO:S/-//}
-DISTFILES+= aspell${VERDICT_${DICO:U}}${DICT_SUFFIX}:dict${DICO:S/-//}
-.endfor
post-extract:
-.for DICO in ${DICTS}
- @cd ${WRKDIR} && \
- ${TAR} -xjf ${DISTDIR}/aspell${VERDICT_${DICO:U}}${DICT_SUFFIX}
-.endfor
+.if !defined(WITHOUT_DICTEN)
+ cd ${WRKDIR} && \
+ ${TAR} -xjf ${DISTDIR}/aspell${VERDICT_EN}${DICT_SUFFIX}
+.endif
pre-configure:
@cd ${WRKSRC} && ${ACLOCAL}
-post-install:
-.for DICO in ${DICTS}
- @${ECHO_MSG} "===> Installing for ${DICO} dictionaries"
- @cd ${WRKDIR}/aspell${VERDICT_${DICO:U}} && \
- ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
- ${GMAKE} install
- @${SED} -e "s|%%VER%%|${VERINST}|" ${MASTERDIR}/pkg-plist.${DICO} \
- >> ${TMPPLIST}
-.endfor
- @${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST}
- @${ECHO_CMD} "@dirrm lib/aspell-${VERINST}" >> ${TMPPLIST}
+post-install: ${DICT_TARGET}
+ ${INSTALL_DATA} ${WRKDIR}/aspell.ver ${PREFIX}/etc
.if defined(WITH_ISPELL)
${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/scripts/|} ${PREFIX}/bin
.endif
+ @${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST}
+ @${ECHO_CMD} "@dirrm lib/aspell-${VERINST}" >> ${TMPPLIST}
+
+inst-dicten:
+# Install en-aspell by default
+.if !exists(${LOCALBASE}/lib/aspell-${VERINST}/en.dat) && !defined(WITHOUT_DICTEN)
+ @${ECHO_MSG} "===> Installing for en dictionaries"
+ cd ${WRKDIR}/aspell${VERDICT_EN} && \
+ ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \
+ ${GMAKE} ${INSTALL_TARGET}
+ ${SED} -e "s|%%VER%%|${VERINST}|" ${MASTERDIR}/pkg-plist.en \
+ >> ${TMPPLIST}
+.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/aspell/Makefile.inc b/textproc/aspell/Makefile.inc
new file mode 100644
index 000000000000..eacbbf1e86bb
--- /dev/null
+++ b/textproc/aspell/Makefile.inc
@@ -0,0 +1,23 @@
+# $FreeBSD$
+# To be included by dictionaries ports.
+
+MASTER_SITES?= ${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR?= aspell/dict/${DICT}
+DISTNAME?= aspell${DISTVERSION}
+
+.if ${PORTNAME} == "en-aspell" || defined(WITHOUT_DICTEN)
+LIB_DEPENDS= aspell:${PORTSDIR}/textproc/aspell-without-dicten
+.else
+LIB_DEPENDS= aspell:${PORTSDIR}/textproc/aspell
+.endif
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+HAS_CONFIGURE= yes
+
+PLIST_SUB= VER=${VER}
+
+.include <bsd.port.pre.mk>
+.if exists(${LOCALBASE}/etc/aspell.ver)
+. include "${LOCALBASE}/etc/aspell.ver"
+.endif
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index 8f22c3b9feea..9df7e6d7677d 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,237 +1,6 @@
MD5 (aspell-0.60.4.tar.gz) = 4f1737e726d66476b9c7388831305510
SHA256 (aspell-0.60.4.tar.gz) = 8931d8644da9a71fdd970cafe9d6c20d796ad1d8ef2aaf89a801171104e426e4
SIZE (aspell-0.60.4.tar.gz) = 1676825
-MD5 (aspell-af-0.50-0.tar.bz2) = bde617a195e70364f96eea71cf71a333
-SHA256 (aspell-af-0.50-0.tar.bz2) = 9d6000aeca5911343278bd6ed9e21d42c8cb26247dafe94a76ff81d8ac98e602
-SIZE (aspell-af-0.50-0.tar.bz2) = 256111
-MD5 (aspell6-am-0.03-1.tar.bz2) = 7e28708b53bd4bc3008dfb04237413ac
-SHA256 (aspell6-am-0.03-1.tar.bz2) = bf27dd21f8871e2b3332c211b402cd46604d431a7773e599729c242cdfb9d487
-SIZE (aspell6-am-0.03-1.tar.bz2) = 40493
-MD5 (aspell6-az-0.02-0.tar.bz2) = 24d9d46c8fc23197666a43a7962a7b0d
-SHA256 (aspell6-az-0.02-0.tar.bz2) = 063176ec459d61acd59450ae49b5076e42abb1dcd54c1f934bae5fa6658044c3
-SIZE (aspell6-az-0.02-0.tar.bz2) = 50588
-MD5 (aspell5-be-0.01.tar.bz2) = 61314a1672f98571b32d23486bbd43be
-SHA256 (aspell5-be-0.01.tar.bz2) = 550bad0c03a142241ffe5ecc183659d80020b566003a05341cd1e97c6ed274eb
-SIZE (aspell5-be-0.01.tar.bz2) = 653405
-MD5 (aspell5-bg-4.0-0.tar.bz2) = f1d9f1587cc382f10f1c7ac0a2600833
-SHA256 (aspell5-bg-4.0-0.tar.bz2) = af7091e426449d071a5d0e03bd6e231d68e26409880d91c11081631ead40da21
-SIZE (aspell5-bg-4.0-0.tar.bz2) = 176676
-MD5 (aspell6-bn-0.01.1-1.tar.bz2) = 5ea70ec74e67f49b2844d306ddf38388
-SHA256 (aspell6-bn-0.01.1-1.tar.bz2) = b03f9cc4feb00df9bfd697b032f4f4ae838ad5a6bb41db798eefc5639a1480d9
-SIZE (aspell6-bn-0.01.1-1.tar.bz2) = 117436
-MD5 (aspell-br-0.50-1.tar.bz2) = 52efaf08d791e1a0c5056e2b3f6bf47d
-SHA256 (aspell-br-0.50-1.tar.bz2) = 699749933a9446a06ba78e32e4b05ae3dd41382e9b9613fb8dc2a08263972d94
-SIZE (aspell-br-0.50-1.tar.bz2) = 67834
-MD5 (aspell6-ca-20040130-1.tar.bz2) = 5dfeebdfbe68556e70abfa95dd775263
-SHA256 (aspell6-ca-20040130-1.tar.bz2) = a531b7764ebdb91655e2c5dac8a3625480b675579f16e64d1fd4409f6c6c672f
-SIZE (aspell6-ca-20040130-1.tar.bz2) = 222986
-MD5 (aspell-cs-0.51-0.tar.bz2) = 4be28bef4385ef46e80547ce8cdc4535
-SHA256 (aspell-cs-0.51-0.tar.bz2) = 7c56c5cd6e74d60749e68effa9dc45cb282cb3bb6a9c56b51f7594a72216ea47
-SIZE (aspell-cs-0.51-0.tar.bz2) = 626618
-MD5 (aspell6-csb-0.02-0.tar.bz2) = 0d4b408076115b7516c68887a563be68
-SHA256 (aspell6-csb-0.02-0.tar.bz2) = c166ad07d50e9e13ac9f87d5a8938b3f675a0f8a01017bd8969c2053e7f52298
-SIZE (aspell6-csb-0.02-0.tar.bz2) = 32694
-MD5 (aspell-cy-0.50-3.tar.bz2) = d59fee193dba87973b38ac2862a090bb
-SHA256 (aspell-cy-0.50-3.tar.bz2) = d5399dcd70061e5ed5af1214eb580f62864dd35ea4fa1ec2882ffc4f03307897
-SIZE (aspell-cy-0.50-3.tar.bz2) = 117652
-MD5 (aspell5-da-1.4.42-1.tar.bz2) = d14c03dca23b572606279d7317b022d0
-SHA256 (aspell5-da-1.4.42-1.tar.bz2) = f74a079617979c1623e8e7313e4ecd3bc260db92ce55b1f2a3a5e7077dacd3c1
-SIZE (aspell5-da-1.4.42-1.tar.bz2) = 317688
-MD5 (aspell6-de-20030222-1.tar.bz2) = 5950c5c8a36fc93d4d7616591bace6a6
-SHA256 (aspell6-de-20030222-1.tar.bz2) = ba6c94e11bc2e0e6e43ce0f7822c5bba5ca5ac77129ef90c190b33632416e906
-SIZE (aspell6-de-20030222-1.tar.bz2) = 274407
-MD5 (aspell6-de-alt-2.1-1.tar.bz2) = 13245374b03088608d729fd15c58cd7a
-SHA256 (aspell6-de-alt-2.1-1.tar.bz2) = 36d13c6c743a6b1ff05fb1af79134e118e5a94db06ba40c076636f9d04158c73
-SIZE (aspell6-de-alt-2.1-1.tar.bz2) = 247116
-MD5 (aspell-el-0.50-3.tar.bz2) = 0ea2c42ceb9b91f7f5de2c017234ad37
-SHA256 (aspell-el-0.50-3.tar.bz2) = 3f6508937dcaa64a6c70ee5f722f088b46b202a6409961b93b705d4ec4f56380
-SIZE (aspell-el-0.50-3.tar.bz2) = 328225
MD5 (aspell6-en-6.0-0.tar.bz2) = 16449e0a266e1ecc526b2f3cd39d4bc2
SHA256 (aspell6-en-6.0-0.tar.bz2) = 24f0688711d2b893fa06c16d14d0aa3a8000e326226b839aad32611f7ace4898
SIZE (aspell6-en-6.0-0.tar.bz2) = 182442
-MD5 (aspell-eo-0.50-2.tar.bz2) = f84147f5909e1a5f7adb86f27c71eb8c
-SHA256 (aspell-eo-0.50-2.tar.bz2) = 6c61a64297804afd4ddf21660caecf1c966dd57e577789b045e9d9944a6d70a7
-SIZE (aspell-eo-0.50-2.tar.bz2) = 89703
-MD5 (aspell-es-0.50-2.tar.bz2) = 4a8583e9ef9f4aed03f5a7fe09d40060
-SHA256 (aspell-es-0.50-2.tar.bz2) = 5c0e2a32d44196fb0375e72d44e730fd365d62e53ade077fb1653ccbb8ee2645
-SIZE (aspell-es-0.50-2.tar.bz2) = 157809
-MD5 (aspell6-et-0.1.21-1.tar.bz2) = 82929f49ddc1149b6ef2bde4c3c12bcd
-SHA256 (aspell6-et-0.1.21-1.tar.bz2) = b1e857aa3daaea2a19462b2671e87c26a7eb7337c83b709685394eed8472b249
-SIZE (aspell6-et-0.1.21-1.tar.bz2) = 338155
-MD5 (aspell6-fa-0.02-0.tar.bz2) = 4583ef4b8b2456f737e3d60ede1e9034
-SHA256 (aspell6-fa-0.02-0.tar.bz2) = fa79312cd28f8fa948cf14b7400c3c8bd6c246e00c9204147c855028627f3486
-SIZE (aspell6-fa-0.02-0.tar.bz2) = 97168
-MD5 (aspell6-fi-0.7-0.tar.bz2) = 6d1032116982c0efab1af8fce83259c0
-SHA256 (aspell6-fi-0.7-0.tar.bz2) = f8d7f07b4511e606eb56392ddaa76fd29918006331795e5942ad11b510d0a51d
-SIZE (aspell6-fi-0.7-0.tar.bz2) = 209249
-MD5 (aspell5-fo-0.2.16-1.tar.bz2) = a57e8870c272931da41cd1fc5a291f3d
-SHA256 (aspell5-fo-0.2.16-1.tar.bz2) = f7e0ddc039bb4f5c142d39dab72d9dfcb951f5e46779f6e3cf1d084a69f95e08
-SIZE (aspell5-fo-0.2.16-1.tar.bz2) = 165901
-MD5 (aspell-fr-0.50-3.tar.bz2) = 53a2d05c4e8f7fabd3cefe24db977be7
-SHA256 (aspell-fr-0.50-3.tar.bz2) = f9421047519d2af9a7a466e4336f6e6ea55206b356cd33c8bd18cb626bf2ce91
-SIZE (aspell-fr-0.50-3.tar.bz2) = 283086
-MD5 (aspell5-ga-3.6-0.tar.bz2) = 69b1e0c06f039340302336506080efde
-SHA256 (aspell5-ga-3.6-0.tar.bz2) = 1f87d107f7763a3e8414277663cb8aceb56521364c107c160ab64b641121fdb8
-SIZE (aspell5-ga-3.6-0.tar.bz2) = 539910
-MD5 (aspell5-gd-0.1.1-1.tar.bz2) = 171673ec92270f58f945c4317286220b
-SHA256 (aspell5-gd-0.1.1-1.tar.bz2) = e316a08a75da8a0d4d15eb892023073a971e0a326382a5532db29856768e0929
-SIZE (aspell5-gd-0.1.1-1.tar.bz2) = 51167
-MD5 (aspell-gl-0.50-0.tar.bz2) = 0cd3c4e3e325e080689657f03eff8e8e
-SHA256 (aspell-gl-0.50-0.tar.bz2) = 96833bc8301e0ff5fbb3b162f900237e0e806a204f9cae5e005998762cb48f4c
-SIZE (aspell-gl-0.50-0.tar.bz2) = 112313
-MD5 (aspell6-gu-0.02-0.tar.bz2) = 42d3eb8a32a020aea56cd3e6ea3de0e1
-SHA256 (aspell6-gu-0.02-0.tar.bz2) = 1ab8c1337fbd8e40bcbd5f9ab18a7d3308844b1f2b269dd9cb0f4cff25a0dfa4
-SIZE (aspell6-gu-0.02-0.tar.bz2) = 30949
-MD5 (aspell-gv-0.50-0.tar.bz2) = 139b5aa1f5ea85fb7a4be0338039e959
-SHA256 (aspell-gv-0.50-0.tar.bz2) = bbe626feb5c81c1b7e7d3199d558bc5c560b2d4aef377d0e4b4227ae3c7176e6
-SIZE (aspell-gv-0.50-0.tar.bz2) = 69462
-MD5 (aspell6-he-0.9-0.tar.bz2) = f453989e1df364af9479e893c16ac9d8
-SHA256 (aspell6-he-0.9-0.tar.bz2) = 1960486db21a4ad273a0f91627c00afd9f49e5a27daf655e0ac8d6378e333b7f
-SIZE (aspell6-he-0.9-0.tar.bz2) = 144899
-MD5 (aspell6-hi-0.01-0.tar.bz2) = 4c46324ec0d7d7567d266349387b373f
-SHA256 (aspell6-hi-0.01-0.tar.bz2) = 274bc69601615a8e685230f641c44ecdd8390563cacb5ea1c3a85cb426ee3932
-SIZE (aspell6-hi-0.01-0.tar.bz2) = 51021
-MD5 (aspell5-hil-0.11-0.tar.bz2) = 6ce553007a773a1c2ffd68b660ddb60b
-SHA256 (aspell5-hil-0.11-0.tar.bz2) = 570a374fd0b97943bc6893cf25ac7b23da815120842a80144e2c7ee8b41388e8
-SIZE (aspell5-hil-0.11-0.tar.bz2) = 46288
-MD5 (aspell-hr-0.51-0.tar.bz2) = 7d2fb9af47266884c731691123a95a8d
-SHA256 (aspell-hr-0.51-0.tar.bz2) = 2ac4030354d7961e45d63b46e06e59248d59cc70dfc9e1d8ee0ae21d9c774a25
-SIZE (aspell-hr-0.51-0.tar.bz2) = 208118
-MD5 (aspell6-hsb-0.01-1.tar.bz2) = b7a0e5fa5843f080bfce2b441f46d981
-SHA256 (aspell6-hsb-0.01-1.tar.bz2) = 77d810608dd637a5f6e545b5ac36f986877778c485efdef16fcfd7d918a10e8e
-SIZE (aspell6-hsb-0.01-1.tar.bz2) = 109026
-MD5 (aspell6-hu-0.99.4.2-0.tar.bz2) = 4f4e1e98019a89d0ebf43ec59ae68254
-SHA256 (aspell6-hu-0.99.4.2-0.tar.bz2) = 3335a7b45cf9774bccf03740fbddeb7ec4752dd87178fa93f92d4c71e3f236b5
-SIZE (aspell6-hu-0.99.4.2-0.tar.bz2) = 375949
-MD5 (aspell-ia-0.50-1.tar.bz2) = 36846c747a4cb7874b00f37752e83f25
-SHA256 (aspell-ia-0.50-1.tar.bz2) = 5797cb59606d007cf8fe5b9ec435de0d63b2d0e0d391ed8850ef8aa3f4bb0c2f
-SIZE (aspell-ia-0.50-1.tar.bz2) = 70883
-MD5 (aspell5-id-1.2-0.tar.bz2) = 9136385a6ce0ff0d113427ab3c974254
-SHA256 (aspell5-id-1.2-0.tar.bz2) = 523912082848d891746dbb233f2ddb2cdbab6750dc76c38b3f6e000c9eb37308
-SIZE (aspell5-id-1.2-0.tar.bz2) = 76958
-MD5 (aspell-is-0.51.1-0.tar.bz2) = 1e0b6125d91d7edad710482ddcce2d23
-SHA256 (aspell-is-0.51.1-0.tar.bz2) = 3035bd29dad929ce66e6acdc7c29670df458e0d13fe178241b212f481111e3d6
-SIZE (aspell-is-0.51.1-0.tar.bz2) = 323850
-MD5 (aspell6-it-2.2_20050523-0.tar.bz2) = b1217299a0b67d1e121494d7ec18a88d
-SHA256 (aspell6-it-2.2_20050523-0.tar.bz2) = 3b19dc709924783c8d87111aa9653dc6c000e845183778abee750215d83aaebd
-SIZE (aspell6-it-2.2_20050523-0.tar.bz2) = 216189
-MD5 (aspell6-la-20020503-0.tar.bz2) = d42c679b95ba9b094aaa65f118834bf6
-SHA256 (aspell6-la-20020503-0.tar.bz2) = d486b048d1c3056d3a555744584a81873a63ecd4641f04e8b7bf9910b98d2985
-SIZE (aspell6-la-20020503-0.tar.bz2) = 42722
-MD5 (aspell6-lt-1.1+cvs20060103-0.tar.bz2) = ee034ad7cefa51e8b6b531f5ade527a6
-SHA256 (aspell6-lt-1.1+cvs20060103-0.tar.bz2) = dd846ada7cfb42b6106543163d045adc78dfe938b3f32ae1da2525bb82b0fa9f
-SIZE (aspell6-lt-1.1+cvs20060103-0.tar.bz2) = 153912
-MD5 (aspell6-lv-0.5.5-1.tar.bz2) = cd120047c0b160a40361cbf03913e91f
-SHA256 (aspell6-lv-0.5.5-1.tar.bz2) = 3c30e206ea562b2e759fb7467680e1a01d5deec5edbd66653c83184550d1fb8a
-SIZE (aspell6-lv-0.5.5-1.tar.bz2) = 72416
-MD5 (aspell-mi-0.50-0.tar.bz2) = 8b1a07032ee086662bfe44a2e0459db4
-SHA256 (aspell-mi-0.50-0.tar.bz2) = beee1e33baf6301e3ffc56558c84c3e7d29622541b232c1aea1e91d12ebd7d89
-SIZE (aspell-mi-0.50-0.tar.bz2) = 57818
-MD5 (aspell-mk-0.50-0.tar.bz2) = 50e15df6b68e78d1baa789f517b2401b
-SHA256 (aspell-mk-0.50-0.tar.bz2) = 15fc2380fb673d2003d8075d8cef2b0dbb4d30b430587ad459257681904d9971
-SIZE (aspell-mk-0.50-0.tar.bz2) = 122690
-MD5 (aspell6-mn-0.01-0.tar.bz2) = 20aa91b99ce5e7a2b4168711398f5dfe
-SHA256 (aspell6-mn-0.01-0.tar.bz2) = aadf3a7b93a5d36ea9c045cfcb3b0dc7916fbb08e09117f56c055eb6c485b047
-SIZE (aspell6-mn-0.01-0.tar.bz2) = 35446
-MD5 (aspell6-mr-0.10-0.tar.bz2) = 489ac0c368d3012525134758f8572cac
-SHA256 (aspell6-mr-0.10-0.tar.bz2) = d3a35a40bee0234a5b388375485ab8bf0ba8edbf3b0a82e2c2f76a40a8586f33
-SIZE (aspell6-mr-0.10-0.tar.bz2) = 151720
-MD5 (aspell-ms-0.50-0.tar.bz2) = cfdd94bba4781766c5d870202abd60e0
-SHA256 (aspell-ms-0.50-0.tar.bz2) = 3cc4e3537bb0f455ce58b4d2fa84b03dc678e0153536a41dee1a3a7623dc246f
-SIZE (aspell-ms-0.50-0.tar.bz2) = 50368
-MD5 (aspell-mt-0.50-0.tar.bz2) = 6df98356e411891c956c249731b708fa
-SHA256 (aspell-mt-0.50-0.tar.bz2) = e00fcaad60a90cfed687ba02f62be8c27b8650457dd3c5bdcb064b476da059b4
-SIZE (aspell-mt-0.50-0.tar.bz2) = 124114
-MD5 (aspell-nb-0.50.1-0.tar.bz2) = d1173a5ce04f39e9c93183da691e7ce8
-SHA256 (aspell-nb-0.50.1-0.tar.bz2) = e7746e8b617b2df576c1172399544818084524504202b16c747f52db5e5d228a
-SIZE (aspell-nb-0.50.1-0.tar.bz2) = 423161
-MD5 (aspell6-nds-0.01-0.tar.bz2) = 76b2b3f2bdeefdfc6ce75ae11c9ae149
-SHA256 (aspell6-nds-0.01-0.tar.bz2) = ce381e869def56e54a31f965df518deca0e6f12238859650fcb115623f8772da
-SIZE (aspell6-nds-0.01-0.tar.bz2) = 32658
-MD5 (aspell-nl-0.50-2.tar.bz2) = c3ef9fd7dc4c47d816eee9ef5149c76a
-SHA256 (aspell-nl-0.50-2.tar.bz2) = 440e0b7df8c5903d728221fe4ba88a74658ce14c8bb04b290c41402dfd41cb39
-SIZE (aspell-nl-0.50-2.tar.bz2) = 428365
-MD5 (aspell-nn-0.50.1-1.tar.bz2) = 3711eb9df68f25262af10119579239bc
-SHA256 (aspell-nn-0.50.1-1.tar.bz2) = ac6610540c7e134f09cbebbd148f9316bef27bc491e377638ef4e2950b2d5370
-SIZE (aspell-nn-0.50.1-1.tar.bz2) = 335156
-MD5 (aspell5-ny-0.01-0.tar.bz2) = 856906a424fcbc50cc925d692d294215
-SHA256 (aspell5-ny-0.01-0.tar.bz2) = 176f970f6ba3bb448c7e946fa8d209eb4da7138ac6899af7731a98c7b6484b3e
-SIZE (aspell5-ny-0.01-0.tar.bz2) = 22952
-MD5 (aspell6-or-0.03-1.tar.bz2) = 6c9d702607eaa43ef665007c4b857ba4
-SHA256 (aspell6-or-0.03-1.tar.bz2) = d6ffa369f8918d74cdea966112bc5cb700e09dca5ac6b968660cfc22044ef24f
-SIZE (aspell6-or-0.03-1.tar.bz2) = 20525
-MD5 (aspell6-pa-0.01-1.tar.bz2) = de336d6ef55ad6fa81f8903765c6c95d
-SHA256 (aspell6-pa-0.01-1.tar.bz2) = c7f3abb1c5efe62e072ca8bef44b0d0506501bbb7b48ced1d0d95f10e61fc945
-SIZE (aspell6-pa-0.01-1.tar.bz2) = 22143
-MD5 (aspell-pl-0.51-0.tar.bz2) = 5435be1c9c39326a02e2798d8b4d257b
-SHA256 (aspell-pl-0.51-0.tar.bz2) = a71ce4dbc3d6d0adcf386b1776e359fff57f0ba422d338e8d1fe9569a2646ca8
-SIZE (aspell-pl-0.51-0.tar.bz2) = 624458
-MD5 (aspell-pt-0.50-2.tar.bz2) = e4e15179f90b76ec0336b687d1293edd
-SHA256 (aspell-pt-0.50-2.tar.bz2) = 4acbffe03b918cf32b340949d0f167df9073190d347a092f45d4e400a09b2fa6
-SIZE (aspell-pt-0.50-2.tar.bz2) = 201341
-MD5 (aspell6-qu-0.02-0.tar.bz2) = b1c4a68fd5f46cadb600d925b0764fa5
-SHA256 (aspell6-qu-0.02-0.tar.bz2) = 80977629b8425bda7ffd951628d23a6793a457f4948151c71ff9e0bff5073f01
-SIZE (aspell6-qu-0.02-0.tar.bz2) = 85541
-MD5 (aspell-ro-0.50-2.tar.bz2) = 96d97a79a0a0e04c580e0d0671d650c9
-SHA256 (aspell-ro-0.50-2.tar.bz2) = ba25d1aa9b6a6288e7a785a49fce81f1fbfb4269237c4730661f876d6d0cf4ec
-SIZE (aspell-ro-0.50-2.tar.bz2) = 64110
-MD5 (aspell6-ru-0.99f7-1.tar.bz2) = c4c98eaa5e77ad3adccbc5c96cb57cb3
-SHA256 (aspell6-ru-0.99f7-1.tar.bz2) = 5c29b6ccce57bc3f7c4fb0510d330446b9c769e59c92bdfede27333808b6e646
-SIZE (aspell6-ru-0.99f7-1.tar.bz2) = 427312
-MD5 (aspell-rw-0.50-0.tar.bz2) = d369916c4f4159b04e43daf31dde60c9
-SHA256 (aspell-rw-0.50-0.tar.bz2) = 3406102e0e33344b6eae73dbfaf86d8e411b7c97775827a6db79c943ce43f081
-SIZE (aspell-rw-0.50-0.tar.bz2) = 21821
-MD5 (aspell5-sc-1.0.tar.bz2) = 05284890c3445c5850a3c1410790a057
-SHA256 (aspell5-sc-1.0.tar.bz2) = 591ae22f712b472182b41b8bc97dce1e5ecd240c75eccc25f59ab15c60be8742
-SIZE (aspell5-sc-1.0.tar.bz2) = 281538
-MD5 (aspell-sk-0.52-0.tar.bz2) = ce90b109f7c602bde949880920bbbbfd
-SHA256 (aspell-sk-0.52-0.tar.bz2) = b506542d8c63d935efc9760a392b23fd5dd5683822b26a5ce724241f2c013563
-SIZE (aspell-sk-0.52-0.tar.bz2) = 383840
-MD5 (aspell-sl-0.50-0.tar.bz2) = c4c11402bc834d796d1b56e711470480
-SHA256 (aspell-sl-0.50-0.tar.bz2) = e566d127f7130da2df7b1f4f4cb4bc51932517b0c24299f84498ba325e6133d1
-SIZE (aspell-sl-0.50-0.tar.bz2) = 215463
-MD5 (aspell6-sr-0.02.tar.bz2) = a068ba095e7246fd3bbc92e7d0287998
-SHA256 (aspell6-sr-0.02.tar.bz2) = 705e58fb390633c89c4cb224a1cfb34e67e09496448f7adc6500494b6e009289
-SIZE (aspell6-sr-0.02.tar.bz2) = 574923
-MD5 (aspell-sv-0.51-0.tar.bz2) = d180c781f8986ea0f65b6b18f02a494e
-SHA256 (aspell-sv-0.51-0.tar.bz2) = 9b70573c9c8cf76f5cdb6abcdfb834a754bbaa1efd7d6f57f47b8a91a19c5c0a
-SIZE (aspell-sv-0.51-0.tar.bz2) = 93942
-MD5 (aspell-sw-0.50-0.tar.bz2) = 26ccc3500d7f7c288b74bba1c1fab38f
-SHA256 (aspell-sw-0.50-0.tar.bz2) = 7ed51f107dc57a7b3555f20d1cee2903275d63e022b055ea6b6409d9e081f297
-SIZE (aspell-sw-0.50-0.tar.bz2) = 102172
-MD5 (aspell6-ta-20040424-1.tar.bz2) = fc98b0b8d79291448d3a4f48ebbf2bd0
-SHA256 (aspell6-ta-20040424-1.tar.bz2) = 52f552f1a2c0fc53ed4eac75990ff75bccf3d5f1440ca3d948d96eafe5f3486a
-SIZE (aspell6-ta-20040424-1.tar.bz2) = 44452
-MD5 (aspell6-te-0.01-2.tar.bz2) = 645f7f7204520552cddbe1c9ae64df2a
-SHA256 (aspell6-te-0.01-2.tar.bz2) = 3682638a757a65afcc770e565e68347e8eb7be94052d9d6eff64fc767e7fec5d
-SIZE (aspell6-te-0.01-2.tar.bz2) = 310738
-MD5 (aspell5-tet-0.1.1.tar.bz2) = 6a18e0253d7d6baa49daca513b0d782b
-SHA256 (aspell5-tet-0.1.1.tar.bz2) = 9dd546c9c48f42085e3c17f22c8e6d46e56f3ea9c4618b933c642a091df1c09e
-SIZE (aspell5-tet-0.1.1.tar.bz2) = 33044
-MD5 (aspell5-tl-0.02-1.tar.bz2) = 126437909424021a553055b1b96fdf73
-SHA256 (aspell5-tl-0.02-1.tar.bz2) = 48b65d2c6886f353d1e1756a93bcd4d8ab2b88b021176c25dfdb5d8bcf348acd
-SIZE (aspell5-tl-0.02-1.tar.bz2) = 40642
-MD5 (aspell5-tn-1.0.1-0.tar.bz2) = 6e5ef98452b36a211a4fc1fdbadda322
-SHA256 (aspell5-tn-1.0.1-0.tar.bz2) = 41a0c20e1d2acaa28a647d74b40778e491815566019f79e7049621f40d3bbd60
-SIZE (aspell5-tn-1.0.1-0.tar.bz2) = 22127
-MD5 (aspell-tr-0.50-0.tar.bz2) = 432ecdc4e5233da0a4c1a52ed9103fa2
-SHA256 (aspell-tr-0.50-0.tar.bz2) = 0bc6530e5eebf8b2b53f1e8add596c62099173f62b9baa6b3efaa86752bdfb4a
-SIZE (aspell-tr-0.50-0.tar.bz2) = 84846
-MD5 (aspell6-uk-1.1-0.tar.bz2) = f3ffe52d86b83a394ce29e88bd3ef9d2
-SHA256 (aspell6-uk-1.1-0.tar.bz2) = dcd569dd0bae8060a39769dd353556bf042b1e2d074e5c57fe53e6b1210560b8
-SIZE (aspell6-uk-1.1-0.tar.bz2) = 179098
-MD5 (aspell6-uz-0.5-0.tar.bz2) = 6115c0cf725964c6f1eaa21040824b86
-SHA256 (aspell6-uz-0.5-0.tar.bz2) = aa6eb06169f885c309aa6d7d48ff0a0c4a39ee87eb2937166fcb76708e791565
-SIZE (aspell6-uz-0.5-0.tar.bz2) = 71160
-MD5 (aspell6-vi-0.01.1-1.tar.bz2) = 314185e521900df0fab8375fa609bba2
-SHA256 (aspell6-vi-0.01.1-1.tar.bz2) = 3cd85d53bb62b0d104cb5c03e142c3bbe1ad64329d7beae057854816dc7e7c17
-SIZE (aspell6-vi-0.01.1-1.tar.bz2) = 30843
-MD5 (aspell-wa-0.50-0.tar.bz2) = e3817402d7be19d4b0d0342d3a5970ea
-SHA256 (aspell-wa-0.50-0.tar.bz2) = 5a17aa8aa37afbcc8f52336476670b93cba16462bcb89dd46b80f4d9cfe73fe4
-SIZE (aspell-wa-0.50-0.tar.bz2) = 50363
-MD5 (aspell6-yi-0.01.1-1.tar.bz2) = 9d514384bf00cfb9ceb0d5f78f998d93
-SHA256 (aspell6-yi-0.01.1-1.tar.bz2) = 9879d35a5b0b86f8e217601568480f2f634bc8b7a97341e9e80b0d40a8202856
-SIZE (aspell6-yi-0.01.1-1.tar.bz2) = 74382
-MD5 (aspell-zu-0.50-0.tar.bz2) = 2478cbbb6abaf5ed74bc2da7e7152116
-SHA256 (aspell-zu-0.50-0.tar.bz2) = 3fa255cd0b20e6229a53df972fd3c5ed8481db11cfd0347dd3da629bbb7a6796
-SIZE (aspell-zu-0.50-0.tar.bz2) = 168226
diff --git a/textproc/aspell/files/aspell.ver.in b/textproc/aspell/files/aspell.ver.in
new file mode 100644
index 000000000000..6c43688340e7
--- /dev/null
+++ b/textproc/aspell/files/aspell.ver.in
@@ -0,0 +1,3 @@
+# $FreeBSD$
+# Installed by textproc/aspell, please don't edit manually!
+VER= %%VERINST%%
diff --git a/textproc/aspell/files/verdict b/textproc/aspell/files/verdict
deleted file mode 100644
index 0d1195320e5b..000000000000
--- a/textproc/aspell/files/verdict
+++ /dev/null
@@ -1,78 +0,0 @@
-VERDICT_AF= -af-0.50-0
-VERDICT_AM= 6-am-0.03-1
-VERDICT_AZ= 6-az-0.02-0
-VERDICT_BE= 5-be-0.01
-VERDICT_BG= 5-bg-4.0-0
-VERDICT_BN= 6-bn-0.01.1-1
-VERDICT_BR= -br-0.50-1
-VERDICT_CA= 6-ca-20040130-1
-VERDICT_CS= -cs-0.51-0
-VERDICT_CSB= 6-csb-0.02-0
-VERDICT_CY= -cy-0.50-3
-VERDICT_DA= 5-da-1.4.42-1
-VERDICT_DE= 6-de-20030222-1
-VERDICT_DE-ALT= 6-de-alt-2.1-1
-VERDICT_EL= -el-0.50-3
-VERDICT_EN= 6-en-6.0-0
-VERDICT_EO= -eo-0.50-2
-VERDICT_ES= -es-0.50-2
-VERDICT_ET= 6-et-0.1.21-1
-VERDICT_FA= 6-fa-0.02-0
-VERDICT_FI= 6-fi-0.7-0
-VERDICT_FO= 5-fo-0.2.16-1
-VERDICT_FR= -fr-0.50-3
-VERDICT_GA= 5-ga-3.6-0
-VERDICT_GD= 5-gd-0.1.1-1
-VERDICT_GL= -gl-0.50-0
-VERDICT_GU= 6-gu-0.02-0
-VERDICT_GV= -gv-0.50-0
-VERDICT_HE= 6-he-0.9-0
-VERDICT_HI= 6-hi-0.01-0
-VERDICT_HIL= 5-hil-0.11-0
-VERDICT_HR= -hr-0.51-0
-VERDICT_HSB= 6-hsb-0.01-1
-VERDICT_HU= 6-hu-0.99.4.2-0
-VERDICT_IA= -ia-0.50-1
-VERDICT_ID= 5-id-1.2-0
-VERDICT_IS= -is-0.51.1-0
-VERDICT_IT= 6-it-2.2_20050523-0
-VERDICT_LA= 6-la-20020503-0
-VERDICT_LT= 6-lt-1.1+cvs20060103-0
-VERDICT_LV= 6-lv-0.5.5-1
-VERDICT_MI= -mi-0.50-0
-VERDICT_MK= -mk-0.50-0
-VERDICT_MN= 6-mn-0.01-0
-VERDICT_MR= 6-mr-0.10-0
-VERDICT_MS= -ms-0.50-0
-VERDICT_MT= -mt-0.50-0
-VERDICT_NB= -nb-0.50.1-0
-VERDICT_NDS= 6-nds-0.01-0
-VERDICT_NL= -nl-0.50-2
-VERDICT_NN= -nn-0.50.1-1
-VERDICT_NY= 5-ny-0.01-0
-VERDICT_OR= 6-or-0.03-1
-VERDICT_PA= 6-pa-0.01-1
-VERDICT_PL= -pl-0.51-0
-VERDICT_PT= -pt-0.50-2
-VERDICT_QU= 6-qu-0.02-0
-VERDICT_RO= -ro-0.50-2
-VERDICT_RU= 6-ru-0.99f7-1
-VERDICT_RW= -rw-0.50-0
-VERDICT_SC= 5-sc-1.0
-VERDICT_SK= -sk-0.52-0
-VERDICT_SL= -sl-0.50-0
-VERDICT_SR= 6-sr-0.02
-VERDICT_SV= -sv-0.51-0
-VERDICT_SW= -sw-0.50-0
-VERDICT_TA= 6-ta-20040424-1
-VERDICT_TE= 6-te-0.01-2
-VERDICT_TET= 5-tet-0.1.1
-VERDICT_TL= 5-tl-0.02-1
-VERDICT_TN= 5-tn-1.0.1-0
-VERDICT_TR= -tr-0.50-0
-VERDICT_UK= 6-uk-1.1-0
-VERDICT_UZ= 6-uz-0.5-0
-VERDICT_VI= 6-vi-0.01.1-1
-VERDICT_WA= -wa-0.50-0
-VERDICT_YI= 6-yi-0.01.1-1
-VERDICT_ZU= -zu-0.50-0
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 84f0aa000b31..6f530105f193 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -9,6 +9,7 @@ bin/pspell-config
bin/run-with-aspell
%%SCRIPTS%%bin/spell
bin/word-list-compress
+etc/aspell.ver
include/aspell.h
include/pspell/pspell.h
lib/aspell-%%VER%%/cp1250.cmap
diff --git a/textproc/aspell/pkg-plist.de-alt b/textproc/aspell/pkg-plist.de-alt
deleted file mode 100644
index 470cbdb016d9..000000000000
--- a/textproc/aspell/pkg-plist.de-alt
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/aspell-%%VER%%/de-alt.dat
-lib/aspell-%%VER%%/de-alt_affix.dat
-lib/aspell-%%VER%%/de-alt_phonet.dat
-share/aspell/de-alt.multi
-share/aspell/de-alt.rws
-share/aspell/deutsch-alt.alias
-share/aspell/german-old.alias
diff --git a/textproc/az-aspell/Makefile b/textproc/az-aspell/Makefile
index 7fb29725a74f..610f7a2b21e6 100644
--- a/textproc/az-aspell/Makefile
+++ b/textproc/az-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= az-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-az-0.02-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Azerbaijani dictionary
+COMMENT= Aspell Azerbaijani dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= az
-ASPELL_AZ= beli
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/az-aspell/distinfo b/textproc/az-aspell/distinfo
new file mode 100644
index 000000000000..c0f30e2155c3
--- /dev/null
+++ b/textproc/az-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-az-0.02-0.tar.bz2) = 24d9d46c8fc23197666a43a7962a7b0d
+SHA256 (aspell6-az-0.02-0.tar.bz2) = 063176ec459d61acd59450ae49b5076e42abb1dcd54c1f934bae5fa6658044c3
+SIZE (aspell6-az-0.02-0.tar.bz2) = 50588
diff --git a/textproc/az-aspell/pkg-descr b/textproc/az-aspell/pkg-descr
index 0ebc5d6a34ec..3e573fcb844a 100644
--- a/textproc/az-aspell/pkg-descr
+++ b/textproc/az-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Azerbaijani dictionary.
+Aspell Azerbaijani dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.az b/textproc/az-aspell/pkg-plist
index 12e222d04a63..12e222d04a63 100644
--- a/textproc/aspell/pkg-plist.az
+++ b/textproc/az-aspell/pkg-plist
diff --git a/textproc/be-aspell/Makefile b/textproc/be-aspell/Makefile
index 83da5cf60ebc..83aeb8ec211b 100644
--- a/textproc/be-aspell/Makefile
+++ b/textproc/be-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= be-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-be-0.01
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Belarusian dictionary
+COMMENT= Aspell Belarusian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= be
-ASPELL_BE= tak
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/be-aspell/distinfo b/textproc/be-aspell/distinfo
new file mode 100644
index 000000000000..c5566d7020a4
--- /dev/null
+++ b/textproc/be-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-be-0.01.tar.bz2) = 61314a1672f98571b32d23486bbd43be
+SHA256 (aspell5-be-0.01.tar.bz2) = 550bad0c03a142241ffe5ecc183659d80020b566003a05341cd1e97c6ed274eb
+SIZE (aspell5-be-0.01.tar.bz2) = 653405
diff --git a/textproc/be-aspell/pkg-descr b/textproc/be-aspell/pkg-descr
index 3a65e7a8246e..68f7d0f537aa 100644
--- a/textproc/be-aspell/pkg-descr
+++ b/textproc/be-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Belarusian dictionary.
+Aspell Belarusian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.be b/textproc/be-aspell/pkg-plist
index 3c3e579459f6..3c3e579459f6 100644
--- a/textproc/aspell/pkg-plist.be
+++ b/textproc/be-aspell/pkg-plist
diff --git a/textproc/bg-aspell/Makefile b/textproc/bg-aspell/Makefile
index 3e25288a23a7..6b617603db9a 100644
--- a/textproc/bg-aspell/Makefile
+++ b/textproc/bg-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= bg-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-bg-4.0-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Bulgarian dictionary
+COMMENT= Aspell Bulgarian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= bg
-ASPELL_BG= da
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/bg-aspell/distinfo b/textproc/bg-aspell/distinfo
new file mode 100644
index 000000000000..322e963c9a14
--- /dev/null
+++ b/textproc/bg-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-bg-4.0-0.tar.bz2) = f1d9f1587cc382f10f1c7ac0a2600833
+SHA256 (aspell5-bg-4.0-0.tar.bz2) = af7091e426449d071a5d0e03bd6e231d68e26409880d91c11081631ead40da21
+SIZE (aspell5-bg-4.0-0.tar.bz2) = 176676
diff --git a/textproc/bg-aspell/pkg-descr b/textproc/bg-aspell/pkg-descr
index 1603e1770515..0fb76bf8ce3b 100644
--- a/textproc/bg-aspell/pkg-descr
+++ b/textproc/bg-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Bulgarian dictionary.
+Aspell Bulgarian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.bg b/textproc/bg-aspell/pkg-plist
index 023dedb85efd..023dedb85efd 100644
--- a/textproc/aspell/pkg-plist.bg
+++ b/textproc/bg-aspell/pkg-plist
diff --git a/textproc/bn-aspell/Makefile b/textproc/bn-aspell/Makefile
index 2f66c5dd5fc0..757f62d8eb95 100644
--- a/textproc/bn-aspell/Makefile
+++ b/textproc/bn-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= bn-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-bn-0.01.1-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Bengali dictionary
+COMMENT= Aspell Bengali dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= bn
-ASPELL_BN= ha
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/bn-aspell/distinfo b/textproc/bn-aspell/distinfo
new file mode 100644
index 000000000000..e942ee273073
--- /dev/null
+++ b/textproc/bn-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-bn-0.01.1-1.tar.bz2) = 5ea70ec74e67f49b2844d306ddf38388
+SHA256 (aspell6-bn-0.01.1-1.tar.bz2) = b03f9cc4feb00df9bfd697b032f4f4ae838ad5a6bb41db798eefc5639a1480d9
+SIZE (aspell6-bn-0.01.1-1.tar.bz2) = 117436
diff --git a/textproc/bn-aspell/pkg-descr b/textproc/bn-aspell/pkg-descr
index e50f30a36d30..91b978b20007 100644
--- a/textproc/bn-aspell/pkg-descr
+++ b/textproc/bn-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Bengali dictionary.
+Aspell Bengali dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.bn b/textproc/bn-aspell/pkg-plist
index a8a91be6b16b..a8a91be6b16b 100644
--- a/textproc/aspell/pkg-plist.bn
+++ b/textproc/bn-aspell/pkg-plist
diff --git a/textproc/br-aspell/Makefile b/textproc/br-aspell/Makefile
index 01047c5225c4..8fa33af671f8 100644
--- a/textproc/br-aspell/Makefile
+++ b/textproc/br-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= br-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -br-0.50-1
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Breton dictionary
+COMMENT= Aspell Breton dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= br
-ASPELL_BR= ya
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/br-aspell/distinfo b/textproc/br-aspell/distinfo
new file mode 100644
index 000000000000..d9a6d5d08d2f
--- /dev/null
+++ b/textproc/br-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-br-0.50-1.tar.bz2) = 52efaf08d791e1a0c5056e2b3f6bf47d
+SHA256 (aspell-br-0.50-1.tar.bz2) = 699749933a9446a06ba78e32e4b05ae3dd41382e9b9613fb8dc2a08263972d94
+SIZE (aspell-br-0.50-1.tar.bz2) = 67834
diff --git a/textproc/br-aspell/pkg-descr b/textproc/br-aspell/pkg-descr
index c68a05031927..fe6bf33e3504 100644
--- a/textproc/br-aspell/pkg-descr
+++ b/textproc/br-aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Breton dictionary.
+Aspell Breton dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.br b/textproc/br-aspell/pkg-plist
index 7c0979b7524b..7c0979b7524b 100644
--- a/textproc/aspell/pkg-plist.br
+++ b/textproc/br-aspell/pkg-plist
diff --git a/textproc/ca-aspell/Makefile b/textproc/ca-aspell/Makefile
index 99f9b5ea2243..5967ccae60b0 100644
--- a/textproc/ca-aspell/Makefile
+++ b/textproc/ca-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= ca-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-ca-20040130-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Catalan dictionary
+COMMENT= Aspell Catalan dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= ca
-ASPELL_CA= sķ
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/ca-aspell/distinfo b/textproc/ca-aspell/distinfo
new file mode 100644
index 000000000000..38df194ed76c
--- /dev/null
+++ b/textproc/ca-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-ca-20040130-1.tar.bz2) = 5dfeebdfbe68556e70abfa95dd775263
+SHA256 (aspell6-ca-20040130-1.tar.bz2) = a531b7764ebdb91655e2c5dac8a3625480b675579f16e64d1fd4409f6c6c672f
+SIZE (aspell6-ca-20040130-1.tar.bz2) = 222986
diff --git a/textproc/ca-aspell/pkg-descr b/textproc/ca-aspell/pkg-descr
index 65c3f25cc823..20bab623d5dc 100644
--- a/textproc/ca-aspell/pkg-descr
+++ b/textproc/ca-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Catalan dictionary.
+Aspell Catalan dictionary.
WWW: http://aspell.sourceforge.net/
diff --git a/textproc/aspell/pkg-plist.ca b/textproc/ca-aspell/pkg-plist
index f17f86aa572d..f17f86aa572d 100644
--- a/textproc/aspell/pkg-plist.ca
+++ b/textproc/ca-aspell/pkg-plist
diff --git a/textproc/cs-aspell/Makefile b/textproc/cs-aspell/Makefile
index 0bd66d67b3af..fc3093446da7 100644
--- a/textproc/cs-aspell/Makefile
+++ b/textproc/cs-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= cs-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -cs-0.51-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Czech dictionary
+COMMENT= Aspell Czech dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= cs
-ASPELL_CS= ano
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/cs-aspell/distinfo b/textproc/cs-aspell/distinfo
new file mode 100644
index 000000000000..143ea551b31c
--- /dev/null
+++ b/textproc/cs-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-cs-0.51-0.tar.bz2) = 4be28bef4385ef46e80547ce8cdc4535
+SHA256 (aspell-cs-0.51-0.tar.bz2) = 7c56c5cd6e74d60749e68effa9dc45cb282cb3bb6a9c56b51f7594a72216ea47
+SIZE (aspell-cs-0.51-0.tar.bz2) = 626618
diff --git a/textproc/cs-aspell/pkg-descr b/textproc/cs-aspell/pkg-descr
index 5bb91b098b34..9b183669bf67 100644
--- a/textproc/cs-aspell/pkg-descr
+++ b/textproc/cs-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Czech dictionary.
+Aspell Czech dictionary.
WWW: http://aspell.sourceforge.net/
diff --git a/textproc/aspell/pkg-plist.cs b/textproc/cs-aspell/pkg-plist
index 70f3f2fbfdcc..70f3f2fbfdcc 100644
--- a/textproc/aspell/pkg-plist.cs
+++ b/textproc/cs-aspell/pkg-plist
diff --git a/textproc/csb-aspell/Makefile b/textproc/csb-aspell/Makefile
index 7e0e8dd13314..616543d71d08 100644
--- a/textproc/csb-aspell/Makefile
+++ b/textproc/csb-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= csb-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-csb-0.02-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Kashubian dictionary
+COMMENT= Aspell Kashubian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= csb
-ASPELL_CSB= yo
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/csb-aspell/distinfo b/textproc/csb-aspell/distinfo
new file mode 100644
index 000000000000..6f01b9c7abcf
--- /dev/null
+++ b/textproc/csb-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-csb-0.02-0.tar.bz2) = 0d4b408076115b7516c68887a563be68
+SHA256 (aspell6-csb-0.02-0.tar.bz2) = c166ad07d50e9e13ac9f87d5a8938b3f675a0f8a01017bd8969c2053e7f52298
+SIZE (aspell6-csb-0.02-0.tar.bz2) = 32694
diff --git a/textproc/csb-aspell/pkg-descr b/textproc/csb-aspell/pkg-descr
index 0f48746c3c83..bb8be8984630 100644
--- a/textproc/csb-aspell/pkg-descr
+++ b/textproc/csb-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Kashubian dictionary.
+Aspell Kashubian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.csb b/textproc/csb-aspell/pkg-plist
index aa664391983f..aa664391983f 100644
--- a/textproc/aspell/pkg-plist.csb
+++ b/textproc/csb-aspell/pkg-plist
diff --git a/textproc/cy-aspell/Makefile b/textproc/cy-aspell/Makefile
index 7eea4d45eccf..2fa732766174 100644
--- a/textproc/cy-aspell/Makefile
+++ b/textproc/cy-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= cy-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -cy-0.50-3
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Welsh dictionary
+COMMENT= Aspell Welsh dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= cy
-ASPELL_CY= ie
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/cy-aspell/distinfo b/textproc/cy-aspell/distinfo
new file mode 100644
index 000000000000..07b7f7f1a97d
--- /dev/null
+++ b/textproc/cy-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-cy-0.50-3.tar.bz2) = d59fee193dba87973b38ac2862a090bb
+SHA256 (aspell-cy-0.50-3.tar.bz2) = d5399dcd70061e5ed5af1214eb580f62864dd35ea4fa1ec2882ffc4f03307897
+SIZE (aspell-cy-0.50-3.tar.bz2) = 117652
diff --git a/textproc/cy-aspell/pkg-descr b/textproc/cy-aspell/pkg-descr
index 89327470e25b..15b9a97d7ff3 100644
--- a/textproc/cy-aspell/pkg-descr
+++ b/textproc/cy-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Welsh dictionary.
+Aspell Welsh dictionary.
WWW: http://www.hebffinia.com/geiriadur/
diff --git a/textproc/aspell/pkg-plist.cy b/textproc/cy-aspell/pkg-plist
index be6f939ae494..be6f939ae494 100644
--- a/textproc/aspell/pkg-plist.cy
+++ b/textproc/cy-aspell/pkg-plist
diff --git a/textproc/da-aspell/Makefile b/textproc/da-aspell/Makefile
index 55b29d8a5672..0f3486c0a015 100644
--- a/textproc/da-aspell/Makefile
+++ b/textproc/da-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= da-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-da-1.4.42-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Danish dictionary
+COMMENT= Aspell Danish dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= da
-ASPELL_DA= ja
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/da-aspell/distinfo b/textproc/da-aspell/distinfo
new file mode 100644
index 000000000000..702c732f5bfb
--- /dev/null
+++ b/textproc/da-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-da-1.4.42-1.tar.bz2) = d14c03dca23b572606279d7317b022d0
+SHA256 (aspell5-da-1.4.42-1.tar.bz2) = f74a079617979c1623e8e7313e4ecd3bc260db92ce55b1f2a3a5e7077dacd3c1
+SIZE (aspell5-da-1.4.42-1.tar.bz2) = 317688
diff --git a/textproc/da-aspell/pkg-descr b/textproc/da-aspell/pkg-descr
index 2b16bf2c6bb6..74cccb3d2e1e 100644
--- a/textproc/da-aspell/pkg-descr
+++ b/textproc/da-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Danish dictionary.
+Aspell Danish dictionary.
WWW: http://da.speling.org/
diff --git a/textproc/aspell/pkg-plist.da b/textproc/da-aspell/pkg-plist
index 87f680834102..87f680834102 100644
--- a/textproc/aspell/pkg-plist.da
+++ b/textproc/da-aspell/pkg-plist
diff --git a/textproc/el-aspell/Makefile b/textproc/el-aspell/Makefile
index 2e629c40f978..ca5bb06a3db8 100644
--- a/textproc/el-aspell/Makefile
+++ b/textproc/el-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= el-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -el-0.50-3
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Greek dictionary
+COMMENT= Aspell Greek dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= el
-ASPELL_EL= ne
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/el-aspell/distinfo b/textproc/el-aspell/distinfo
new file mode 100644
index 000000000000..e3a713f611e4
--- /dev/null
+++ b/textproc/el-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-el-0.50-3.tar.bz2) = 0ea2c42ceb9b91f7f5de2c017234ad37
+SHA256 (aspell-el-0.50-3.tar.bz2) = 3f6508937dcaa64a6c70ee5f722f088b46b202a6409961b93b705d4ec4f56380
+SIZE (aspell-el-0.50-3.tar.bz2) = 328225
diff --git a/textproc/el-aspell/pkg-descr b/textproc/el-aspell/pkg-descr
index eee1d497aadb..30f8f2898783 100644
--- a/textproc/el-aspell/pkg-descr
+++ b/textproc/el-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Greek dictionary.
+Aspell Greek dictionary.
WWW: http://ispell.source.gr/index_aspell.html
diff --git a/textproc/aspell/pkg-plist.el b/textproc/el-aspell/pkg-plist
index 8c9961a8091a..8c9961a8091a 100644
--- a/textproc/aspell/pkg-plist.el
+++ b/textproc/el-aspell/pkg-plist
diff --git a/textproc/en-aspell/Makefile b/textproc/en-aspell/Makefile
new file mode 100644
index 000000000000..b4b5ba6f0b7a
--- /dev/null
+++ b/textproc/en-aspell/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: en-aspell
+# Date created: Fri Sep 17 2004
+# Whom: Serge Gagnon <ser_gagnon@sympatico.ca>
+#
+# $FreeBSD$
+#
+
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-en-6.0-0
+CATEGORIES= textproc
+
+MAINTAINER= thierry@FreeBSD.org
+COMMENT= Aspell English dictionaries
+
+DICT= en
+
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/en-aspell/distinfo b/textproc/en-aspell/distinfo
new file mode 100644
index 000000000000..f9a69cbdc510
--- /dev/null
+++ b/textproc/en-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-en-6.0-0.tar.bz2) = 16449e0a266e1ecc526b2f3cd39d4bc2
+SHA256 (aspell6-en-6.0-0.tar.bz2) = 24f0688711d2b893fa06c16d14d0aa3a8000e326226b839aad32611f7ace4898
+SIZE (aspell6-en-6.0-0.tar.bz2) = 182442
diff --git a/textproc/en-aspell/pkg-descr b/textproc/en-aspell/pkg-descr
new file mode 100644
index 000000000000..1b78c6de64a5
--- /dev/null
+++ b/textproc/en-aspell/pkg-descr
@@ -0,0 +1,7 @@
+Aspell English dictionaries.
+
+Note: if you have installed textproc/aspell, English dictionaries have already
+ been installed; this port is only useful if you had previously installed
+ textproc/aspell-without-dicten.
+
+WWW: http://aspell.sourceforge.net/
diff --git a/textproc/en-aspell/pkg-plist b/textproc/en-aspell/pkg-plist
new file mode 100644
index 000000000000..87033d58d0a1
--- /dev/null
+++ b/textproc/en-aspell/pkg-plist
@@ -0,0 +1,57 @@
+lib/aspell-%%VER%%/en.dat
+lib/aspell-%%VER%%/en_affix.dat
+lib/aspell-%%VER%%/en_phonet.dat
+share/aspell/american-w_accents.alias
+share/aspell/american-wo_accents.alias
+share/aspell/american.alias
+share/aspell/british-ise-w_accents.alias
+share/aspell/british-ise-wo_accents.alias
+share/aspell/british-ise.alias
+share/aspell/british-ize-w_accents.alias
+share/aspell/british-ize-wo_accents.alias
+share/aspell/british-ize.alias
+share/aspell/british-w_accents.alias
+share/aspell/british-wo_accents.alias
+share/aspell/british.alias
+share/aspell/canadian-w_accents.alias
+share/aspell/canadian-wo_accents.alias
+share/aspell/canadian.alias
+share/aspell/en-common.rws
+share/aspell/en-variant_0.multi
+share/aspell/en-variant_0.rws
+share/aspell/en-variant_1.multi
+share/aspell/en-variant_1.rws
+share/aspell/en-variant_2.multi
+share/aspell/en-variant_2.rws
+share/aspell/en-w_accents.multi
+share/aspell/en-wo_accents.multi
+share/aspell/en.multi
+share/aspell/en_CA-w_accents-only.rws
+share/aspell/en_CA-w_accents.multi
+share/aspell/en_CA-wo_accents-only.rws
+share/aspell/en_CA-wo_accents.multi
+share/aspell/en_CA.multi
+share/aspell/en_GB-ise-w_accents-only.rws
+share/aspell/en_GB-ise-w_accents.multi
+share/aspell/en_GB-ise-wo_accents-only.rws
+share/aspell/en_GB-ise-wo_accents.multi
+share/aspell/en_GB-ise.multi
+share/aspell/en_GB-ize-w_accents-only.rws
+share/aspell/en_GB-ize-w_accents.multi
+share/aspell/en_GB-ize-wo_accents-only.rws
+share/aspell/en_GB-ize-wo_accents.multi
+share/aspell/en_GB-ize.multi
+share/aspell/en_GB-w_accents.multi
+share/aspell/en_GB-wo_accents.multi
+share/aspell/en_GB.multi
+share/aspell/en_US-w_accents-only.rws
+share/aspell/en_US-w_accents.multi
+share/aspell/en_US-wo_accents-only.rws
+share/aspell/en_US-wo_accents.multi
+share/aspell/en_US.multi
+share/aspell/english-variant_0.alias
+share/aspell/english-variant_1.alias
+share/aspell/english-variant_2.alias
+share/aspell/english-w_accents.alias
+share/aspell/english-wo_accents.alias
+share/aspell/english.alias
diff --git a/textproc/eo-aspell/Makefile b/textproc/eo-aspell/Makefile
index 004478ee9b63..3766cb07a65d 100644
--- a/textproc/eo-aspell/Makefile
+++ b/textproc/eo-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= eo-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -eo-0.50-2
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Esperanto dictionary
+COMMENT= Aspell Esperanto dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= eo
-ASPELL_EO= jes
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/eo-aspell/distinfo b/textproc/eo-aspell/distinfo
new file mode 100644
index 000000000000..1836f295907e
--- /dev/null
+++ b/textproc/eo-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-eo-0.50-2.tar.bz2) = f84147f5909e1a5f7adb86f27c71eb8c
+SHA256 (aspell-eo-0.50-2.tar.bz2) = 6c61a64297804afd4ddf21660caecf1c966dd57e577789b045e9d9944a6d70a7
+SIZE (aspell-eo-0.50-2.tar.bz2) = 89703
diff --git a/textproc/eo-aspell/pkg-descr b/textproc/eo-aspell/pkg-descr
index 4c34ba16bd6b..c298a45c3431 100644
--- a/textproc/eo-aspell/pkg-descr
+++ b/textproc/eo-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Esperanto dictionary.
+Aspell Esperanto dictionary.
WWW: http://aspell.sourceforge.net/
diff --git a/textproc/aspell/pkg-plist.eo b/textproc/eo-aspell/pkg-plist
index a49e02c6a52c..a49e02c6a52c 100644
--- a/textproc/aspell/pkg-plist.eo
+++ b/textproc/eo-aspell/pkg-plist
diff --git a/textproc/es-aspell/Makefile b/textproc/es-aspell/Makefile
index 6c442c401dde..e4f7820e8c2b 100644
--- a/textproc/es-aspell/Makefile
+++ b/textproc/es-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= es-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -es-0.50-2
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Spanish dictionary
+COMMENT= Aspell Spanish dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= es
-ASPELL_ES= sķ
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/es-aspell/distinfo b/textproc/es-aspell/distinfo
new file mode 100644
index 000000000000..c96addb5dba3
--- /dev/null
+++ b/textproc/es-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-es-0.50-2.tar.bz2) = 4a8583e9ef9f4aed03f5a7fe09d40060
+SHA256 (aspell-es-0.50-2.tar.bz2) = 5c0e2a32d44196fb0375e72d44e730fd365d62e53ade077fb1653ccbb8ee2645
+SIZE (aspell-es-0.50-2.tar.bz2) = 157809
diff --git a/textproc/es-aspell/pkg-descr b/textproc/es-aspell/pkg-descr
index 696248bf15f3..ff42cf0dd995 100644
--- a/textproc/es-aspell/pkg-descr
+++ b/textproc/es-aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Spanish dictionary.
+Aspell Spanish dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.es b/textproc/es-aspell/pkg-plist
index 68c0eea3a729..68c0eea3a729 100644
--- a/textproc/aspell/pkg-plist.es
+++ b/textproc/es-aspell/pkg-plist
diff --git a/textproc/et-aspell/Makefile b/textproc/et-aspell/Makefile
index 3ec1bcc7fac1..e2e96dd3769e 100644
--- a/textproc/et-aspell/Makefile
+++ b/textproc/et-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= et-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-et-0.1.21-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Estonian dictionary
+COMMENT= Aspell Estonian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= et
-ASPELL_ET= jah
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/et-aspell/distinfo b/textproc/et-aspell/distinfo
new file mode 100644
index 000000000000..a91a8ec39ec0
--- /dev/null
+++ b/textproc/et-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-et-0.1.21-1.tar.bz2) = 82929f49ddc1149b6ef2bde4c3c12bcd
+SHA256 (aspell6-et-0.1.21-1.tar.bz2) = b1e857aa3daaea2a19462b2671e87c26a7eb7337c83b709685394eed8472b249
+SIZE (aspell6-et-0.1.21-1.tar.bz2) = 338155
diff --git a/textproc/et-aspell/pkg-descr b/textproc/et-aspell/pkg-descr
index 30c99322b32e..9638c31c662f 100644
--- a/textproc/et-aspell/pkg-descr
+++ b/textproc/et-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Estonian dictionary.
+Aspell Estonian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.et b/textproc/et-aspell/pkg-plist
index b8b9d8301d2e..b8b9d8301d2e 100644
--- a/textproc/aspell/pkg-plist.et
+++ b/textproc/et-aspell/pkg-plist
diff --git a/textproc/fa-aspell/Makefile b/textproc/fa-aspell/Makefile
index 9578c58e157e..7e210c499918 100644
--- a/textproc/fa-aspell/Makefile
+++ b/textproc/fa-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= fa-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-fa-0.02-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Persian (Farsi) dictionary
+COMMENT= Aspell Persian (Farsi) dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= fa
-ASPELL_FA= bale
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/fa-aspell/distinfo b/textproc/fa-aspell/distinfo
new file mode 100644
index 000000000000..66765a8ce480
--- /dev/null
+++ b/textproc/fa-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-fa-0.02-0.tar.bz2) = 4583ef4b8b2456f737e3d60ede1e9034
+SHA256 (aspell6-fa-0.02-0.tar.bz2) = fa79312cd28f8fa948cf14b7400c3c8bd6c246e00c9204147c855028627f3486
+SIZE (aspell6-fa-0.02-0.tar.bz2) = 97168
diff --git a/textproc/fa-aspell/pkg-descr b/textproc/fa-aspell/pkg-descr
index e7897b1521e0..fac6658a6cf7 100644
--- a/textproc/fa-aspell/pkg-descr
+++ b/textproc/fa-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Persian (Farsi) dictionary.
+Aspell Persian (Farsi) dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.fa b/textproc/fa-aspell/pkg-plist
index 2367ddbd2dad..2367ddbd2dad 100644
--- a/textproc/aspell/pkg-plist.fa
+++ b/textproc/fa-aspell/pkg-plist
diff --git a/textproc/fi-aspell/Makefile b/textproc/fi-aspell/Makefile
index 3518b47da6e0..1ea52d798c8e 100644
--- a/textproc/fi-aspell/Makefile
+++ b/textproc/fi-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= fi-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-fi-0.7-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Finnish dictionary
+COMMENT= Aspell Finnish dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= fi
-ASPELL_FI= kyllä
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/fi-aspell/distinfo b/textproc/fi-aspell/distinfo
new file mode 100644
index 000000000000..0478e37dd5e3
--- /dev/null
+++ b/textproc/fi-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-fi-0.7-0.tar.bz2) = 6d1032116982c0efab1af8fce83259c0
+SHA256 (aspell6-fi-0.7-0.tar.bz2) = f8d7f07b4511e606eb56392ddaa76fd29918006331795e5942ad11b510d0a51d
+SIZE (aspell6-fi-0.7-0.tar.bz2) = 209249
diff --git a/textproc/fi-aspell/pkg-descr b/textproc/fi-aspell/pkg-descr
index 7cd2d7916c3d..91c07f16196c 100644
--- a/textproc/fi-aspell/pkg-descr
+++ b/textproc/fi-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Finnish dictionary.
+Aspell Finnish dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.fi b/textproc/fi-aspell/pkg-plist
index 90efed69f784..90efed69f784 100644
--- a/textproc/aspell/pkg-plist.fi
+++ b/textproc/fi-aspell/pkg-plist
diff --git a/textproc/fo-aspell/Makefile b/textproc/fo-aspell/Makefile
index 9825f1d13dc8..52bad5808032 100644
--- a/textproc/fo-aspell/Makefile
+++ b/textproc/fo-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= fo-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-fo-0.2.16-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Faroese dictionary
+COMMENT= Aspell Faroese dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= fo
-ASPELL_FO= yes
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/fo-aspell/distinfo b/textproc/fo-aspell/distinfo
new file mode 100644
index 000000000000..5ba48a564003
--- /dev/null
+++ b/textproc/fo-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-fo-0.2.16-1.tar.bz2) = a57e8870c272931da41cd1fc5a291f3d
+SHA256 (aspell5-fo-0.2.16-1.tar.bz2) = f7e0ddc039bb4f5c142d39dab72d9dfcb951f5e46779f6e3cf1d084a69f95e08
+SIZE (aspell5-fo-0.2.16-1.tar.bz2) = 165901
diff --git a/textproc/fo-aspell/pkg-descr b/textproc/fo-aspell/pkg-descr
index a642ebf4a612..f71240746103 100644
--- a/textproc/fo-aspell/pkg-descr
+++ b/textproc/fo-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Faroese dictionary.
+Aspell Faroese dictionary.
WWW: http://fo.speling.org/
diff --git a/textproc/aspell/pkg-plist.fo b/textproc/fo-aspell/pkg-plist
index 07d971435f0f..07d971435f0f 100644
--- a/textproc/aspell/pkg-plist.fo
+++ b/textproc/fo-aspell/pkg-plist
diff --git a/textproc/ga-aspell/Makefile b/textproc/ga-aspell/Makefile
index d920ae246f84..2764483b17e9 100644
--- a/textproc/ga-aspell/Makefile
+++ b/textproc/ga-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= ga-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-ga-3.6-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Irish (Gaelic) dictionary
+COMMENT= Aspell Irish (Gaelic) dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= ga
-ASPELL_GA= yes
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/ga-aspell/distinfo b/textproc/ga-aspell/distinfo
new file mode 100644
index 000000000000..c0b17caa6152
--- /dev/null
+++ b/textproc/ga-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-ga-3.6-0.tar.bz2) = 69b1e0c06f039340302336506080efde
+SHA256 (aspell5-ga-3.6-0.tar.bz2) = 1f87d107f7763a3e8414277663cb8aceb56521364c107c160ab64b641121fdb8
+SIZE (aspell5-ga-3.6-0.tar.bz2) = 539910
diff --git a/textproc/ga-aspell/pkg-descr b/textproc/ga-aspell/pkg-descr
index f8c8f8de0455..c356f8fad93a 100644
--- a/textproc/ga-aspell/pkg-descr
+++ b/textproc/ga-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Irish (Gaelic) dictionary.
+Aspell Irish (Gaelic) dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.ga b/textproc/ga-aspell/pkg-plist
index 52a9d7e311df..52a9d7e311df 100644
--- a/textproc/aspell/pkg-plist.ga
+++ b/textproc/ga-aspell/pkg-plist
diff --git a/textproc/gd-aspell/Makefile b/textproc/gd-aspell/Makefile
index 8cbdf55272e9..981501be5712 100644
--- a/textproc/gd-aspell/Makefile
+++ b/textproc/gd-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= gd-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-gd-0.1.1-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Scottish Gaelic dictionary
+COMMENT= Aspell Scottish Gaelic dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= gd
-ASPELL_GD= aidh
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/gd-aspell/distinfo b/textproc/gd-aspell/distinfo
new file mode 100644
index 000000000000..4fdf5a62a1d5
--- /dev/null
+++ b/textproc/gd-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-gd-0.1.1-1.tar.bz2) = 171673ec92270f58f945c4317286220b
+SHA256 (aspell5-gd-0.1.1-1.tar.bz2) = e316a08a75da8a0d4d15eb892023073a971e0a326382a5532db29856768e0929
+SIZE (aspell5-gd-0.1.1-1.tar.bz2) = 51167
diff --git a/textproc/gd-aspell/pkg-descr b/textproc/gd-aspell/pkg-descr
index 02d498e55de5..426aa83e9ca6 100644
--- a/textproc/gd-aspell/pkg-descr
+++ b/textproc/gd-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Scottish Gaelic dictionary.
+Aspell Scottish Gaelic dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.gd b/textproc/gd-aspell/pkg-plist
index daacc274a7ee..daacc274a7ee 100644
--- a/textproc/aspell/pkg-plist.gd
+++ b/textproc/gd-aspell/pkg-plist
diff --git a/textproc/gl-aspell/Makefile b/textproc/gl-aspell/Makefile
index 296a34799aa3..8c669f019f11 100644
--- a/textproc/gl-aspell/Makefile
+++ b/textproc/gl-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= gl-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -gl-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Galician dictionary
+COMMENT= Aspell Galician dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= gl
-ASPELL_GL= si
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/gl-aspell/distinfo b/textproc/gl-aspell/distinfo
new file mode 100644
index 000000000000..b2ee2b1a9ba2
--- /dev/null
+++ b/textproc/gl-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-gl-0.50-0.tar.bz2) = 0cd3c4e3e325e080689657f03eff8e8e
+SHA256 (aspell-gl-0.50-0.tar.bz2) = 96833bc8301e0ff5fbb3b162f900237e0e806a204f9cae5e005998762cb48f4c
+SIZE (aspell-gl-0.50-0.tar.bz2) = 112313
diff --git a/textproc/gl-aspell/pkg-descr b/textproc/gl-aspell/pkg-descr
index 6161cb705b04..0825ac77541d 100644
--- a/textproc/gl-aspell/pkg-descr
+++ b/textproc/gl-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Galician dictionary.
+Aspell Galician dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.gl b/textproc/gl-aspell/pkg-plist
index 298c2ddfdf6c..298c2ddfdf6c 100644
--- a/textproc/aspell/pkg-plist.gl
+++ b/textproc/gl-aspell/pkg-plist
diff --git a/textproc/gu-aspell/Makefile b/textproc/gu-aspell/Makefile
index 8bf899e01a2c..3be4392f362c 100644
--- a/textproc/gu-aspell/Makefile
+++ b/textproc/gu-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= gu-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-gu-0.02-0
+CATEGORIES= textproc
MAINTAINER= thierry@FreeBSD.org
-COMMENT= Aspell with Gujarati dictionary
+COMMENT= Aspell Gujarati dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= gu
-ASPELL_GU= au
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/gu-aspell/distinfo b/textproc/gu-aspell/distinfo
new file mode 100644
index 000000000000..166e448f87a3
--- /dev/null
+++ b/textproc/gu-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-gu-0.02-0.tar.bz2) = 42d3eb8a32a020aea56cd3e6ea3de0e1
+SHA256 (aspell6-gu-0.02-0.tar.bz2) = 1ab8c1337fbd8e40bcbd5f9ab18a7d3308844b1f2b269dd9cb0f4cff25a0dfa4
+SIZE (aspell6-gu-0.02-0.tar.bz2) = 30949
diff --git a/textproc/gu-aspell/pkg-descr b/textproc/gu-aspell/pkg-descr
index e321d0fc9234..b97b9aff84a0 100644
--- a/textproc/gu-aspell/pkg-descr
+++ b/textproc/gu-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Gujarati dictionary.
+Aspell Gujarati dictionary.
WWW: http://utkarsh.org/dictionary/
diff --git a/textproc/aspell/pkg-plist.gu b/textproc/gu-aspell/pkg-plist
index 18bba28978af..18bba28978af 100644
--- a/textproc/aspell/pkg-plist.gu
+++ b/textproc/gu-aspell/pkg-plist
diff --git a/textproc/gv-aspell/Makefile b/textproc/gv-aspell/Makefile
index af2caaec1cd2..df9d224bd7d4 100644
--- a/textproc/gv-aspell/Makefile
+++ b/textproc/gv-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= gv-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -gv-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Manx Gaelic dictionary
+COMMENT= Aspell Manx Gaelic dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= gv
-ASPELL_GV= seadh
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/gv-aspell/distinfo b/textproc/gv-aspell/distinfo
new file mode 100644
index 000000000000..f788b61641b0
--- /dev/null
+++ b/textproc/gv-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-gv-0.50-0.tar.bz2) = 139b5aa1f5ea85fb7a4be0338039e959
+SHA256 (aspell-gv-0.50-0.tar.bz2) = bbe626feb5c81c1b7e7d3199d558bc5c560b2d4aef377d0e4b4227ae3c7176e6
+SIZE (aspell-gv-0.50-0.tar.bz2) = 69462
diff --git a/textproc/gv-aspell/pkg-descr b/textproc/gv-aspell/pkg-descr
index 1716688d5122..474a4bc44fa3 100644
--- a/textproc/gv-aspell/pkg-descr
+++ b/textproc/gv-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Manx Gaelic dictionary.
+Aspell Manx Gaelic dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.gv b/textproc/gv-aspell/pkg-plist
index 15e2665c7b99..15e2665c7b99 100644
--- a/textproc/aspell/pkg-plist.gv
+++ b/textproc/gv-aspell/pkg-plist
diff --git a/textproc/hi-aspell/Makefile b/textproc/hi-aspell/Makefile
index e0214a29b9a6..b2c8bc29f88d 100644
--- a/textproc/hi-aspell/Makefile
+++ b/textproc/hi-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= hi-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-hi-0.01-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Hindi dictionary
+COMMENT= Aspell Hindi dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= hi
-ASPELL_HI= ha
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/hi-aspell/distinfo b/textproc/hi-aspell/distinfo
new file mode 100644
index 000000000000..674b52268351
--- /dev/null
+++ b/textproc/hi-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-hi-0.01-0.tar.bz2) = 4c46324ec0d7d7567d266349387b373f
+SHA256 (aspell6-hi-0.01-0.tar.bz2) = 274bc69601615a8e685230f641c44ecdd8390563cacb5ea1c3a85cb426ee3932
+SIZE (aspell6-hi-0.01-0.tar.bz2) = 51021
diff --git a/textproc/hi-aspell/pkg-descr b/textproc/hi-aspell/pkg-descr
index 00ec17f93538..028dc7d1969b 100644
--- a/textproc/hi-aspell/pkg-descr
+++ b/textproc/hi-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Hindi dictionary.
+Aspell Hindi dictionary.
WWW: http://www.janabhaaratii.org.in/janabhaaratii/page_gen.php?lang=en&body=/aspell/aspell.html
diff --git a/textproc/aspell/pkg-plist.hi b/textproc/hi-aspell/pkg-plist
index 39d3c12b2a4a..39d3c12b2a4a 100644
--- a/textproc/aspell/pkg-plist.hi
+++ b/textproc/hi-aspell/pkg-plist
diff --git a/textproc/hil-aspell/Makefile b/textproc/hil-aspell/Makefile
index 47942acd41c7..828dd06ef877 100644
--- a/textproc/hil-aspell/Makefile
+++ b/textproc/hil-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= hil-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-hil-0.11-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Hiligaynon dictionary
+COMMENT= Aspell Hiligaynon dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= hil
-ASPELL_HIL= hu-o
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/hil-aspell/distinfo b/textproc/hil-aspell/distinfo
new file mode 100644
index 000000000000..aae3cc281c3c
--- /dev/null
+++ b/textproc/hil-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-hil-0.11-0.tar.bz2) = 6ce553007a773a1c2ffd68b660ddb60b
+SHA256 (aspell5-hil-0.11-0.tar.bz2) = 570a374fd0b97943bc6893cf25ac7b23da815120842a80144e2c7ee8b41388e8
+SIZE (aspell5-hil-0.11-0.tar.bz2) = 46288
diff --git a/textproc/hil-aspell/pkg-descr b/textproc/hil-aspell/pkg-descr
index 032ebe73bb45..0e80ce7093c1 100644
--- a/textproc/hil-aspell/pkg-descr
+++ b/textproc/hil-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Hiligaynon dictionary.
+Aspell Hiligaynon dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.hil b/textproc/hil-aspell/pkg-plist
index 55e7e50c1cf9..55e7e50c1cf9 100644
--- a/textproc/aspell/pkg-plist.hil
+++ b/textproc/hil-aspell/pkg-plist
diff --git a/textproc/hr-aspell/Makefile b/textproc/hr-aspell/Makefile
index 0bd217afee3b..ceb761ad2eae 100644
--- a/textproc/hr-aspell/Makefile
+++ b/textproc/hr-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= hr-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -hr-0.51-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Croatian dictionary
+COMMENT= Aspell Croatian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= hr
-ASPELL_HR= da
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/hr-aspell/distinfo b/textproc/hr-aspell/distinfo
new file mode 100644
index 000000000000..2ead22d93ae0
--- /dev/null
+++ b/textproc/hr-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-hr-0.51-0.tar.bz2) = 7d2fb9af47266884c731691123a95a8d
+SHA256 (aspell-hr-0.51-0.tar.bz2) = 2ac4030354d7961e45d63b46e06e59248d59cc70dfc9e1d8ee0ae21d9c774a25
+SIZE (aspell-hr-0.51-0.tar.bz2) = 208118
diff --git a/textproc/hr-aspell/pkg-descr b/textproc/hr-aspell/pkg-descr
index 3de33ea0bf9f..56dd0ce856d5 100644
--- a/textproc/hr-aspell/pkg-descr
+++ b/textproc/hr-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Croatian dictionary.
+Aspell Croatian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.hr b/textproc/hr-aspell/pkg-plist
index c1b874210bab..c1b874210bab 100644
--- a/textproc/aspell/pkg-plist.hr
+++ b/textproc/hr-aspell/pkg-plist
diff --git a/textproc/hsb-aspell/Makefile b/textproc/hsb-aspell/Makefile
index 0ff83eee7cc9..d87c7e0003e2 100644
--- a/textproc/hsb-aspell/Makefile
+++ b/textproc/hsb-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= hsb-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-hsb-0.01-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Upper Sorbian dictionary
+COMMENT= Aspell Upper Sorbian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= hsb
-ASPELL_HSB= haj
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/hsb-aspell/distinfo b/textproc/hsb-aspell/distinfo
new file mode 100644
index 000000000000..1cac4f88777d
--- /dev/null
+++ b/textproc/hsb-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-hsb-0.01-1.tar.bz2) = b7a0e5fa5843f080bfce2b441f46d981
+SHA256 (aspell6-hsb-0.01-1.tar.bz2) = 77d810608dd637a5f6e545b5ac36f986877778c485efdef16fcfd7d918a10e8e
+SIZE (aspell6-hsb-0.01-1.tar.bz2) = 109026
diff --git a/textproc/hsb-aspell/pkg-descr b/textproc/hsb-aspell/pkg-descr
index 0ffe32fa21b6..d2b62b3d43ec 100644
--- a/textproc/hsb-aspell/pkg-descr
+++ b/textproc/hsb-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Upper Sorbian dictionary.
+Aspell Upper Sorbian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.hsb b/textproc/hsb-aspell/pkg-plist
index aa3dfa462c37..aa3dfa462c37 100644
--- a/textproc/aspell/pkg-plist.hsb
+++ b/textproc/hsb-aspell/pkg-plist
diff --git a/textproc/ia-aspell/Makefile b/textproc/ia-aspell/Makefile
index 96527bdf4bb5..c3a89b353bd8 100644
--- a/textproc/ia-aspell/Makefile
+++ b/textproc/ia-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= ia-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -ia-0.50-1
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Interlingua dictionary
+COMMENT= Aspell Interlingua dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= ia
-ASPELL_IA= si
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/ia-aspell/distinfo b/textproc/ia-aspell/distinfo
new file mode 100644
index 000000000000..0e26a9b2dcba
--- /dev/null
+++ b/textproc/ia-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-ia-0.50-1.tar.bz2) = 36846c747a4cb7874b00f37752e83f25
+SHA256 (aspell-ia-0.50-1.tar.bz2) = 5797cb59606d007cf8fe5b9ec435de0d63b2d0e0d391ed8850ef8aa3f4bb0c2f
+SIZE (aspell-ia-0.50-1.tar.bz2) = 70883
diff --git a/textproc/ia-aspell/pkg-descr b/textproc/ia-aspell/pkg-descr
index ed3ae7e9a1b5..a75bc26667e6 100644
--- a/textproc/ia-aspell/pkg-descr
+++ b/textproc/ia-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Interlingua dictionary.
+Aspell Interlingua dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.ia b/textproc/ia-aspell/pkg-plist
index d4ecd6592e73..d4ecd6592e73 100644
--- a/textproc/aspell/pkg-plist.ia
+++ b/textproc/ia-aspell/pkg-plist
diff --git a/textproc/id-aspell/Makefile b/textproc/id-aspell/Makefile
index dd2d1a76ecb1..5a8d89b1b621 100644
--- a/textproc/id-aspell/Makefile
+++ b/textproc/id-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= id-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-id-1.2-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Indonesian dictionary
+COMMENT= Aspell Indonesian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= id
-ASPELL_ID= ya
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/id-aspell/distinfo b/textproc/id-aspell/distinfo
new file mode 100644
index 000000000000..a09ad5be738d
--- /dev/null
+++ b/textproc/id-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-id-1.2-0.tar.bz2) = 9136385a6ce0ff0d113427ab3c974254
+SHA256 (aspell5-id-1.2-0.tar.bz2) = 523912082848d891746dbb233f2ddb2cdbab6750dc76c38b3f6e000c9eb37308
+SIZE (aspell5-id-1.2-0.tar.bz2) = 76958
diff --git a/textproc/id-aspell/pkg-descr b/textproc/id-aspell/pkg-descr
index 569e5808e325..b4b931556041 100644
--- a/textproc/id-aspell/pkg-descr
+++ b/textproc/id-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Indonesian dictionary.
+Aspell Indonesian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.id b/textproc/id-aspell/pkg-plist
index ae153899bc35..ae153899bc35 100644
--- a/textproc/aspell/pkg-plist.id
+++ b/textproc/id-aspell/pkg-plist
diff --git a/textproc/is-aspell/Makefile b/textproc/is-aspell/Makefile
index 3e3478378b4d..d4df1a681701 100644
--- a/textproc/is-aspell/Makefile
+++ b/textproc/is-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= is-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -is-0.51.1-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Icelandic dictionary
+COMMENT= Aspell Icelandic dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= is
-ASPELL_IS= jį
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/is-aspell/distinfo b/textproc/is-aspell/distinfo
new file mode 100644
index 000000000000..819bf82f5205
--- /dev/null
+++ b/textproc/is-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-is-0.51.1-0.tar.bz2) = 1e0b6125d91d7edad710482ddcce2d23
+SHA256 (aspell-is-0.51.1-0.tar.bz2) = 3035bd29dad929ce66e6acdc7c29670df458e0d13fe178241b212f481111e3d6
+SIZE (aspell-is-0.51.1-0.tar.bz2) = 323850
diff --git a/textproc/is-aspell/pkg-descr b/textproc/is-aspell/pkg-descr
index 71e3e05f12e3..c215f1c889ba 100644
--- a/textproc/is-aspell/pkg-descr
+++ b/textproc/is-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Icelandic dictionary.
+Aspell Icelandic dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.is b/textproc/is-aspell/pkg-plist
index 6ffb2e838624..6ffb2e838624 100644
--- a/textproc/aspell/pkg-plist.is
+++ b/textproc/is-aspell/pkg-plist
diff --git a/textproc/it-aspell/Makefile b/textproc/it-aspell/Makefile
index 02529acf1587..b21f1e2b865f 100644
--- a/textproc/it-aspell/Makefile
+++ b/textproc/it-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= it-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-it-2.2_20050523-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Italian dictionary
+COMMENT= Aspell Italian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= it
-ASPELL_IT= sģ
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/it-aspell/distinfo b/textproc/it-aspell/distinfo
new file mode 100644
index 000000000000..5a1536ecdb12
--- /dev/null
+++ b/textproc/it-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-it-2.2_20050523-0.tar.bz2) = b1217299a0b67d1e121494d7ec18a88d
+SHA256 (aspell6-it-2.2_20050523-0.tar.bz2) = 3b19dc709924783c8d87111aa9653dc6c000e845183778abee750215d83aaebd
+SIZE (aspell6-it-2.2_20050523-0.tar.bz2) = 216189
diff --git a/textproc/it-aspell/pkg-descr b/textproc/it-aspell/pkg-descr
index aa99a6ff181d..f3d091ba1294 100644
--- a/textproc/it-aspell/pkg-descr
+++ b/textproc/it-aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Italian dictionary.
+Aspell Italian dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.it b/textproc/it-aspell/pkg-plist
index 767f4d48bbd4..767f4d48bbd4 100644
--- a/textproc/aspell/pkg-plist.it
+++ b/textproc/it-aspell/pkg-plist
diff --git a/textproc/la-aspell/Makefile b/textproc/la-aspell/Makefile
index 23affea989e4..e4df4e2d9a1a 100644
--- a/textproc/la-aspell/Makefile
+++ b/textproc/la-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= la-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-la-20020503-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Latin dictionary
+COMMENT= Aspell Latin dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= la
-ASPELL_LA= ita
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/la-aspell/distinfo b/textproc/la-aspell/distinfo
new file mode 100644
index 000000000000..8dcbd0f831be
--- /dev/null
+++ b/textproc/la-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-la-20020503-0.tar.bz2) = d42c679b95ba9b094aaa65f118834bf6
+SHA256 (aspell6-la-20020503-0.tar.bz2) = d486b048d1c3056d3a555744584a81873a63ecd4641f04e8b7bf9910b98d2985
+SIZE (aspell6-la-20020503-0.tar.bz2) = 42722
diff --git a/textproc/la-aspell/pkg-descr b/textproc/la-aspell/pkg-descr
index bedae7e6b245..3c243b0a6677 100644
--- a/textproc/la-aspell/pkg-descr
+++ b/textproc/la-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Latin dictionary.
+Aspell Latin dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.la b/textproc/la-aspell/pkg-plist
index 6eb382f064f7..6eb382f064f7 100644
--- a/textproc/aspell/pkg-plist.la
+++ b/textproc/la-aspell/pkg-plist
diff --git a/textproc/lt-aspell/Makefile b/textproc/lt-aspell/Makefile
index 0968042c7929..479981c5e3d8 100644
--- a/textproc/lt-aspell/Makefile
+++ b/textproc/lt-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= lt-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-lt-1.1+cvs20060103-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Lithuanian dictionary
+COMMENT= Aspell Lithuanian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= lt
-ASPELL_LT= taip
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/lt-aspell/distinfo b/textproc/lt-aspell/distinfo
new file mode 100644
index 000000000000..6bc20a7e89fd
--- /dev/null
+++ b/textproc/lt-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-lt-1.1+cvs20060103-0.tar.bz2) = ee034ad7cefa51e8b6b531f5ade527a6
+SHA256 (aspell6-lt-1.1+cvs20060103-0.tar.bz2) = dd846ada7cfb42b6106543163d045adc78dfe938b3f32ae1da2525bb82b0fa9f
+SIZE (aspell6-lt-1.1+cvs20060103-0.tar.bz2) = 153912
diff --git a/textproc/lt-aspell/pkg-descr b/textproc/lt-aspell/pkg-descr
index dc46feb5cfa9..44149c12b583 100644
--- a/textproc/lt-aspell/pkg-descr
+++ b/textproc/lt-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Lithuanian dictionary.
+Aspell Lithuanian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.lt b/textproc/lt-aspell/pkg-plist
index 6c15c89a7510..6c15c89a7510 100644
--- a/textproc/aspell/pkg-plist.lt
+++ b/textproc/lt-aspell/pkg-plist
diff --git a/textproc/lv-aspell/Makefile b/textproc/lv-aspell/Makefile
index 8cd45e3b44f9..fd957ae942d1 100644
--- a/textproc/lv-aspell/Makefile
+++ b/textproc/lv-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= lv-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-lv-0.5.5-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Latvian dictionary
+COMMENT= Aspell Latvian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= lv
-ASPELL_LV= ja
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/lv-aspell/distinfo b/textproc/lv-aspell/distinfo
new file mode 100644
index 000000000000..eeefad00e11b
--- /dev/null
+++ b/textproc/lv-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-lv-0.5.5-1.tar.bz2) = cd120047c0b160a40361cbf03913e91f
+SHA256 (aspell6-lv-0.5.5-1.tar.bz2) = 3c30e206ea562b2e759fb7467680e1a01d5deec5edbd66653c83184550d1fb8a
+SIZE (aspell6-lv-0.5.5-1.tar.bz2) = 72416
diff --git a/textproc/lv-aspell/pkg-descr b/textproc/lv-aspell/pkg-descr
index d26f30e685df..0704f271b83e 100644
--- a/textproc/lv-aspell/pkg-descr
+++ b/textproc/lv-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Latvian dictionary.
+Aspell Latvian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.lv b/textproc/lv-aspell/pkg-plist
index f76361767a44..f76361767a44 100644
--- a/textproc/aspell/pkg-plist.lv
+++ b/textproc/lv-aspell/pkg-plist
diff --git a/textproc/mi-aspell/Makefile b/textproc/mi-aspell/Makefile
index c2e00e9cbe16..4ca84309f452 100644
--- a/textproc/mi-aspell/Makefile
+++ b/textproc/mi-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= mi-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -mi-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Maori dictionary
+COMMENT= Aspell Maori dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= mi
-ASPELL_MI= ae
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/mi-aspell/distinfo b/textproc/mi-aspell/distinfo
new file mode 100644
index 000000000000..56a07de8c7cd
--- /dev/null
+++ b/textproc/mi-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-mi-0.50-0.tar.bz2) = 8b1a07032ee086662bfe44a2e0459db4
+SHA256 (aspell-mi-0.50-0.tar.bz2) = beee1e33baf6301e3ffc56558c84c3e7d29622541b232c1aea1e91d12ebd7d89
+SIZE (aspell-mi-0.50-0.tar.bz2) = 57818
diff --git a/textproc/mi-aspell/pkg-descr b/textproc/mi-aspell/pkg-descr
index 90d125385191..261545a612a1 100644
--- a/textproc/mi-aspell/pkg-descr
+++ b/textproc/mi-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Maori dictionary.
+Aspell Maori dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.mi b/textproc/mi-aspell/pkg-plist
index abd80a872297..abd80a872297 100644
--- a/textproc/aspell/pkg-plist.mi
+++ b/textproc/mi-aspell/pkg-plist
diff --git a/textproc/mk-aspell/Makefile b/textproc/mk-aspell/Makefile
index 6a396fbb1ca5..7e96bf4b3447 100644
--- a/textproc/mk-aspell/Makefile
+++ b/textproc/mk-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= mk-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -mk-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Macedonian dictionary
+COMMENT= Aspell Macedonian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= mk
-ASPELL_MK= da
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/mk-aspell/distinfo b/textproc/mk-aspell/distinfo
new file mode 100644
index 000000000000..9268eee5a7d8
--- /dev/null
+++ b/textproc/mk-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-mk-0.50-0.tar.bz2) = 50e15df6b68e78d1baa789f517b2401b
+SHA256 (aspell-mk-0.50-0.tar.bz2) = 15fc2380fb673d2003d8075d8cef2b0dbb4d30b430587ad459257681904d9971
+SIZE (aspell-mk-0.50-0.tar.bz2) = 122690
diff --git a/textproc/mk-aspell/pkg-descr b/textproc/mk-aspell/pkg-descr
index 4822ad943b09..93f3fe07b852 100644
--- a/textproc/mk-aspell/pkg-descr
+++ b/textproc/mk-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Macedonian dictionary.
+Aspell Macedonian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.mk b/textproc/mk-aspell/pkg-plist
index 42c3c36fac48..42c3c36fac48 100644
--- a/textproc/aspell/pkg-plist.mk
+++ b/textproc/mk-aspell/pkg-plist
diff --git a/textproc/mn-aspell/Makefile b/textproc/mn-aspell/Makefile
index 51d14e86317d..3717f692e997 100644
--- a/textproc/mn-aspell/Makefile
+++ b/textproc/mn-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= mn-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-mn-0.01-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Mongolian dictionary
+COMMENT= Aspell Mongolian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= mn
-ASPELL_MN= tiim
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/mn-aspell/distinfo b/textproc/mn-aspell/distinfo
new file mode 100644
index 000000000000..92970cccd4a9
--- /dev/null
+++ b/textproc/mn-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-mn-0.01-0.tar.bz2) = 20aa91b99ce5e7a2b4168711398f5dfe
+SHA256 (aspell6-mn-0.01-0.tar.bz2) = aadf3a7b93a5d36ea9c045cfcb3b0dc7916fbb08e09117f56c055eb6c485b047
+SIZE (aspell6-mn-0.01-0.tar.bz2) = 35446
diff --git a/textproc/mn-aspell/pkg-descr b/textproc/mn-aspell/pkg-descr
index b10b659f64aa..3ecac591992c 100644
--- a/textproc/mn-aspell/pkg-descr
+++ b/textproc/mn-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Mongolian dictionary.
+Aspell Mongolian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.mn b/textproc/mn-aspell/pkg-plist
index 7d0f001e4f0e..7d0f001e4f0e 100644
--- a/textproc/aspell/pkg-plist.mn
+++ b/textproc/mn-aspell/pkg-plist
diff --git a/textproc/mr-aspell/Makefile b/textproc/mr-aspell/Makefile
index 0c1934114fbd..3b440396ad93 100644
--- a/textproc/mr-aspell/Makefile
+++ b/textproc/mr-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= mr-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-mr-0.10-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Marathi dictionary
+COMMENT= Aspell Marathi dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= mr
-ASPELL_MR= a
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/mr-aspell/distinfo b/textproc/mr-aspell/distinfo
new file mode 100644
index 000000000000..36a0ca91c797
--- /dev/null
+++ b/textproc/mr-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-mr-0.10-0.tar.bz2) = 489ac0c368d3012525134758f8572cac
+SHA256 (aspell6-mr-0.10-0.tar.bz2) = d3a35a40bee0234a5b388375485ab8bf0ba8edbf3b0a82e2c2f76a40a8586f33
+SIZE (aspell6-mr-0.10-0.tar.bz2) = 151720
diff --git a/textproc/mr-aspell/pkg-descr b/textproc/mr-aspell/pkg-descr
index 6a35ed587bdc..0740d2502cfd 100644
--- a/textproc/mr-aspell/pkg-descr
+++ b/textproc/mr-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Marathi dictionary.
+Aspell Marathi dictionary.
WWW: http://www.janabhaaratii.org.in/janabhaaratii/page_gen.php?lang=en&body=/aspell/aspell.html
diff --git a/textproc/aspell/pkg-plist.mr b/textproc/mr-aspell/pkg-plist
index 1ce7cc3bcf18..1ce7cc3bcf18 100644
--- a/textproc/aspell/pkg-plist.mr
+++ b/textproc/mr-aspell/pkg-plist
diff --git a/textproc/ms-aspell/Makefile b/textproc/ms-aspell/Makefile
index 5869f2db6bc2..d5bdbc392f91 100644
--- a/textproc/ms-aspell/Makefile
+++ b/textproc/ms-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= ms-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -ms-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Malay dictionary
+COMMENT= Aspell Malay dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= ms
-ASPELL_MS= ya
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/ms-aspell/distinfo b/textproc/ms-aspell/distinfo
new file mode 100644
index 000000000000..7203436656e8
--- /dev/null
+++ b/textproc/ms-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-ms-0.50-0.tar.bz2) = cfdd94bba4781766c5d870202abd60e0
+SHA256 (aspell-ms-0.50-0.tar.bz2) = 3cc4e3537bb0f455ce58b4d2fa84b03dc678e0153536a41dee1a3a7623dc246f
+SIZE (aspell-ms-0.50-0.tar.bz2) = 50368
diff --git a/textproc/ms-aspell/pkg-descr b/textproc/ms-aspell/pkg-descr
index 11097cbfdfc3..a06f8d0f5b95 100644
--- a/textproc/ms-aspell/pkg-descr
+++ b/textproc/ms-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Malay dictionary.
+Aspell Malay dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.ms b/textproc/ms-aspell/pkg-plist
index cbc22a5434d0..cbc22a5434d0 100644
--- a/textproc/aspell/pkg-plist.ms
+++ b/textproc/ms-aspell/pkg-plist
diff --git a/textproc/mt-aspell/Makefile b/textproc/mt-aspell/Makefile
index e8dc5c309323..cdd687d37bb0 100644
--- a/textproc/mt-aspell/Makefile
+++ b/textproc/mt-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= mt-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -mt-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Maltese dictionary
+COMMENT= Aspell Maltese dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= mt
-ASPELL_MT= iva
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/mt-aspell/distinfo b/textproc/mt-aspell/distinfo
new file mode 100644
index 000000000000..3d02155178bd
--- /dev/null
+++ b/textproc/mt-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-mt-0.50-0.tar.bz2) = 6df98356e411891c956c249731b708fa
+SHA256 (aspell-mt-0.50-0.tar.bz2) = e00fcaad60a90cfed687ba02f62be8c27b8650457dd3c5bdcb064b476da059b4
+SIZE (aspell-mt-0.50-0.tar.bz2) = 124114
diff --git a/textproc/mt-aspell/pkg-descr b/textproc/mt-aspell/pkg-descr
index ebc006adfe5b..96bb0252e904 100644
--- a/textproc/mt-aspell/pkg-descr
+++ b/textproc/mt-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Maltese dictionary.
+Aspell Maltese dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.mt b/textproc/mt-aspell/pkg-plist
index 4434f2ca8468..4434f2ca8468 100644
--- a/textproc/aspell/pkg-plist.mt
+++ b/textproc/mt-aspell/pkg-plist
diff --git a/textproc/nb-aspell/Makefile b/textproc/nb-aspell/Makefile
index 0b974437ae32..537f92da3f22 100644
--- a/textproc/nb-aspell/Makefile
+++ b/textproc/nb-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= nb-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -nb-0.50.1-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Norwegian Bokmal dictionary
+COMMENT= Aspell Norwegian Bokmal dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= nb
-ASPELL_NB= ja
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/nb-aspell/distinfo b/textproc/nb-aspell/distinfo
new file mode 100644
index 000000000000..d2bc8f96b180
--- /dev/null
+++ b/textproc/nb-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-nb-0.50.1-0.tar.bz2) = d1173a5ce04f39e9c93183da691e7ce8
+SHA256 (aspell-nb-0.50.1-0.tar.bz2) = e7746e8b617b2df576c1172399544818084524504202b16c747f52db5e5d228a
+SIZE (aspell-nb-0.50.1-0.tar.bz2) = 423161
diff --git a/textproc/nb-aspell/pkg-descr b/textproc/nb-aspell/pkg-descr
index eb6a91753cd6..9a40fedca62b 100644
--- a/textproc/nb-aspell/pkg-descr
+++ b/textproc/nb-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Norwegian Bokmal dictionary.
+Aspell Norwegian Bokmal dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.nb b/textproc/nb-aspell/pkg-plist
index 557e957ca9ef..557e957ca9ef 100644
--- a/textproc/aspell/pkg-plist.nb
+++ b/textproc/nb-aspell/pkg-plist
diff --git a/textproc/nds-aspell/Makefile b/textproc/nds-aspell/Makefile
index 4b83b1b998c9..bec153c0a4e9 100644
--- a/textproc/nds-aspell/Makefile
+++ b/textproc/nds-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= nds-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-nds-0.01-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Low Saxon dictionary
+COMMENT= Aspell Low Saxon dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= nds
-ASPELL_NDS= jau
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/nds-aspell/distinfo b/textproc/nds-aspell/distinfo
new file mode 100644
index 000000000000..1c4de65bdbeb
--- /dev/null
+++ b/textproc/nds-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-nds-0.01-0.tar.bz2) = 76b2b3f2bdeefdfc6ce75ae11c9ae149
+SHA256 (aspell6-nds-0.01-0.tar.bz2) = ce381e869def56e54a31f965df518deca0e6f12238859650fcb115623f8772da
+SIZE (aspell6-nds-0.01-0.tar.bz2) = 32658
diff --git a/textproc/nds-aspell/pkg-descr b/textproc/nds-aspell/pkg-descr
index dea2b231ba17..e3b2216c2694 100644
--- a/textproc/nds-aspell/pkg-descr
+++ b/textproc/nds-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Low Saxon dictionary.
+Aspell Low Saxon dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.nds b/textproc/nds-aspell/pkg-plist
index 2a2c453e897c..2a2c453e897c 100644
--- a/textproc/aspell/pkg-plist.nds
+++ b/textproc/nds-aspell/pkg-plist
diff --git a/textproc/nl-aspell/Makefile b/textproc/nl-aspell/Makefile
index 5e97a1aa336b..440bb7fb6056 100644
--- a/textproc/nl-aspell/Makefile
+++ b/textproc/nl-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= nl-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -nl-0.50-2
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Dutch dictionary
+COMMENT= Aspell Dutch dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= nl
-ASPELL_NL= ja
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/nl-aspell/distinfo b/textproc/nl-aspell/distinfo
new file mode 100644
index 000000000000..8ae47c15e062
--- /dev/null
+++ b/textproc/nl-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-nl-0.50-2.tar.bz2) = c3ef9fd7dc4c47d816eee9ef5149c76a
+SHA256 (aspell-nl-0.50-2.tar.bz2) = 440e0b7df8c5903d728221fe4ba88a74658ce14c8bb04b290c41402dfd41cb39
+SIZE (aspell-nl-0.50-2.tar.bz2) = 428365
diff --git a/textproc/nl-aspell/pkg-descr b/textproc/nl-aspell/pkg-descr
index 247cd9457723..24e6b9bc37a0 100644
--- a/textproc/nl-aspell/pkg-descr
+++ b/textproc/nl-aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Dutch dictionary.
+Aspell Dutch dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.nl b/textproc/nl-aspell/pkg-plist
index 2ea928e7220b..2ea928e7220b 100644
--- a/textproc/aspell/pkg-plist.nl
+++ b/textproc/nl-aspell/pkg-plist
diff --git a/textproc/nn-aspell/Makefile b/textproc/nn-aspell/Makefile
index 4dd91c34b9b6..6299c70b292f 100644
--- a/textproc/nn-aspell/Makefile
+++ b/textproc/nn-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= nn-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -nn-0.50.1-1
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Norwegian Nynorsk dictionary
+COMMENT= Aspell Norwegian Nynorsk dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= nn
-ASPELL_NN= ja
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/nn-aspell/distinfo b/textproc/nn-aspell/distinfo
new file mode 100644
index 000000000000..882320a98566
--- /dev/null
+++ b/textproc/nn-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-nn-0.50.1-1.tar.bz2) = 3711eb9df68f25262af10119579239bc
+SHA256 (aspell-nn-0.50.1-1.tar.bz2) = ac6610540c7e134f09cbebbd148f9316bef27bc491e377638ef4e2950b2d5370
+SIZE (aspell-nn-0.50.1-1.tar.bz2) = 335156
diff --git a/textproc/nn-aspell/pkg-descr b/textproc/nn-aspell/pkg-descr
index 0c7f5b9e49c0..1d80e9f9a990 100644
--- a/textproc/nn-aspell/pkg-descr
+++ b/textproc/nn-aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Norwegian Nynorsk dictionary.
+Aspell Norwegian Nynorsk dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.nn b/textproc/nn-aspell/pkg-plist
index 4de0e5db9ebc..4de0e5db9ebc 100644
--- a/textproc/aspell/pkg-plist.nn
+++ b/textproc/nn-aspell/pkg-plist
diff --git a/textproc/ny-aspell/Makefile b/textproc/ny-aspell/Makefile
index 3749965fc5fd..eaeabd3fe142 100644
--- a/textproc/ny-aspell/Makefile
+++ b/textproc/ny-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= ny-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-ny-0.01-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Nyanja dictionary
+COMMENT= Aspell Nyanja dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= ny
-ASPELL_NY= inde
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/ny-aspell/distinfo b/textproc/ny-aspell/distinfo
new file mode 100644
index 000000000000..dc66ee292885
--- /dev/null
+++ b/textproc/ny-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-ny-0.01-0.tar.bz2) = 856906a424fcbc50cc925d692d294215
+SHA256 (aspell5-ny-0.01-0.tar.bz2) = 176f970f6ba3bb448c7e946fa8d209eb4da7138ac6899af7731a98c7b6484b3e
+SIZE (aspell5-ny-0.01-0.tar.bz2) = 22952
diff --git a/textproc/ny-aspell/pkg-descr b/textproc/ny-aspell/pkg-descr
index c759f4856c7c..1838bae441c7 100644
--- a/textproc/ny-aspell/pkg-descr
+++ b/textproc/ny-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Nyanja dictionary.
+Aspell Nyanja dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.ny b/textproc/ny-aspell/pkg-plist
index 5aefd8df84b6..5aefd8df84b6 100644
--- a/textproc/aspell/pkg-plist.ny
+++ b/textproc/ny-aspell/pkg-plist
diff --git a/textproc/or-aspell/Makefile b/textproc/or-aspell/Makefile
index 52a973690a83..a6bf5266ab51 100644
--- a/textproc/or-aspell/Makefile
+++ b/textproc/or-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= or-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-or-0.03-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Oriya dictionary
+COMMENT= Aspell Oriya dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= or
-ASPELL_OR= a
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/or-aspell/distinfo b/textproc/or-aspell/distinfo
new file mode 100644
index 000000000000..77d902d7e406
--- /dev/null
+++ b/textproc/or-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-or-0.03-1.tar.bz2) = 6c9d702607eaa43ef665007c4b857ba4
+SHA256 (aspell6-or-0.03-1.tar.bz2) = d6ffa369f8918d74cdea966112bc5cb700e09dca5ac6b968660cfc22044ef24f
+SIZE (aspell6-or-0.03-1.tar.bz2) = 20525
diff --git a/textproc/or-aspell/pkg-descr b/textproc/or-aspell/pkg-descr
index d8a520ec8f9e..e4efd9944933 100644
--- a/textproc/or-aspell/pkg-descr
+++ b/textproc/or-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Oriya dictionary.
+Aspell Oriya dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.or b/textproc/or-aspell/pkg-plist
index b7133293a90b..b7133293a90b 100644
--- a/textproc/aspell/pkg-plist.or
+++ b/textproc/or-aspell/pkg-plist
diff --git a/textproc/pa-aspell/Makefile b/textproc/pa-aspell/Makefile
index 7ffb3fb703ff..36c3ab1c9e37 100644
--- a/textproc/pa-aspell/Makefile
+++ b/textproc/pa-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= pa-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-pa-0.01-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Punjabi dictionary
+COMMENT= Aspell Punjabi dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= pa
-ASPELL_PA= haji
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/pa-aspell/distinfo b/textproc/pa-aspell/distinfo
new file mode 100644
index 000000000000..322ba77a30f6
--- /dev/null
+++ b/textproc/pa-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-pa-0.01-1.tar.bz2) = de336d6ef55ad6fa81f8903765c6c95d
+SHA256 (aspell6-pa-0.01-1.tar.bz2) = c7f3abb1c5efe62e072ca8bef44b0d0506501bbb7b48ced1d0d95f10e61fc945
+SIZE (aspell6-pa-0.01-1.tar.bz2) = 22143
diff --git a/textproc/pa-aspell/pkg-descr b/textproc/pa-aspell/pkg-descr
index b229c4ceb829..46e687c30de4 100644
--- a/textproc/pa-aspell/pkg-descr
+++ b/textproc/pa-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Punjabi dictionary.
+Aspell Punjabi dictionary.
WWW: http://punlinux.sourceforge.net/
diff --git a/textproc/aspell/pkg-plist.pa b/textproc/pa-aspell/pkg-plist
index 83dc3419d197..83dc3419d197 100644
--- a/textproc/aspell/pkg-plist.pa
+++ b/textproc/pa-aspell/pkg-plist
diff --git a/textproc/qu-aspell/Makefile b/textproc/qu-aspell/Makefile
index 84ea57c99620..5dba71b11352 100644
--- a/textproc/qu-aspell/Makefile
+++ b/textproc/qu-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= qu-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-qu-0.02-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Quechua dictionary
+COMMENT= Aspell Quechua dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= qu
-ASPELL_QU= ari
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/qu-aspell/distinfo b/textproc/qu-aspell/distinfo
new file mode 100644
index 000000000000..f0c111b8aaac
--- /dev/null
+++ b/textproc/qu-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-qu-0.02-0.tar.bz2) = b1c4a68fd5f46cadb600d925b0764fa5
+SHA256 (aspell6-qu-0.02-0.tar.bz2) = 80977629b8425bda7ffd951628d23a6793a457f4948151c71ff9e0bff5073f01
+SIZE (aspell6-qu-0.02-0.tar.bz2) = 85541
diff --git a/textproc/qu-aspell/pkg-descr b/textproc/qu-aspell/pkg-descr
index 17d66f608991..69fd252d3f5a 100644
--- a/textproc/qu-aspell/pkg-descr
+++ b/textproc/qu-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Quechua dictionary.
+Aspell Quechua dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.qu b/textproc/qu-aspell/pkg-plist
index 20f34dafa850..20f34dafa850 100644
--- a/textproc/aspell/pkg-plist.qu
+++ b/textproc/qu-aspell/pkg-plist
diff --git a/textproc/ro-aspell/Makefile b/textproc/ro-aspell/Makefile
index 68aa0c733add..418ed8cb9418 100644
--- a/textproc/ro-aspell/Makefile
+++ b/textproc/ro-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= ro-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -ro-0.50-2
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Romanian dictionary
+COMMENT= Aspell Romanian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= ro
-ASPELL_RO= da
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/ro-aspell/distinfo b/textproc/ro-aspell/distinfo
new file mode 100644
index 000000000000..ebc4a5d53b06
--- /dev/null
+++ b/textproc/ro-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-ro-0.50-2.tar.bz2) = 96d97a79a0a0e04c580e0d0671d650c9
+SHA256 (aspell-ro-0.50-2.tar.bz2) = ba25d1aa9b6a6288e7a785a49fce81f1fbfb4269237c4730661f876d6d0cf4ec
+SIZE (aspell-ro-0.50-2.tar.bz2) = 64110
diff --git a/textproc/ro-aspell/pkg-descr b/textproc/ro-aspell/pkg-descr
index 286108c90ca4..a2ffe12b4ef3 100644
--- a/textproc/ro-aspell/pkg-descr
+++ b/textproc/ro-aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Romanian dictionary.
+Aspell Romanian dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.ro b/textproc/ro-aspell/pkg-plist
index 2f8a3d3872f8..2f8a3d3872f8 100644
--- a/textproc/aspell/pkg-plist.ro
+++ b/textproc/ro-aspell/pkg-plist
diff --git a/textproc/rw-aspell/Makefile b/textproc/rw-aspell/Makefile
index 127c08185be9..054e6acb0525 100644
--- a/textproc/rw-aspell/Makefile
+++ b/textproc/rw-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= rw-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -rw-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Kinyarwanda dictionary
+COMMENT= Aspell Kinyarwanda dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= rw
-ASPELL_RW= yego
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/rw-aspell/distinfo b/textproc/rw-aspell/distinfo
new file mode 100644
index 000000000000..b5d4c32cc9f1
--- /dev/null
+++ b/textproc/rw-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-rw-0.50-0.tar.bz2) = d369916c4f4159b04e43daf31dde60c9
+SHA256 (aspell-rw-0.50-0.tar.bz2) = 3406102e0e33344b6eae73dbfaf86d8e411b7c97775827a6db79c943ce43f081
+SIZE (aspell-rw-0.50-0.tar.bz2) = 21821
diff --git a/textproc/rw-aspell/pkg-descr b/textproc/rw-aspell/pkg-descr
index d9d7a0c5dffa..1ecfb5011863 100644
--- a/textproc/rw-aspell/pkg-descr
+++ b/textproc/rw-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Kinyarwanda dictionary.
+Aspell Kinyarwanda dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.rw b/textproc/rw-aspell/pkg-plist
index b2484c8c7d44..b2484c8c7d44 100644
--- a/textproc/aspell/pkg-plist.rw
+++ b/textproc/rw-aspell/pkg-plist
diff --git a/textproc/sc-aspell/Makefile b/textproc/sc-aspell/Makefile
index 1cc03269e150..6f1952464518 100644
--- a/textproc/sc-aspell/Makefile
+++ b/textproc/sc-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= sc-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-sc-1.0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Sardinian dictionary
+COMMENT= Aspell Sardinian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= sc
-ASPELL_SC= eja
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/sc-aspell/distinfo b/textproc/sc-aspell/distinfo
new file mode 100644
index 000000000000..e6b425af7bb2
--- /dev/null
+++ b/textproc/sc-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-sc-1.0.tar.bz2) = 05284890c3445c5850a3c1410790a057
+SHA256 (aspell5-sc-1.0.tar.bz2) = 591ae22f712b472182b41b8bc97dce1e5ecd240c75eccc25f59ab15c60be8742
+SIZE (aspell5-sc-1.0.tar.bz2) = 281538
diff --git a/textproc/sc-aspell/pkg-descr b/textproc/sc-aspell/pkg-descr
index a2e41d94a85a..ca4b4bf15d83 100644
--- a/textproc/sc-aspell/pkg-descr
+++ b/textproc/sc-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Sardinian dictionary.
+Aspell Sardinian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.sc b/textproc/sc-aspell/pkg-plist
index 96089647a1d5..96089647a1d5 100644
--- a/textproc/aspell/pkg-plist.sc
+++ b/textproc/sc-aspell/pkg-plist
diff --git a/textproc/sk-aspell/Makefile b/textproc/sk-aspell/Makefile
index 14bb0606d2dc..d8e509625b78 100644
--- a/textproc/sk-aspell/Makefile
+++ b/textproc/sk-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= sk-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -sk-0.52-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Slovak dictionary
+COMMENT= Aspell Slovak dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= sk
-ASPELL_SK= ano
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/sk-aspell/distinfo b/textproc/sk-aspell/distinfo
new file mode 100644
index 000000000000..ea74b9e4cb72
--- /dev/null
+++ b/textproc/sk-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-sk-0.52-0.tar.bz2) = ce90b109f7c602bde949880920bbbbfd
+SHA256 (aspell-sk-0.52-0.tar.bz2) = b506542d8c63d935efc9760a392b23fd5dd5683822b26a5ce724241f2c013563
+SIZE (aspell-sk-0.52-0.tar.bz2) = 383840
diff --git a/textproc/sk-aspell/pkg-descr b/textproc/sk-aspell/pkg-descr
index 5b75318116ac..93d1bda899d7 100644
--- a/textproc/sk-aspell/pkg-descr
+++ b/textproc/sk-aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Slovak dictionary.
+Aspell Slovak dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.sk b/textproc/sk-aspell/pkg-plist
index 6e7f82f3e99c..6e7f82f3e99c 100644
--- a/textproc/aspell/pkg-plist.sk
+++ b/textproc/sk-aspell/pkg-plist
diff --git a/textproc/sl-aspell/Makefile b/textproc/sl-aspell/Makefile
index 25c30682586c..ffcf5409d169 100644
--- a/textproc/sl-aspell/Makefile
+++ b/textproc/sl-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= sl-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -sl-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Slovenian dictionary
+COMMENT= Aspell Slovenian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= sl
-ASPELL_SL= da
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/sl-aspell/distinfo b/textproc/sl-aspell/distinfo
new file mode 100644
index 000000000000..6c1415727496
--- /dev/null
+++ b/textproc/sl-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-sl-0.50-0.tar.bz2) = c4c11402bc834d796d1b56e711470480
+SHA256 (aspell-sl-0.50-0.tar.bz2) = e566d127f7130da2df7b1f4f4cb4bc51932517b0c24299f84498ba325e6133d1
+SIZE (aspell-sl-0.50-0.tar.bz2) = 215463
diff --git a/textproc/sl-aspell/pkg-descr b/textproc/sl-aspell/pkg-descr
index 994d9025c749..12b2d0b24f45 100644
--- a/textproc/sl-aspell/pkg-descr
+++ b/textproc/sl-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Slovenian dictionary.
+Aspell Slovenian dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.sl b/textproc/sl-aspell/pkg-plist
index 65b1aa943df3..65b1aa943df3 100644
--- a/textproc/aspell/pkg-plist.sl
+++ b/textproc/sl-aspell/pkg-plist
diff --git a/textproc/sr-aspell/Makefile b/textproc/sr-aspell/Makefile
index fcd86db06914..3c5d252a8018 100644
--- a/textproc/sr-aspell/Makefile
+++ b/textproc/sr-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= sr-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-sr-0.02
+CATEGORIES= textproc
MAINTAINER= thierry@FreeBSD.org
-COMMENT= Aspell with Serbian dictionary
+COMMENT= Aspell Serbian dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= sr
-ASPELL_SR= da
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/sr-aspell/distinfo b/textproc/sr-aspell/distinfo
new file mode 100644
index 000000000000..04f4aa14c139
--- /dev/null
+++ b/textproc/sr-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-sr-0.02.tar.bz2) = a068ba095e7246fd3bbc92e7d0287998
+SHA256 (aspell6-sr-0.02.tar.bz2) = 705e58fb390633c89c4cb224a1cfb34e67e09496448f7adc6500494b6e009289
+SIZE (aspell6-sr-0.02.tar.bz2) = 574923
diff --git a/textproc/sr-aspell/pkg-descr b/textproc/sr-aspell/pkg-descr
index 59ea51ed82e6..64c530444e13 100644
--- a/textproc/sr-aspell/pkg-descr
+++ b/textproc/sr-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Serbian dictionary.
+Aspell Serbian dictionary.
WWW: http://srpski.org/aspell/
diff --git a/textproc/aspell/pkg-plist.sr b/textproc/sr-aspell/pkg-plist
index 97309fc3dd1f..97309fc3dd1f 100644
--- a/textproc/aspell/pkg-plist.sr
+++ b/textproc/sr-aspell/pkg-plist
diff --git a/textproc/sv-aspell/Makefile b/textproc/sv-aspell/Makefile
index 7ef7e24a45df..5c3e86fcbfca 100644
--- a/textproc/sv-aspell/Makefile
+++ b/textproc/sv-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= sv-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -sv-0.51-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Swedish dictionary
+COMMENT= Aspell Swedish dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= sv
-ASPELL_SV= ja
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/sv-aspell/distinfo b/textproc/sv-aspell/distinfo
new file mode 100644
index 000000000000..bc99dafba3e5
--- /dev/null
+++ b/textproc/sv-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-sv-0.51-0.tar.bz2) = d180c781f8986ea0f65b6b18f02a494e
+SHA256 (aspell-sv-0.51-0.tar.bz2) = 9b70573c9c8cf76f5cdb6abcdfb834a754bbaa1efd7d6f57f47b8a91a19c5c0a
+SIZE (aspell-sv-0.51-0.tar.bz2) = 93942
diff --git a/textproc/sv-aspell/pkg-descr b/textproc/sv-aspell/pkg-descr
index 6730fe8cc9eb..2ba51348da7b 100644
--- a/textproc/sv-aspell/pkg-descr
+++ b/textproc/sv-aspell/pkg-descr
@@ -1,4 +1,4 @@
-Aspell with Swedish dictionary.
+Aspell Swedish dictionary.
Note: if you build from ports, prefer textproc/aspell, it will let you
select dictionaries for several languages.
diff --git a/textproc/aspell/pkg-plist.sv b/textproc/sv-aspell/pkg-plist
index a930ce39c72b..a930ce39c72b 100644
--- a/textproc/aspell/pkg-plist.sv
+++ b/textproc/sv-aspell/pkg-plist
diff --git a/textproc/sw-aspell/Makefile b/textproc/sw-aspell/Makefile
index 07a5ce89ec0f..de3b5c387014 100644
--- a/textproc/sw-aspell/Makefile
+++ b/textproc/sw-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= sw-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -sw-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Swahili dictionary
+COMMENT= Aspell Swahili dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= sw
-ASPELL_SW= sawa
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/sw-aspell/distinfo b/textproc/sw-aspell/distinfo
new file mode 100644
index 000000000000..1c352f4111a0
--- /dev/null
+++ b/textproc/sw-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-sw-0.50-0.tar.bz2) = 26ccc3500d7f7c288b74bba1c1fab38f
+SHA256 (aspell-sw-0.50-0.tar.bz2) = 7ed51f107dc57a7b3555f20d1cee2903275d63e022b055ea6b6409d9e081f297
+SIZE (aspell-sw-0.50-0.tar.bz2) = 102172
diff --git a/textproc/sw-aspell/pkg-descr b/textproc/sw-aspell/pkg-descr
index 56444a501b2e..52f5b5d1ecdf 100644
--- a/textproc/sw-aspell/pkg-descr
+++ b/textproc/sw-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Swahili dictionary.
+Aspell Swahili dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.sw b/textproc/sw-aspell/pkg-plist
index 4f01f770f087..4f01f770f087 100644
--- a/textproc/aspell/pkg-plist.sw
+++ b/textproc/sw-aspell/pkg-plist
diff --git a/textproc/ta-aspell/Makefile b/textproc/ta-aspell/Makefile
index 8a8238598942..f7417a6dfd4b 100644
--- a/textproc/ta-aspell/Makefile
+++ b/textproc/ta-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= ta-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-ta-20040424-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Tamil dictionary
+COMMENT= Aspell Tamil dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= ta
-ASPELL_TA= aam
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/ta-aspell/distinfo b/textproc/ta-aspell/distinfo
new file mode 100644
index 000000000000..1ade9727edef
--- /dev/null
+++ b/textproc/ta-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-ta-20040424-1.tar.bz2) = fc98b0b8d79291448d3a4f48ebbf2bd0
+SHA256 (aspell6-ta-20040424-1.tar.bz2) = 52f552f1a2c0fc53ed4eac75990ff75bccf3d5f1440ca3d948d96eafe5f3486a
+SIZE (aspell6-ta-20040424-1.tar.bz2) = 44452
diff --git a/textproc/ta-aspell/pkg-descr b/textproc/ta-aspell/pkg-descr
index df4ad827ec26..3c7719552e24 100644
--- a/textproc/ta-aspell/pkg-descr
+++ b/textproc/ta-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Tamil dictionary.
+Aspell Tamil dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.ta b/textproc/ta-aspell/pkg-plist
index f666d4e557dc..f666d4e557dc 100644
--- a/textproc/aspell/pkg-plist.ta
+++ b/textproc/ta-aspell/pkg-plist
diff --git a/textproc/te-aspell/Makefile b/textproc/te-aspell/Makefile
index cac80538e483..67d7053637e3 100644
--- a/textproc/te-aspell/Makefile
+++ b/textproc/te-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= te-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-te-0.01-2
+CATEGORIES= textproc
MAINTAINER= thierry@FreeBSD.org
-COMMENT= Aspell with Telugu dictionary
+COMMENT= Aspell Telugu dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= te
-ASPELL_TE= avunu
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/te-aspell/distinfo b/textproc/te-aspell/distinfo
new file mode 100644
index 000000000000..8e292f6723b8
--- /dev/null
+++ b/textproc/te-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-te-0.01-2.tar.bz2) = 645f7f7204520552cddbe1c9ae64df2a
+SHA256 (aspell6-te-0.01-2.tar.bz2) = 3682638a757a65afcc770e565e68347e8eb7be94052d9d6eff64fc767e7fec5d
+SIZE (aspell6-te-0.01-2.tar.bz2) = 310738
diff --git a/textproc/te-aspell/pkg-descr b/textproc/te-aspell/pkg-descr
index 2599068b9a87..468cdae1a9a2 100644
--- a/textproc/te-aspell/pkg-descr
+++ b/textproc/te-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Telugu dictionary.
+Aspell Telugu dictionary.
WWW: http://www.swecha.org/wiki/Wordlist_and_Dictionaries
diff --git a/textproc/aspell/pkg-plist.te b/textproc/te-aspell/pkg-plist
index 3dec360a6b51..3dec360a6b51 100644
--- a/textproc/aspell/pkg-plist.te
+++ b/textproc/te-aspell/pkg-plist
diff --git a/textproc/tet-aspell/Makefile b/textproc/tet-aspell/Makefile
index bb8490fcb06f..7eebd2d3a07f 100644
--- a/textproc/tet-aspell/Makefile
+++ b/textproc/tet-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= tet-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-tet-0.1.1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Tetum dictionary
+COMMENT= Aspell Tetum dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= tet
-ASPELL_TET= sin
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/tet-aspell/distinfo b/textproc/tet-aspell/distinfo
new file mode 100644
index 000000000000..d6e6aac7f82e
--- /dev/null
+++ b/textproc/tet-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-tet-0.1.1.tar.bz2) = 6a18e0253d7d6baa49daca513b0d782b
+SHA256 (aspell5-tet-0.1.1.tar.bz2) = 9dd546c9c48f42085e3c17f22c8e6d46e56f3ea9c4618b933c642a091df1c09e
+SIZE (aspell5-tet-0.1.1.tar.bz2) = 33044
diff --git a/textproc/tet-aspell/pkg-descr b/textproc/tet-aspell/pkg-descr
index e89810f2d1e8..e20a4fcc5b8b 100644
--- a/textproc/tet-aspell/pkg-descr
+++ b/textproc/tet-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Tetum dictionary.
+Aspell Tetum dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.tet b/textproc/tet-aspell/pkg-plist
index 517ef020e887..517ef020e887 100644
--- a/textproc/aspell/pkg-plist.tet
+++ b/textproc/tet-aspell/pkg-plist
diff --git a/textproc/tl-aspell/Makefile b/textproc/tl-aspell/Makefile
index eea8729cc296..6f274836bd2c 100644
--- a/textproc/tl-aspell/Makefile
+++ b/textproc/tl-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= tl-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-tl-0.02-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Tagalog dictionary
+COMMENT= Aspell Tagalog dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= tl
-ASPELL_TL= opo
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/tl-aspell/distinfo b/textproc/tl-aspell/distinfo
new file mode 100644
index 000000000000..f0d5dd119a6d
--- /dev/null
+++ b/textproc/tl-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-tl-0.02-1.tar.bz2) = 126437909424021a553055b1b96fdf73
+SHA256 (aspell5-tl-0.02-1.tar.bz2) = 48b65d2c6886f353d1e1756a93bcd4d8ab2b88b021176c25dfdb5d8bcf348acd
+SIZE (aspell5-tl-0.02-1.tar.bz2) = 40642
diff --git a/textproc/tl-aspell/pkg-descr b/textproc/tl-aspell/pkg-descr
index a2f29486afad..4d4a4b258ae8 100644
--- a/textproc/tl-aspell/pkg-descr
+++ b/textproc/tl-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Tagalog dictionary.
+Aspell Tagalog dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.tl b/textproc/tl-aspell/pkg-plist
index 5cfcfe184a8f..5cfcfe184a8f 100644
--- a/textproc/aspell/pkg-plist.tl
+++ b/textproc/tl-aspell/pkg-plist
diff --git a/textproc/tn-aspell/Makefile b/textproc/tn-aspell/Makefile
index ec4838d7030b..65935933ab37 100644
--- a/textproc/tn-aspell/Makefile
+++ b/textproc/tn-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= tn-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 5-tn-1.0.1-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Tswana dictionary
+COMMENT= Aspell Tswana dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= tn
-ASPELL_TN= ee
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/tn-aspell/distinfo b/textproc/tn-aspell/distinfo
new file mode 100644
index 000000000000..a5bd48cccdc6
--- /dev/null
+++ b/textproc/tn-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell5-tn-1.0.1-0.tar.bz2) = 6e5ef98452b36a211a4fc1fdbadda322
+SHA256 (aspell5-tn-1.0.1-0.tar.bz2) = 41a0c20e1d2acaa28a647d74b40778e491815566019f79e7049621f40d3bbd60
+SIZE (aspell5-tn-1.0.1-0.tar.bz2) = 22127
diff --git a/textproc/tn-aspell/pkg-descr b/textproc/tn-aspell/pkg-descr
index a3bcd70f67fd..94cca477a9bd 100644
--- a/textproc/tn-aspell/pkg-descr
+++ b/textproc/tn-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Tswana dictionary.
+Aspell Tswana dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.tn b/textproc/tn-aspell/pkg-plist
index 2b80b4bfcac0..2b80b4bfcac0 100644
--- a/textproc/aspell/pkg-plist.tn
+++ b/textproc/tn-aspell/pkg-plist
diff --git a/textproc/tr-aspell/Makefile b/textproc/tr-aspell/Makefile
index d696232a1964..33728cba9eb6 100644
--- a/textproc/tr-aspell/Makefile
+++ b/textproc/tr-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= tr-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -tr-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Turkish dictionary
+COMMENT= Aspell Turkish dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= tr
-ASPELL_TR= evet
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/tr-aspell/distinfo b/textproc/tr-aspell/distinfo
new file mode 100644
index 000000000000..4d6a657cd93b
--- /dev/null
+++ b/textproc/tr-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-tr-0.50-0.tar.bz2) = 432ecdc4e5233da0a4c1a52ed9103fa2
+SHA256 (aspell-tr-0.50-0.tar.bz2) = 0bc6530e5eebf8b2b53f1e8add596c62099173f62b9baa6b3efaa86752bdfb4a
+SIZE (aspell-tr-0.50-0.tar.bz2) = 84846
diff --git a/textproc/tr-aspell/pkg-descr b/textproc/tr-aspell/pkg-descr
index 5cce891c6f21..9e5eab24a885 100644
--- a/textproc/tr-aspell/pkg-descr
+++ b/textproc/tr-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Turkish dictionary.
+Aspell Turkish dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.tr b/textproc/tr-aspell/pkg-plist
index c4fa6b9a4a0d..c4fa6b9a4a0d 100644
--- a/textproc/aspell/pkg-plist.tr
+++ b/textproc/tr-aspell/pkg-plist
diff --git a/textproc/uz-aspell/Makefile b/textproc/uz-aspell/Makefile
index 5ff1d6d701b0..5ddf6be7ee0c 100644
--- a/textproc/uz-aspell/Makefile
+++ b/textproc/uz-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= uz-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-uz-0.5-0
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Uzbek dictionary
+COMMENT= Aspell Uzbek dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= uz
-ASPELL_UZ= kha
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/uz-aspell/distinfo b/textproc/uz-aspell/distinfo
new file mode 100644
index 000000000000..01b5da67873e
--- /dev/null
+++ b/textproc/uz-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-uz-0.5-0.tar.bz2) = 6115c0cf725964c6f1eaa21040824b86
+SHA256 (aspell6-uz-0.5-0.tar.bz2) = aa6eb06169f885c309aa6d7d48ff0a0c4a39ee87eb2937166fcb76708e791565
+SIZE (aspell6-uz-0.5-0.tar.bz2) = 71160
diff --git a/textproc/uz-aspell/pkg-descr b/textproc/uz-aspell/pkg-descr
index eba7da0730ae..ecb7d102e3a2 100644
--- a/textproc/uz-aspell/pkg-descr
+++ b/textproc/uz-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Uzbek dictionary.
+Aspell Uzbek dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.uz b/textproc/uz-aspell/pkg-plist
index 592c84122ea8..592c84122ea8 100644
--- a/textproc/aspell/pkg-plist.uz
+++ b/textproc/uz-aspell/pkg-plist
diff --git a/textproc/wa-aspell/Makefile b/textproc/wa-aspell/Makefile
index ee6da50519b2..548ce57921e8 100644
--- a/textproc/wa-aspell/Makefile
+++ b/textproc/wa-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= wa-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -wa-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Walloon dictionary
+COMMENT= Aspell Walloon dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= wa
-ASPELL_WA= oyi
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/wa-aspell/distinfo b/textproc/wa-aspell/distinfo
new file mode 100644
index 000000000000..dc45c6111989
--- /dev/null
+++ b/textproc/wa-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-wa-0.50-0.tar.bz2) = e3817402d7be19d4b0d0342d3a5970ea
+SHA256 (aspell-wa-0.50-0.tar.bz2) = 5a17aa8aa37afbcc8f52336476670b93cba16462bcb89dd46b80f4d9cfe73fe4
+SIZE (aspell-wa-0.50-0.tar.bz2) = 50363
diff --git a/textproc/wa-aspell/pkg-descr b/textproc/wa-aspell/pkg-descr
index 42c9ef71b1ee..5a330178a3cf 100644
--- a/textproc/wa-aspell/pkg-descr
+++ b/textproc/wa-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Walloon dictionary.
+Aspell Walloon dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.wa b/textproc/wa-aspell/pkg-plist
index 19206207a372..19206207a372 100644
--- a/textproc/aspell/pkg-plist.wa
+++ b/textproc/wa-aspell/pkg-plist
diff --git a/textproc/yi-aspell/Makefile b/textproc/yi-aspell/Makefile
index 182dcaab7c58..773fd26fdd14 100644
--- a/textproc/yi-aspell/Makefile
+++ b/textproc/yi-aspell/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
#
-PORTNAME= yi-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= 6-yi-0.01.1-1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Yiddish dictionary
+COMMENT= Aspell Yiddish dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= yi
-ASPELL_YI= yo
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/yi-aspell/distinfo b/textproc/yi-aspell/distinfo
new file mode 100644
index 000000000000..b57f8d600a9d
--- /dev/null
+++ b/textproc/yi-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-yi-0.01.1-1.tar.bz2) = 9d514384bf00cfb9ceb0d5f78f998d93
+SHA256 (aspell6-yi-0.01.1-1.tar.bz2) = 9879d35a5b0b86f8e217601568480f2f634bc8b7a97341e9e80b0d40a8202856
+SIZE (aspell6-yi-0.01.1-1.tar.bz2) = 74382
diff --git a/textproc/yi-aspell/pkg-descr b/textproc/yi-aspell/pkg-descr
index 6bb7ee7fa297..0804cb691b14 100644
--- a/textproc/yi-aspell/pkg-descr
+++ b/textproc/yi-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Yiddish dictionary.
+Aspell Yiddish dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.yi b/textproc/yi-aspell/pkg-plist
index e8764018ec00..e8764018ec00 100644
--- a/textproc/aspell/pkg-plist.yi
+++ b/textproc/yi-aspell/pkg-plist
diff --git a/textproc/zu-aspell/Makefile b/textproc/zu-aspell/Makefile
index 5c28ff149f92..eb93b9dda4a7 100644
--- a/textproc/zu-aspell/Makefile
+++ b/textproc/zu-aspell/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
#
-PORTNAME= zu-aspell
+PORTNAME= ${DICT}-aspell
+DISTVERSION= -zu-0.50-0
+PORTEPOCH= 1
+CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Zulu dictionary
+COMMENT= Aspell Zulu dictionary
-MASTERDIR= ${.CURDIR}/../aspell
+DICT= zu
-ASPELL_ZU= yebo
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/textproc/zu-aspell/distinfo b/textproc/zu-aspell/distinfo
new file mode 100644
index 000000000000..d84e1e17045e
--- /dev/null
+++ b/textproc/zu-aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell-zu-0.50-0.tar.bz2) = 2478cbbb6abaf5ed74bc2da7e7152116
+SHA256 (aspell-zu-0.50-0.tar.bz2) = 3fa255cd0b20e6229a53df972fd3c5ed8481db11cfd0347dd3da629bbb7a6796
+SIZE (aspell-zu-0.50-0.tar.bz2) = 168226
diff --git a/textproc/zu-aspell/pkg-descr b/textproc/zu-aspell/pkg-descr
index 451c23ab93f5..f6c7059fe46e 100644
--- a/textproc/zu-aspell/pkg-descr
+++ b/textproc/zu-aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Zulu dictionary.
+Aspell Zulu dictionary.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.zu b/textproc/zu-aspell/pkg-plist
index 0874f70992fe..0874f70992fe 100644
--- a/textproc/aspell/pkg-plist.zu
+++ b/textproc/zu-aspell/pkg-plist
diff --git a/ukrainian/aspell/Makefile b/ukrainian/aspell/Makefile
index 6431d5aaca51..23b266319905 100644
--- a/ukrainian/aspell/Makefile
+++ b/ukrainian/aspell/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= aspell
-CATEGORIES= ukrainian
+DISTVERSION= 6-uk-1.1-0
+CATEGORIES= ukrainian textproc
MAINTAINER= ports@FreeBSD.org
-COMMENT= Aspell with Ukrainian dictionaries
+COMMENT= Aspell Ukrainian dictionaries
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= uk
-ASPELL_UK= tak
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/ukrainian/aspell/distinfo b/ukrainian/aspell/distinfo
new file mode 100644
index 000000000000..72b8c224f328
--- /dev/null
+++ b/ukrainian/aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-uk-1.1-0.tar.bz2) = f3ffe52d86b83a394ce29e88bd3ef9d2
+SHA256 (aspell6-uk-1.1-0.tar.bz2) = dcd569dd0bae8060a39769dd353556bf042b1e2d074e5c57fe53e6b1210560b8
+SIZE (aspell6-uk-1.1-0.tar.bz2) = 179098
diff --git a/ukrainian/aspell/pkg-descr b/ukrainian/aspell/pkg-descr
index 75cc078689f2..4143f5256116 100644
--- a/ukrainian/aspell/pkg-descr
+++ b/ukrainian/aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Ukrainian dictionary.
+Aspell Ukrainian dictionary.
WWW: http://sourceforge.net/projects/ispell-uk
diff --git a/textproc/aspell/pkg-plist.uk b/ukrainian/aspell/pkg-plist
index 81ebab95fa26..81ebab95fa26 100644
--- a/textproc/aspell/pkg-plist.uk
+++ b/ukrainian/aspell/pkg-plist
diff --git a/vietnamese/aspell/Makefile b/vietnamese/aspell/Makefile
index aac5c1e528fe..9b959667fe39 100644
--- a/vietnamese/aspell/Makefile
+++ b/vietnamese/aspell/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= aspell
-CATEGORIES= vietnamese
+DISTVERSION= 6-vi-0.01.1-1
+CATEGORIES= vietnamese textproc
MAINTAINER= obrien@FreeBSD.org
-COMMENT= Aspell with Vietnamese dictionaries
+COMMENT= Aspell Vietnamese dictionaries
-MASTERDIR= ${.CURDIR}/../../textproc/aspell
+DICT= vi
-ASPELL_VI= vāng
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
+.include <bsd.port.post.mk>
diff --git a/vietnamese/aspell/distinfo b/vietnamese/aspell/distinfo
new file mode 100644
index 000000000000..5a6243ba5a9d
--- /dev/null
+++ b/vietnamese/aspell/distinfo
@@ -0,0 +1,3 @@
+MD5 (aspell6-vi-0.01.1-1.tar.bz2) = 314185e521900df0fab8375fa609bba2
+SHA256 (aspell6-vi-0.01.1-1.tar.bz2) = 3cd85d53bb62b0d104cb5c03e142c3bbe1ad64329d7beae057854816dc7e7c17
+SIZE (aspell6-vi-0.01.1-1.tar.bz2) = 30843
diff --git a/vietnamese/aspell/pkg-descr b/vietnamese/aspell/pkg-descr
index ad5515f5321b..8ecf72a04bfe 100644
--- a/vietnamese/aspell/pkg-descr
+++ b/vietnamese/aspell/pkg-descr
@@ -1,3 +1,3 @@
-Aspell with Vietnamese dictionaries.
+Aspell Vietnamese dictionaries.
WWW: http://aspell.net/
diff --git a/textproc/aspell/pkg-plist.vi b/vietnamese/aspell/pkg-plist
index da4192b3bad1..da4192b3bad1 100644
--- a/textproc/aspell/pkg-plist.vi
+++ b/vietnamese/aspell/pkg-plist