- Upgrade to 0.60;

- Add dictionaries for Azerbaijani, Belarusian, Bengali, Estonian, Finnish, Hebrew, Hungarian, Kinyarwanda, Latin, Latvian, Lithuanian, Macedonian, Mongolian, Nyanja, Quechua, Sardinian, Tagalog, Tamil, Tetum, Upper Sorbian, Uzbek, Vietnamese, and Yiddish.
svn path=/head/; revision=117534
2004-08-28 22:49:49 +00:00 · 2004-08-28 22:49:49 +00:00 · 6fd4bdbdfe · 2021-03-31 03:12:20 +00:00
commit 6fd4bdbdfe
parent af8476c755
72 changed files with 2177 additions and 362 deletions
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@ -6,14 +6,12 @@
 #

 PORTNAME?=	aspell
-PORTVERSION=	0.50.5
-PORTREVISION=	4
+PORTVERSION=	0.60
 CATEGORIES+=	textproc
-MASTER_SITES=	http://aspell.net/	\
-		${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	aspell
-DISTFILES=	aspell-0.50.5.tar.gz	# needed for slave ports / options
-EXTRACT_ONLY=	aspell-0.50.5.tar.gz
+DISTFILES=	aspell-0.60.tar.gz	# needed for slave ports / options
+EXTRACT_ONLY=	aspell-0.60.tar.gz

 MAINTAINER?=	thierry@FreeBSD.org
 COMMENT?=	Spelling checker with better suggestion logic than ispell
@ -25,13 +23,39 @@ BUILD_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 USE_LIBTOOL_VER=	15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
-		--enable-doc-dir=${DOCSDIR}	\
+			--enable-docdir=${DOCSDIR}	\
 			--enable-static
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"	\
+			LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS} ${PTHREAD_LIBS}"
 USE_GMAKE=		yes
-USE_REINPLACE=	yes	# To be removed after commit of PR ports/63944
+USE_ICONV=		yes
+USE_PERL5_BUILD=	yes
+INSTALLS_SHLIB=		yes

 MAKE_ARGS=		NOPORTDOCS=${NOPORTDOCS}
-INSTALLS_SHLIB=	yes
+PLIST_SUB=		VER=${PORTVERSION}
+
+.if defined(WITH_ISPELL)
+CONFLICTS=		ispell* ??-ispell*
+SCRIPTS=		ispell spell
+PLIST_SUB+=		SCRIPTS=""
+.else
+PLIST_SUB+=		SCRIPTS="@comment "
+.endif
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.endif
+
+.if !defined(NOPORTDOCS)
+MAN1=			aspell-import.1 aspell.1 pspell-config.1	\
+			run-with-aspell.1 word-list-compress.1
+INFO=			aspell-dev aspell
+.endif

 # Does not link without at least -O
 .if !defined(CFLAGS) || ${CFLAGS:M-O*} == ""
@ -45,48 +69,13 @@ DESCR=		${.CURDIR}/pkg-descr

 CONF_DICT_ENV=	ASPELL="${PREFIX}/bin/aspell"	\
 		WORD_LIST_COMPRESS="${PREFIX}/bin/word-list-compress"
-AVAIL_DICT=	af bg br ca cs cy da de el en eo es fo fr hr ia id it ga gd gl gv is mi \
-		ms mt nb nl nn pl pt ro ru sk sl sv sw tn tr uk wa zu
-SPECDICTS=	af bg cs cy da el en fo fr ga gd gl gv hr ia id is it mi ms mt nb nn pl \
-		sk sl sv sw tn tr uk wa zu
-DICTVERSION=	0.50-2
-DICTVER_AF=	0.50-0
-DICTVER_BG=	0.50-0
-DICTVER_CS=	0.51-0
-DICTVER_CY=	0.50-3
-DICTVER_DA=	0.50.1-0
-DICTVER_EL=	0.50-3
-DICTVER_EN=	6.0-0
-DICTVER_FO=	0.51-0
-DICTVER_FR=	0.50-3
-DICTVER_GA=	0.50.1-0
-DICTVER_GD=	0.50-0
-DICTVER_GL=	0.50-0
-DICTVER_GV=	0.50-0
-DICTVER_HR=	0.51-0
-DICTVER_IA=	0.50-1
-DICTVER_ID=	0.50.1-0
-DICTVER_IS=	0.51-0
-DICTVER_IT=	0.53-0
-DICTVER_MI=	0.50-0
-DICTVER_MS=	0.50-0
-DICTVER_MT=	0.50-0
-DICTVER_NB=	0.50.1-0
-DICTVER_NN=	0.50.1-1
-DICTVER_PL=	0.51-0
-DICTVER_SK=	0.52-0
-DICTVER_SL=	0.50-0
-DICTVER_SV=	0.51-0
-DICTVER_SW=	0.50-0
-DICTVER_TN=	0.50-0
-DICTVER_TR=	0.50-0
-DICTVER_UK=	0.51-0
-DICTVER_WA=	0.50-0
-DICTVER_ZU=	0.50-0
+AVAIL_DICT=	af az be bg bn br ca cs cy da de el en eo es et fi fo fr ga gd gl \
+		gv he hr hsb hu ia id is it la lt lv mi mk mn ms mt nb nl nn ny pl \
+		pt qu ro ru rw sc sk sl sv sw ta tet tl tn tr uk uz vi wa yi zu
 DICT_SUFFIX=	.tar.bz2
-D5=		en

 .include <bsd.port.pre.mk>
+.include "${FILESDIR}/verdict"

 .if defined(LANG)
 . for i in ${AVAIL_DICT} no
@ -119,46 +108,69 @@ DICTS+=		${LG}
 	@${ECHO_MSG} '* You can add further dictionaries:                     *'
 	@${ECHO_MSG} '*                                 Use make-flag:        *'
 	@${ECHO_MSG} '*  - Afrikaans                    ASPELL_AF=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                      ASPELL_CA=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} '*  - Greek                        ASPELL_EL=yes         *'
+	@${ECHO_MSG} '*  - Hebrew                       ASPELL_HE=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} '*  - Kinyarwanda                  ASPELL_RW=yes         *'
+	@${ECHO_MSG} '*  - Latin                        ASPELL_LA=yes         *'
+	@${ECHO_MSG} '*  - Latvian                      ASPELL_LV=yes         *'
+	@${ECHO_MSG} '*  - Lithuanian                   ASPELL_LT=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} '*  - 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} '*  - Polish                       ASPELL_PL=yes         *'
 	@${ECHO_MSG} '*  - Portuguese                   ASPELL_PT=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} '*  - 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} '*  - 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"   *'
@ -171,47 +183,31 @@ DICTS=	${LG}
 .endif
 .for DICO in ${DICTS}
 MASTER_SITES+=	ftp://ftp.gnu.org/gnu/aspell/dict/${DICO}/:dict${DICO}
-. if ${D5} == ${DICO}
-DISTFILES+=	aspell5-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
-. elif (${SPECDICTS:M${DICO}*} != "")
-DISTFILES+=	aspell-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
-. else
-DISTFILES+=	aspell-${DICO}-${DICTVERSION}${DICT_SUFFIX}:dict${DICO}
-. endif
+DISTFILES+=	aspell${VERDICT_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
 .endfor

 post-extract:
 .for DICO in ${DICTS}
-. if ${D5} == ${DICO}
 	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell5-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}
-. elif (${SPECDICTS:M${DICO}*} != "")
-	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}
-. else
-	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}${DICT_SUFFIX}
-. endif
+	 ${TAR} -xjf ${DISTDIR}/aspell${VERDICT_${DICO:U}}${DICT_SUFFIX}
 .endfor

+pre-configure:
+	@cd ${WRKSRC} && ${ACLOCAL}
+
 post-install:
 .for DICO in ${DICTS}
 	@${ECHO_MSG} "===>   Installing for ${DICO} dictionaries"
-. if ${D5} == ${DICO}
-	@cd ${WRKDIR}/aspell5-${DICO}-${DICTVER_${DICO:U}} &&	\
+	@cd ${WRKDIR}/aspell${VERDICT_${DICO:U}} &&	\
 	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
 	 ${GMAKE} install
-. elif (${SPECDICTS:M${DICO}*} != "")
-	@cd ${WRKDIR}/aspell-${DICO}-${DICTVER_${DICO:U}} &&	\
-	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
-	 ${GMAKE} install
-. else
-	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION} &&		\
-	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
-	 ${GMAKE} install
-. endif
-	@${CAT} ${MASTERDIR}/pkg-plist.${DICO} >> ${TMPPLIST}
+	@${SED} -e "s|%%VER%%|${PORTVERSION}|" ${MASTERDIR}/pkg-plist.${DICO}	\
+		>> ${TMPPLIST}
 .endfor
 	@${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm lib/aspell-${PORTVERSION}" >> ${TMPPLIST}
+.if defined(WITH_ISPELL)
+	${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/scripts/|} ${PREFIX}/bin
+.endif

 .include <bsd.port.post.mk>
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@ -1,53 +1,79 @@
-MD5 (aspell-0.50.5.tar.gz) = 14403d2ea5ded5d3fc9bb259bf65aab5
-SIZE (aspell-0.50.5.tar.gz) = 1016586
+MD5 (aspell-0.60.tar.gz) = 8fa031d0eb37a5538aa6fefa657e707f
+SIZE (aspell-0.60.tar.gz) = 1622677
 MD5 (aspell-af-0.50-0.tar.bz2) = bde617a195e70364f96eea71cf71a333
 SIZE (aspell-af-0.50-0.tar.bz2) = 256111
-MD5 (aspell-bg-0.50-0.tar.bz2) = d4869e4cba11abfac1c58745e1d95e03
-SIZE (aspell-bg-0.50-0.tar.bz2) = 271589
-MD5 (aspell-br-0.50-2.tar.bz2) = 800c7a28e09bd7734d1501cb7a91ad8f
-SIZE (aspell-br-0.50-2.tar.bz2) = 68055
-MD5 (aspell-ca-0.50-2.tar.bz2) = c593ae266d3e48e4d482ff9b9a52acdd
-SIZE (aspell-ca-0.50-2.tar.bz2) = 137626
+MD5 (aspell6-az-0.02-0.tar.bz2) = 24d9d46c8fc23197666a43a7962a7b0d
+SIZE (aspell6-az-0.02-0.tar.bz2) = 50588
+MD5 (aspell5-be-0.01.tar.bz2) = 61314a1672f98571b32d23486bbd43be
+SIZE (aspell5-be-0.01.tar.bz2) = 653405
+MD5 (aspell5-bg-4.0-0.tar.bz2) = f1d9f1587cc382f10f1c7ac0a2600833
+SIZE (aspell5-bg-4.0-0.tar.bz2) = 176676
+MD5 (aspell6-bn-0.01.1-1.tar.bz2) = 5ea70ec74e67f49b2844d306ddf38388
+SIZE (aspell6-bn-0.01.1-1.tar.bz2) = 117436
+MD5 (aspell-br-0.50-1.tar.bz2) = 52efaf08d791e1a0c5056e2b3f6bf47d
+SIZE (aspell-br-0.50-1.tar.bz2) = 67834
+MD5 (aspell6-ca-20040130-1.tar.bz2) = 5dfeebdfbe68556e70abfa95dd775263
+SIZE (aspell6-ca-20040130-1.tar.bz2) = 222986
 MD5 (aspell-cs-0.51-0.tar.bz2) = 4be28bef4385ef46e80547ce8cdc4535
 SIZE (aspell-cs-0.51-0.tar.bz2) = 626618
 MD5 (aspell-cy-0.50-3.tar.bz2) = d59fee193dba87973b38ac2862a090bb
 SIZE (aspell-cy-0.50-3.tar.bz2) = 117652
-MD5 (aspell-da-0.50.1-0.tar.bz2) = 1bf582a9aa0e0f8007a2ba9d52964e7e
-SIZE (aspell-da-0.50.1-0.tar.bz2) = 304097
+MD5 (aspell5-da-1.4.42-1.tar.bz2) = d14c03dca23b572606279d7317b022d0
+SIZE (aspell5-da-1.4.42-1.tar.bz2) = 317688
 MD5 (aspell-de-0.50-2.tar.bz2) = 204a9737ff0110fb8c7d284bd7200f7d
 SIZE (aspell-de-0.50-2.tar.bz2) = 304820
 MD5 (aspell-el-0.50-3.tar.bz2) = 0ea2c42ceb9b91f7f5de2c017234ad37
 SIZE (aspell-el-0.50-3.tar.bz2) = 328225
-MD5 (aspell5-en-6.0-0.tar.bz2) = cf3ed669bc15a4a9360c0498eca27507
-SIZE (aspell5-en-6.0-0.tar.bz2) = 180932
+MD5 (aspell6-en-6.0-0.tar.bz2) = 16449e0a266e1ecc526b2f3cd39d4bc2
+SIZE (aspell6-en-6.0-0.tar.bz2) = 182442
 MD5 (aspell-eo-0.50-2.tar.bz2) = f84147f5909e1a5f7adb86f27c71eb8c
 SIZE (aspell-eo-0.50-2.tar.bz2) = 89703
 MD5 (aspell-es-0.50-2.tar.bz2) = 4a8583e9ef9f4aed03f5a7fe09d40060
 SIZE (aspell-es-0.50-2.tar.bz2) = 157809
-MD5 (aspell-fo-0.51-0.tar.bz2) = 5cc9168ad88ceb1b5531a5452527728b
-SIZE (aspell-fo-0.51-0.tar.bz2) = 161169
+MD5 (aspell6-et-0.1.21-1.tar.bz2) = 82929f49ddc1149b6ef2bde4c3c12bcd
+SIZE (aspell6-et-0.1.21-1.tar.bz2) = 338155
+MD5 (aspell6-fi-0.7-0.tar.bz2) = 6d1032116982c0efab1af8fce83259c0
+SIZE (aspell6-fi-0.7-0.tar.bz2) = 209249
+MD5 (aspell5-fo-0.2.16-1.tar.bz2) = a57e8870c272931da41cd1fc5a291f3d
+SIZE (aspell5-fo-0.2.16-1.tar.bz2) = 165901
 MD5 (aspell-fr-0.50-3.tar.bz2) = 53a2d05c4e8f7fabd3cefe24db977be7
 SIZE (aspell-fr-0.50-3.tar.bz2) = 283086
-MD5 (aspell-hr-0.51-0.tar.bz2) = 7d2fb9af47266884c731691123a95a8d
-SIZE (aspell-hr-0.51-0.tar.bz2) = 208118
-MD5 (aspell-ia-0.50-1.tar.bz2) = 36846c747a4cb7874b00f37752e83f25
-SIZE (aspell-ia-0.50-1.tar.bz2) = 70883
-MD5 (aspell-id-0.50.1-0.tar.bz2) = 860646abe791be723b5ac7d6d996c6b4
-SIZE (aspell-id-0.50.1-0.tar.bz2) = 57532
-MD5 (aspell-it-0.53-0.tar.bz2) = ab3cce02bf8bfdf4116f9f7e602cf4b7
-SIZE (aspell-it-0.53-0.tar.bz2) = 262636
-MD5 (aspell-ga-0.50.1-0.tar.bz2) = 365dba3ccb0e5a93669c7618d627f5de
-SIZE (aspell-ga-0.50.1-0.tar.bz2) = 426385
-MD5 (aspell-gd-0.50-0.tar.bz2) = b189f86c03f7c6f54dfcc56e8d3fc626
-SIZE (aspell-gd-0.50-0.tar.bz2) = 50400
+MD5 (aspell5-ga-3.5-0.tar.bz2) = f2a30f73ba05aa357abaafb2914d5953
+SIZE (aspell5-ga-3.5-0.tar.bz2) = 445939
+MD5 (aspell5-gd-0.1.1-1.tar.bz2) = 171673ec92270f58f945c4317286220b
+SIZE (aspell5-gd-0.1.1-1.tar.bz2) = 51167
 MD5 (aspell-gl-0.50-0.tar.bz2) = 0cd3c4e3e325e080689657f03eff8e8e
 SIZE (aspell-gl-0.50-0.tar.bz2) = 112313
 MD5 (aspell-gv-0.50-0.tar.bz2) = 139b5aa1f5ea85fb7a4be0338039e959
 SIZE (aspell-gv-0.50-0.tar.bz2) = 69462
-MD5 (aspell-is-0.51-0.tar.bz2) = fa61cbe8ec3594ec0190ad3e81c3a7aa
-SIZE (aspell-is-0.51-0.tar.bz2) = 323327
+MD5 (aspell6-he-0.8-0.tar.bz2) = 00b164ea82e16aff51b2cb8425292514
+SIZE (aspell6-he-0.8-0.tar.bz2) = 121629
+MD5 (aspell-hr-0.51-0.tar.bz2) = 7d2fb9af47266884c731691123a95a8d
+SIZE (aspell-hr-0.51-0.tar.bz2) = 208118
+MD5 (aspell6-hsb-0.01-1.tar.bz2) = b7a0e5fa5843f080bfce2b441f46d981
+SIZE (aspell6-hsb-0.01-1.tar.bz2) = 109026
+MD5 (aspell6-hu-0.99.4.2-0.tar.bz2) = 4f4e1e98019a89d0ebf43ec59ae68254
+SIZE (aspell6-hu-0.99.4.2-0.tar.bz2) = 375949
+MD5 (aspell-ia-0.50-1.tar.bz2) = 36846c747a4cb7874b00f37752e83f25
+SIZE (aspell-ia-0.50-1.tar.bz2) = 70883
+MD5 (aspell5-id-1.2-0.tar.bz2) = 9136385a6ce0ff0d113427ab3c974254
+SIZE (aspell5-id-1.2-0.tar.bz2) = 76958
+MD5 (aspell-is-0.51.1-0.tar.bz2) = 1e0b6125d91d7edad710482ddcce2d23
+SIZE (aspell-is-0.51.1-0.tar.bz2) = 323850
+MD5 (aspell-it-0.53-0.tar.bz2) = ab3cce02bf8bfdf4116f9f7e602cf4b7
+SIZE (aspell-it-0.53-0.tar.bz2) = 262636
+MD5 (aspell6-la-20020503-0.tar.bz2) = d42c679b95ba9b094aaa65f118834bf6
+SIZE (aspell6-la-20020503-0.tar.bz2) = 42722
+MD5 (aspell6-lt-1.0-1.tar.bz2) = 2b1bb1c749c0513df18ee3ad826d3011
+SIZE (aspell6-lt-1.0-1.tar.bz2) = 155409
+MD5 (aspell6-lv-0.5.5-1.tar.bz2) = cd120047c0b160a40361cbf03913e91f
+SIZE (aspell6-lv-0.5.5-1.tar.bz2) = 72416
 MD5 (aspell-mi-0.50-0.tar.bz2) = 8b1a07032ee086662bfe44a2e0459db4
 SIZE (aspell-mi-0.50-0.tar.bz2) = 57818
+MD5 (aspell-mk-0.50-0.tar.bz2) = 50e15df6b68e78d1baa789f517b2401b
+SIZE (aspell-mk-0.50-0.tar.bz2) = 122690
+MD5 (aspell6-mn-0.01-0.tar.bz2) = 20aa91b99ce5e7a2b4168711398f5dfe
+SIZE (aspell6-mn-0.01-0.tar.bz2) = 35446
 MD5 (aspell-ms-0.50-0.tar.bz2) = cfdd94bba4781766c5d870202abd60e0
 SIZE (aspell-ms-0.50-0.tar.bz2) = 50368
 MD5 (aspell-mt-0.50-0.tar.bz2) = 6df98356e411891c956c249731b708fa
@ -58,14 +84,22 @@ MD5 (aspell-nl-0.50-2.tar.bz2) = c3ef9fd7dc4c47d816eee9ef5149c76a
 SIZE (aspell-nl-0.50-2.tar.bz2) = 428365
 MD5 (aspell-nn-0.50.1-1.tar.bz2) = 3711eb9df68f25262af10119579239bc
 SIZE (aspell-nn-0.50.1-1.tar.bz2) = 335156
+MD5 (aspell5-ny-0.01-0.tar.bz2) = 856906a424fcbc50cc925d692d294215
+SIZE (aspell5-ny-0.01-0.tar.bz2) = 22952
 MD5 (aspell-pl-0.51-0.tar.bz2) = 5435be1c9c39326a02e2798d8b4d257b
 SIZE (aspell-pl-0.51-0.tar.bz2) = 624458
 MD5 (aspell-pt-0.50-2.tar.bz2) = e4e15179f90b76ec0336b687d1293edd
 SIZE (aspell-pt-0.50-2.tar.bz2) = 201341
+MD5 (aspell6-qu-0.02-0.tar.bz2) = b1c4a68fd5f46cadb600d925b0764fa5
+SIZE (aspell6-qu-0.02-0.tar.bz2) = 85541
 MD5 (aspell-ro-0.50-2.tar.bz2) = 96d97a79a0a0e04c580e0d0671d650c9
 SIZE (aspell-ro-0.50-2.tar.bz2) = 64110
-MD5 (aspell-ru-0.50-2.tar.bz2) = d7add85adeef2ea36457ea811d52c295
-SIZE (aspell-ru-0.50-2.tar.bz2) = 521827
+MD5 (aspell6-ru-0.99f7-1.tar.bz2) = c4c98eaa5e77ad3adccbc5c96cb57cb3
+SIZE (aspell6-ru-0.99f7-1.tar.bz2) = 427312
+MD5 (aspell-rw-0.50-0.tar.bz2) = d369916c4f4159b04e43daf31dde60c9
+SIZE (aspell-rw-0.50-0.tar.bz2) = 21821
+MD5 (aspell5-sc-1.0.tar.bz2) = 05284890c3445c5850a3c1410790a057
+SIZE (aspell5-sc-1.0.tar.bz2) = 281538
 MD5 (aspell-sk-0.52-0.tar.bz2) = ce90b109f7c602bde949880920bbbbfd
 SIZE (aspell-sk-0.52-0.tar.bz2) = 383840
 MD5 (aspell-sl-0.50-0.tar.bz2) = c4c11402bc834d796d1b56e711470480
@ -74,13 +108,25 @@ MD5 (aspell-sv-0.51-0.tar.bz2) = d180c781f8986ea0f65b6b18f02a494e
 SIZE (aspell-sv-0.51-0.tar.bz2) = 93942
 MD5 (aspell-sw-0.50-0.tar.bz2) = 26ccc3500d7f7c288b74bba1c1fab38f
 SIZE (aspell-sw-0.50-0.tar.bz2) = 102172
-MD5 (aspell-tn-0.50-0.tar.bz2) = 31760a27788053ebcdee58a0a6f9091e
-SIZE (aspell-tn-0.50-0.tar.bz2) = 18685
+MD5 (aspell6-ta-20040424-1.tar.bz2) = fc98b0b8d79291448d3a4f48ebbf2bd0
+SIZE (aspell6-ta-20040424-1.tar.bz2) = 44452
+MD5 (aspell5-tet-0.1.1.tar.bz2) = 6a18e0253d7d6baa49daca513b0d782b
+SIZE (aspell5-tet-0.1.1.tar.bz2) = 33044
+MD5 (aspell5-tl-0.02-1.tar.bz2) = 126437909424021a553055b1b96fdf73
+SIZE (aspell5-tl-0.02-1.tar.bz2) = 40642
+MD5 (aspell5-tn-1.0.1-0.tar.bz2) = 6e5ef98452b36a211a4fc1fdbadda322
+SIZE (aspell5-tn-1.0.1-0.tar.bz2) = 22127
 MD5 (aspell-tr-0.50-0.tar.bz2) = 432ecdc4e5233da0a4c1a52ed9103fa2
 SIZE (aspell-tr-0.50-0.tar.bz2) = 84846
 MD5 (aspell-uk-0.51-0.tar.bz2) = 767bfca10c64b239b05cb8b68a78f4ad
 SIZE (aspell-uk-0.51-0.tar.bz2) = 382513
+MD5 (aspell6-uz-0.02-1.tar.bz2) = 02145328b6839d62d8f2e62e6a620a69
+SIZE (aspell6-uz-0.02-1.tar.bz2) = 52875
+MD5 (aspell6-vi-0.01.1-1.tar.bz2) = 314185e521900df0fab8375fa609bba2
+SIZE (aspell6-vi-0.01.1-1.tar.bz2) = 30843
 MD5 (aspell-wa-0.50-0.tar.bz2) = e3817402d7be19d4b0d0342d3a5970ea
 SIZE (aspell-wa-0.50-0.tar.bz2) = 50363
+MD5 (aspell6-yi-0.01.1-1.tar.bz2) = 9d514384bf00cfb9ceb0d5f78f998d93
+SIZE (aspell6-yi-0.01.1-1.tar.bz2) = 74382
 MD5 (aspell-zu-0.50-0.tar.bz2) = 2478cbbb6abaf5ed74bc2da7e7152116
 SIZE (aspell-zu-0.50-0.tar.bz2) = 168226
--- a/textproc/aspell/files/patch-Makefile.in
+++ b/textproc/aspell/files/patch-Makefile.in
--- a/textproc/aspell/files/patch-configure
+++ b/textproc/aspell/files/patch-configure
@ -1,9 +1,6 @@
-
-$FreeBSD$
-
--- configure.orig	Wed Aug 28 11:02:51 2002
-+++ configure	Sat Sep 14 11:42:16 2002
-@@ -8592,13 +8592,6 @@
+--- configure.orig	Sat Jul 31 17:06:43 2004
+++ configure	Wed Aug  4 22:48:38 2004
+@@ -9795,13 +9795,6 @@
 	;;
     esac
 
@ -17,7 +14,7 @@ $FreeBSD$
     # Update the list of available tags.
     if test -n "$tagname"; then
       echo appending configuration tag \"$tagname\" to $ofile
-@@ -16819,6 +16812,10 @@
+@@ -19301,6 +19294,10 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@ -28,3 +25,22 @@ $FreeBSD$
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -21191,16 +21188,16 @@
+ /* end confdefs.h.  */
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+extern int *libintl_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+-const char *_nl_expand_alias ();
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+   ;
+   return 0;
+ }
--- a/textproc/aspell/files/patch-prog-compress.c
+++ b/textproc/aspell/files/patch-prog-compress.c
@ -1,71 +0,0 @@
--- prog/compress.c.orig	Sat Aug 31 20:51:11 2002
-+++ prog/compress.c	Sat Jun 19 16:10:04 2004
-@@ -28,6 +28,11 @@
- 
- #endif
- 
-+#define WORD_BUFF_SIZE 256
-+
-+int count = 0;
-+
-+
- void usage () 
- {
-   fputs("Compresses or uncompresses sorted word lists.\n"     , stderr);
-@@ -45,8 +50,9 @@
-   if (c == EOF) return 0;
-   do {
-     *w++ = (char)(c);
-  } while (c = getc(in), c != EOF && c > 32);
-+  } while (c = getc(in), c != EOF && c > 32 && count < (WORD_BUFF_SIZE - 1));
-   *w = '\0';
-+  count++;
-   ungetc(c, in);
-   if (c == EOF) return 0;
-   else return 1;
-@@ -61,8 +67,8 @@
-     
-   } else if (argv[1][0] == 'c') {
- 
-    char s1[256];
-    char s2[256];
-+    char s1[WORD_BUFF_SIZE];
-+    char s2[WORD_BUFF_SIZE];
-     char * prev = s2;
-     char * cur = s1;
-     *prev = '\0';
-@@ -69,6 +75,7 @@
- 
-     SETBIN (stdout);
- 
-+	while (count < WORD_BUFF_SIZE) {
-     while (get_word(stdin, cur)) {
-       int i = 0;
-       /* get the length of the prefix */
-@@ -85,11 +92,12 @@
- 	prev = s2; cur = s1;
-       }
-     }
-+	}
-     return 0;
- 
-   } else if (argv[1][0] == 'd') {
-     
-    char cur[256];
-+    char cur[WORD_BUFF_SIZE];
-     int i;
-     int c;
- 
-@@ -100,8 +108,11 @@
-       if (i == 0)
- 	i = getc(stdin);
-       --i;  
-      while ((c = getc(stdin)) > 32)
-+      while ((c = getc(stdin)) > 32 && i < (WORD_BUFF_SIZE -1)) {
- 	cur[i++] = (char)c;
-+	count++;
-+	}
-+
-       cur[i] = '\0';
-       fputs(cur, stdout);
-       putc('\n', stdout);
--- a/textproc/aspell/files/verdict
+++ b/textproc/aspell/files/verdict
@ -0,0 +1,65 @@
+VERDICT_AF=	-af-0.50-0
+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_CY=	-cy-0.50-3
+VERDICT_DA=	5-da-1.4.42-1
+VERDICT_DE=	-de-0.50-2
+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_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.5-0
+VERDICT_GD=	5-gd-0.1.1-1
+VERDICT_GL=	-gl-0.50-0
+VERDICT_GV=	-gv-0.50-0
+VERDICT_HE=	6-he-0.8-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=	-it-0.53-0
+VERDICT_LA=	6-la-20020503-0
+VERDICT_LT=	6-lt-1.0-1
+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_MS=	-ms-0.50-0
+VERDICT_MT=	-mt-0.50-0
+VERDICT_NB=	-nb-0.50.1-0
+VERDICT_NL=	-nl-0.50-2
+VERDICT_NN=	-nn-0.50.1-1
+VERDICT_NY=	5-ny-0.01-0
+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_SV=	-sv-0.51-0
+VERDICT_SW=	-sw-0.50-0
+VERDICT_TA=	6-ta-20040424-1
+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=	-uk-0.51-0
+VERDICT_UZ=	6-uz-0.02-1
+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
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@ -1,110 +1,137 @@
 bin/aspell
 bin/aspell-import
+%%SCRIPTS%%bin/ispell
+bin/precat
+bin/preunzip
+bin/prezip
+bin/prezip-bin
 bin/pspell-config
 bin/run-with-aspell
+%%SCRIPTS%%bin/spell
 bin/word-list-compress
 include/aspell.h
 include/pspell/pspell.h
+lib/aspell-%%VER%%/cp1250.cmap
+lib/aspell-%%VER%%/cp1250.cset
+lib/aspell-%%VER%%/cp1251.cmap
+lib/aspell-%%VER%%/cp1251.cset
+lib/aspell-%%VER%%/cp1252.cmap
+lib/aspell-%%VER%%/cp1252.cset
+lib/aspell-%%VER%%/cp1253.cmap
+lib/aspell-%%VER%%/cp1253.cset
+lib/aspell-%%VER%%/cp1254.cmap
+lib/aspell-%%VER%%/cp1254.cset
+lib/aspell-%%VER%%/cp1255.cmap
+lib/aspell-%%VER%%/cp1255.cset
+lib/aspell-%%VER%%/cp1256.cmap
+lib/aspell-%%VER%%/cp1256.cset
+lib/aspell-%%VER%%/cp1257.cmap
+lib/aspell-%%VER%%/cp1257.cset
+lib/aspell-%%VER%%/cp1258.cmap
+lib/aspell-%%VER%%/cp1258.cset
+lib/aspell-%%VER%%/dvorak.kbd
+lib/aspell-%%VER%%/iso-8859-1.cmap
+lib/aspell-%%VER%%/iso-8859-1.cset
+lib/aspell-%%VER%%/iso-8859-10.cmap
+lib/aspell-%%VER%%/iso-8859-10.cset
+lib/aspell-%%VER%%/iso-8859-11.cmap
+lib/aspell-%%VER%%/iso-8859-11.cset
+lib/aspell-%%VER%%/iso-8859-13.cmap
+lib/aspell-%%VER%%/iso-8859-13.cset
+lib/aspell-%%VER%%/iso-8859-14.cmap
+lib/aspell-%%VER%%/iso-8859-14.cset
+lib/aspell-%%VER%%/iso-8859-15.cmap
+lib/aspell-%%VER%%/iso-8859-15.cset
+lib/aspell-%%VER%%/iso-8859-16.cmap
+lib/aspell-%%VER%%/iso-8859-16.cset
+lib/aspell-%%VER%%/iso-8859-2.cmap
+lib/aspell-%%VER%%/iso-8859-2.cset
+lib/aspell-%%VER%%/iso-8859-3.cmap
+lib/aspell-%%VER%%/iso-8859-3.cset
+lib/aspell-%%VER%%/iso-8859-4.cmap
+lib/aspell-%%VER%%/iso-8859-4.cset
+lib/aspell-%%VER%%/iso-8859-5.cmap
+lib/aspell-%%VER%%/iso-8859-5.cset
+lib/aspell-%%VER%%/iso-8859-6.cmap
+lib/aspell-%%VER%%/iso-8859-6.cset
+lib/aspell-%%VER%%/iso-8859-7.cmap
+lib/aspell-%%VER%%/iso-8859-7.cset
+lib/aspell-%%VER%%/iso-8859-8.cmap
+lib/aspell-%%VER%%/iso-8859-8.cset
+lib/aspell-%%VER%%/iso-8859-9.cmap
+lib/aspell-%%VER%%/iso-8859-9.cset
+lib/aspell-%%VER%%/ispell
+lib/aspell-%%VER%%/koi8-r.cmap
+lib/aspell-%%VER%%/koi8-r.cset
+lib/aspell-%%VER%%/koi8-u.cmap
+lib/aspell-%%VER%%/koi8-u.cset
+lib/aspell-%%VER%%/spell
+lib/aspell-%%VER%%/split.kbd
+lib/aspell-%%VER%%/standard.kbd
 lib/libaspell.a
 lib/libaspell.so
-lib/libaspell.so.15
+lib/libaspell.so.16
 lib/libpspell.a
 lib/libpspell.so
-lib/libpspell.so.15
-share/aspell/ASCII.dat
-share/aspell/cp1250.dat
-share/aspell/cp1251.dat
-share/aspell/cp1252.dat
-share/aspell/cp1253.dat
-share/aspell/cp1254.dat
-share/aspell/cp1255.dat
-share/aspell/cp1256.dat
-share/aspell/cp1257.dat
-share/aspell/cp1258.dat
-share/aspell/dvorak.kbd
-share/aspell/iso8859-1.dat
-share/aspell/iso8859-10.dat
-share/aspell/iso8859-13.dat
-share/aspell/iso8859-14.dat
-share/aspell/iso8859-15.dat
-share/aspell/iso8859-2.dat
-share/aspell/iso8859-3.dat
-share/aspell/iso8859-4.dat
-share/aspell/iso8859-5.dat
-share/aspell/iso8859-6.dat
-share/aspell/iso8859-7.dat
-share/aspell/iso8859-8.dat
-share/aspell/iso8859-9.dat
-share/aspell/ispell
-share/aspell/koi8-f.dat
-share/aspell/koi8-r.dat
-share/aspell/koi8-u.dat
-share/aspell/spell
-share/aspell/split.kbd
-share/aspell/standard.kbd
-share/aspell/viscii.dat
-%%PORTDOCS%%%%DOCSDIR%%/dev-html/devel.css
-%%PORTDOCS%%%%DOCSDIR%%/dev-html/devel.html
-%%PORTDOCS%%%%DOCSDIR%%/dev-html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/dev-html/nx_grp_g.png
-%%PORTDOCS%%%%DOCSDIR%%/dev-html/prev_g.png
-%%PORTDOCS%%%%DOCSDIR%%/dev-html/up_g.png
-%%PORTDOCS%%%%DOCSDIR%%/dev-text/devel.txt
-%%PORTDOCS%%%%DOCSDIR%%/dev-text/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/devel.aux
-%%PORTDOCS%%%%DOCSDIR%%/devel.dvi
-%%PORTDOCS%%%%DOCSDIR%%/devel.tex
-%%PORTDOCS%%%%DOCSDIR%%/devel2.lyx
-%%PORTDOCS%%%%DOCSDIR%%/man-html/1_Introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/2_Getting.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/3_Basic.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/4_Customizing.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/5_Working.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/6_Writing.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/7_Adding.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/8_How.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/A_Changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/About_this.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/B_Do.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/C_Credits.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/Contents.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/D_Glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/E_Copyright.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/contents.png
-%%PORTDOCS%%%%DOCSDIR%%/man-html/crossref.png
-%%PORTDOCS%%%%DOCSDIR%%/man-html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/manual.css
-%%PORTDOCS%%%%DOCSDIR%%/man-html/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/man-html/next.png
-%%PORTDOCS%%%%DOCSDIR%%/man-html/next_g.png
-%%PORTDOCS%%%%DOCSDIR%%/man-html/prev.png
-%%PORTDOCS%%%%DOCSDIR%%/man-html/prev_g.png
-%%PORTDOCS%%%%DOCSDIR%%/man-html/up.png
-%%PORTDOCS%%%%DOCSDIR%%/man-html/up_g.png
-%%PORTDOCS%%%%DOCSDIR%%/man-text/1_Introduction.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/2_Getting.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/3_Basic.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/4_Customizing.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/5_Working.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/6_Writing.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/7_Adding.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/8_How.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/A_Changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/About_this.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/B_Do.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/C_Credits.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/Contents.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/D_Glossary.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/E_Copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/index.txt
-%%PORTDOCS%%%%DOCSDIR%%/man-text/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual.aux
-%%PORTDOCS%%%%DOCSDIR%%/manual.dvi
-%%PORTDOCS%%%%DOCSDIR%%/manual.tex
-%%PORTDOCS%%%%DOCSDIR%%/manual2.lyx
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/man-text
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/man-html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/dev-text
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/dev-html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+lib/libpspell.so.16
+share/aspell/ccpp.amf
+share/aspell/comment.amf
+share/aspell/email.amf
+share/aspell/html.amf
+share/aspell/none.amf
+share/aspell/perl.amf
+share/aspell/sgml.amf
+share/aspell/tex.amf
+share/aspell/url.amf
+%%NLS%%share/locale/be/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/da/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/de/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/es/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/mn/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/tg/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/wa/LC_MESSAGES/aspell.mo
@dirrm include/pspell
+%%NLS%%@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/be 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/da 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/de 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/en/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/en 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/es 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ga/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ga 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/mn/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/mn 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nl 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sr 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/tg/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/tg 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/uk 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/wa/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/wa 2>/dev/null || true
--- a/textproc/aspell/pkg-plist.af
+++ b/textproc/aspell/pkg-plist.af
@ -1,4 +1,3 @@
-share/aspell/af.dat
 share/aspell/af.multi
 share/aspell/af.rws
 share/aspell/afrikaans.alias
--- a/textproc/aspell/pkg-plist.az
+++ b/textproc/aspell/pkg-plist.az
@ -0,0 +1,7 @@
+lib/aspell-%%VER%%/az.dat
+lib/aspell-%%VER%%/l-az.cmap
+lib/aspell-%%VER%%/l-az.cset
+share/aspell/az.multi
+share/aspell/az.rws
+share/aspell/azerbaijani.alias
+share/aspell/azeri.alias
--- a/textproc/aspell/pkg-plist.be
+++ b/textproc/aspell/pkg-plist.be
@ -0,0 +1,9 @@
+lib/aspell-%%VER%%/be.dat
+share/aspell/be-common.rws
+share/aspell/be-only.rws
+share/aspell/be.multi
+share/aspell/be_BY.alias
+share/aspell/be_SU-only.rws
+share/aspell/be_SU.multi
+share/aspell/belarusian-soviet.alias
+share/aspell/belarusian.alias
--- a/textproc/aspell/pkg-plist.bg
+++ b/textproc/aspell/pkg-plist.bg
@ -1,4 +1,6 @@
-share/aspell/bg.dat
+lib/aspell-%%VER%%/bg_phonet.dat
+lib/aspell-%%VER%%/bulgarian.kbd
+lib/aspell-%%VER%%/bg.dat
 share/aspell/bg.multi
 share/aspell/bg.rws
 share/aspell/bulgarian.alias
--- a/textproc/aspell/pkg-plist.bn
+++ b/textproc/aspell/pkg-plist.bn
@ -0,0 +1,6 @@
+lib/aspell-%%VER%%/u-beng.cmap
+lib/aspell-%%VER%%/u-beng.cset
+lib/aspell-%%VER%%/bn.dat
+share/aspell/bengali.alias
+share/aspell/bn.multi
+share/aspell/bn.rws
--- a/textproc/aspell/pkg-plist.br
+++ b/textproc/aspell/pkg-plist.br
@ -1,6 +1,6 @@
-share/aspell/br.dat
+lib/aspell-%%VER%%/br.dat
+lib/aspell-%%VER%%/br_phonet.dat
 share/aspell/br.multi
 share/aspell/br.rws
-share/aspell/br_phonet.dat
 share/aspell/breton.alias
 share/aspell/brezhoneg.alias
--- a/textproc/aspell/pkg-plist.ca
+++ b/textproc/aspell/pkg-plist.ca
@ -1,4 +1,5 @@
-share/aspell/ca.dat
+lib/aspell-%%VER%%/ca.dat
+lib/aspell-%%VER%%/ca_affix.dat
 share/aspell/ca.multi
 share/aspell/ca.rws
 share/aspell/catalan.alias
--- a/textproc/aspell/pkg-plist.cs
+++ b/textproc/aspell/pkg-plist.cs
@ -1,4 +1,4 @@
-share/aspell/cs.dat
+lib/aspell-%%VER%%/cs.dat
 share/aspell/cs.multi
 share/aspell/cs.rws
 share/aspell/czech.alias
--- a/textproc/aspell/pkg-plist.cy
+++ b/textproc/aspell/pkg-plist.cy
@ -1,4 +1,4 @@
-share/aspell/cy.dat
+lib/aspell-%%VER%%/cy.dat
 share/aspell/cy.multi
 share/aspell/cy.rws
 share/aspell/welsh.alias
--- a/textproc/aspell/pkg-plist.da
+++ b/textproc/aspell/pkg-plist.da
@ -1,5 +1,5 @@
-share/aspell/da.dat
+lib/aspell-%%VER%%/da_phonet.dat
+lib/aspell-%%VER%%/da.dat
 share/aspell/da.multi
 share/aspell/da.rws
-share/aspell/da_phonet.dat
 share/aspell/dansk.alias
--- a/textproc/aspell/pkg-plist.de
+++ b/textproc/aspell/pkg-plist.de
@ -1,11 +1,11 @@
+lib/aspell-%%VER%%/de_phonet.dat
+lib/aspell-%%VER%%/de.dat
 share/aspell/de-only.rws
-share/aspell/de.dat
 share/aspell/de.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/de_phonet.dat
 share/aspell/deutsch.alias
 share/aspell/german.alias
 share/aspell/swiss.alias
--- a/textproc/aspell/pkg-plist.el
+++ b/textproc/aspell/pkg-plist.el
@ -1,5 +1,5 @@
-share/aspell/el.dat
-share/aspell/el_phonet.dat
+lib/aspell-%%VER%%/el_phonet.dat
+lib/aspell-%%VER%%/el.dat
 share/aspell/el.multi
 share/aspell/el.rws
 share/aspell/greek.alias
--- a/textproc/aspell/pkg-plist.en
+++ b/textproc/aspell/pkg-plist.en
@ -1,3 +1,6 @@
+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
@ -22,7 +25,6 @@ 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.dat
 share/aspell/en.multi
 share/aspell/en_CA-w_accents-only.rws
 share/aspell/en_CA-w_accents.multi
@ -47,7 +49,6 @@ 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/en_phonet.dat
 share/aspell/english-variant_0.alias
 share/aspell/english-variant_1.alias
 share/aspell/english-variant_2.alias
--- a/textproc/aspell/pkg-plist.eo
+++ b/textproc/aspell/pkg-plist.eo
@ -1,4 +1,4 @@
-share/aspell/eo.dat
+lib/aspell-%%VER%%/eo.dat
 share/aspell/eo.multi
 share/aspell/eo.rws
 share/aspell/esperanto.alias
--- a/textproc/aspell/pkg-plist.es
+++ b/textproc/aspell/pkg-plist.es
@ -1,4 +1,4 @@
-share/aspell/es.dat
+lib/aspell-%%VER%%/es.dat
 share/aspell/es.multi
 share/aspell/es.rws
 share/aspell/español.alias
--- a/textproc/aspell/pkg-plist.et
+++ b/textproc/aspell/pkg-plist.et
@ -0,0 +1,5 @@
+lib/aspell-%%VER%%/et_affix.dat
+lib/aspell-%%VER%%/et.dat
+share/aspell/estonian.alias
+share/aspell/et.multi
+share/aspell/et.rws
--- a/textproc/aspell/pkg-plist.fi
+++ b/textproc/aspell/pkg-plist.fi
@ -0,0 +1,5 @@
+lib/aspell-%%VER%%/fi.dat
+lib/aspell-%%VER%%/fi_affix.dat
+share/aspell/fi.multi
+share/aspell/fi.rws
+share/aspell/finnish.alias
--- a/textproc/aspell/pkg-plist.fo
+++ b/textproc/aspell/pkg-plist.fo
@ -1,6 +1,6 @@
+lib/aspell-%%VER%%/fo.dat
+lib/aspell-%%VER%%/fo_phonet.dat
+share/aspell/føroyskt.alias
 share/aspell/faroese.alias
-share/aspell/fo.dat
 share/aspell/fo.multi
 share/aspell/fo.rws
-share/aspell/fo_phonet.dat
-share/aspell/føroyskt.alias
--- a/textproc/aspell/pkg-plist.fr
+++ b/textproc/aspell/pkg-plist.fr
@ -1,3 +1,5 @@
+lib/aspell-%%VER%%/fr.dat
+lib/aspell-%%VER%%/fr_phonet.dat
 share/aspell/fr-40-only.rws
 share/aspell/fr-40.multi
 share/aspell/fr-60-only.rws
@ -8,7 +10,6 @@ share/aspell/fr-lrg.alias
 share/aspell/fr-med.alias
 share/aspell/fr-sml.alias
 share/aspell/fr.multi
-share/aspell/fr.dat
 share/aspell/fr_CH-40.multi
 share/aspell/fr_CH-60.multi
 share/aspell/fr_CH-80.multi
@ -24,7 +25,6 @@ share/aspell/fr_FR-lrg.alias
 share/aspell/fr_FR-med.alias
 share/aspell/fr_FR-sml.alias
 share/aspell/fr_FR.multi
-share/aspell/fr_phonet.dat
 share/aspell/francais-40.alias
 share/aspell/francais-60.alias
 share/aspell/francais-80.alias
--- a/textproc/aspell/pkg-plist.ga
+++ b/textproc/aspell/pkg-plist.ga
@ -1,6 +1,6 @@
-share/aspell/ga.dat
+lib/aspell-%%VER%%/ga_phonet.dat
+lib/aspell-%%VER%%/ga.dat
 share/aspell/ga.multi
 share/aspell/ga.rws
-share/aspell/ga_phonet.dat
 share/aspell/gaeilge.alias
 share/aspell/irish.alias
--- a/textproc/aspell/pkg-plist.gd
+++ b/textproc/aspell/pkg-plist.gd
@ -1,5 +1,5 @@
+lib/aspell-%%VER%%/gd_phonet.dat
+lib/aspell-%%VER%%/gd.dat
 share/aspell/gaidhlig.alias
-share/aspell/gd.dat
 share/aspell/gd.multi
 share/aspell/gd.rws
-share/aspell/gd_phonet.dat
--- a/textproc/aspell/pkg-plist.gl
+++ b/textproc/aspell/pkg-plist.gl
@ -1,4 +1,4 @@
-share/aspell/gl.dat
+lib/aspell-%%VER%%/gl_phonet.dat
+lib/aspell-%%VER%%/gl.dat
 share/aspell/gl.multi
 share/aspell/gl.rws
-share/aspell/gl_phonet.dat
--- a/textproc/aspell/pkg-plist.gv
+++ b/textproc/aspell/pkg-plist.gv
@ -1,5 +1,5 @@
+lib/aspell-%%VER%%/gv.dat
 share/aspell/gaelg.alias
-share/aspell/gv.dat
 share/aspell/gv.multi
 share/aspell/gv.rws
 share/aspell/manx.alias
--- a/textproc/aspell/pkg-plist.he
+++ b/textproc/aspell/pkg-plist.he
@ -0,0 +1,7 @@
+lib/aspell-%%VER%%/he.dat
+lib/aspell-%%VER%%/he_affix.dat
+lib/aspell-%%VER%%/iso-8859-8-nl.cmap
+lib/aspell-%%VER%%/iso-8859-8-nl.cset
+share/aspell/he.multi
+share/aspell/he.rws
+share/aspell/hebrew.alias
--- a/textproc/aspell/pkg-plist.hr
+++ b/textproc/aspell/pkg-plist.hr
@ -1,4 +1,4 @@
-share/aspell/hr.dat
+lib/aspell-%%VER%%/hr.dat
 share/aspell/hr.multi
 share/aspell/hr.rws
 share/aspell/croatian.alias
--- a/textproc/aspell/pkg-plist.hsb
+++ b/textproc/aspell/pkg-plist.hsb
@ -0,0 +1,4 @@
+lib/aspell-%%VER%%/hsb_affix.dat
+lib/aspell-%%VER%%/hsb.dat
+share/aspell/hsb.multi
+share/aspell/hsb.rws
--- a/textproc/aspell/pkg-plist.hu
+++ b/textproc/aspell/pkg-plist.hu
@ -0,0 +1,5 @@
+lib/aspell-%%VER%%/hu.dat
+lib/aspell-%%VER%%/hu_affix.dat
+share/aspell/hu.multi
+share/aspell/hu.rws
+share/aspell/hungarian.alias
--- a/textproc/aspell/pkg-plist.ia
+++ b/textproc/aspell/pkg-plist.ia
@ -1,4 +1,4 @@
-share/aspell/ia.dat
+lib/aspell-%%VER%%/ia.dat
 share/aspell/ia.multi
 share/aspell/ia.rws
 share/aspell/interlingua.alias
--- a/textproc/aspell/pkg-plist.id
+++ b/textproc/aspell/pkg-plist.id
@ -1,4 +1,4 @@
-share/aspell/id.dat
+lib/aspell-%%VER%%/id.dat
 share/aspell/id.multi
 share/aspell/id.rws
 share/aspell/indonesian.alias
--- a/textproc/aspell/pkg-plist.is
+++ b/textproc/aspell/pkg-plist.is
@ -1,6 +1,6 @@
+lib/aspell-%%VER%%/is_phonet.dat
+lib/aspell-%%VER%%/is.dat
 share/aspell/icelandic.alias
-share/aspell/is.dat
 share/aspell/is.multi
 share/aspell/is.rws
-share/aspell/is_phonet.dat
 share/aspell/íslenska.alias
--- a/textproc/aspell/pkg-plist.it
+++ b/textproc/aspell/pkg-plist.it
@ -1,4 +1,4 @@
-share/aspell/it.dat
+lib/aspell-%%VER%%/it.dat
 share/aspell/it.multi
 share/aspell/it.rws
 share/aspell/italian.alias
--- a/textproc/aspell/pkg-plist.la
+++ b/textproc/aspell/pkg-plist.la
@ -0,0 +1,5 @@
+lib/aspell-%%VER%%/la.dat
+lib/aspell-%%VER%%/la_affix.dat
+share/aspell/la.multi
+share/aspell/la.rws
+share/aspell/latin.alias
--- a/textproc/aspell/pkg-plist.lt
+++ b/textproc/aspell/pkg-plist.lt
@ -0,0 +1,6 @@
+lib/aspell-%%VER%%/lt.dat
+lib/aspell-%%VER%%/lt_affix.dat
+share/aspell/lietuviu.alias
+share/aspell/lithuanian.alias
+share/aspell/lt.multi
+share/aspell/lt.rws
--- a/textproc/aspell/pkg-plist.lv
+++ b/textproc/aspell/pkg-plist.lv
@ -0,0 +1,5 @@
+lib/aspell-%%VER%%/lv_affix.dat
+lib/aspell-%%VER%%/lv.dat
+share/aspell/latvian.alias
+share/aspell/lv.multi
+share/aspell/lv.rws
--- a/textproc/aspell/pkg-plist.mi
+++ b/textproc/aspell/pkg-plist.mi
@ -1,4 +1,4 @@
+lib/aspell-%%VER%%/mi.dat
 share/aspell/maori.alias
-share/aspell/mi.dat
 share/aspell/mi.multi
 share/aspell/mi.rws
--- a/textproc/aspell/pkg-plist.mk
+++ b/textproc/aspell/pkg-plist.mk
@ -0,0 +1,4 @@
+lib/aspell-%%VER%%/mk.dat
+share/aspell/macedonian.alias
+share/aspell/mk.multi
+share/aspell/mk.rws
--- a/textproc/aspell/pkg-plist.mn
+++ b/textproc/aspell/pkg-plist.mn
@ -0,0 +1,6 @@
+lib/aspell-%%VER%%/l-mn.cmap
+lib/aspell-%%VER%%/l-mn.cset
+lib/aspell-%%VER%%/mn.dat
+share/aspell/mn.multi
+share/aspell/mn.rws
+share/aspell/mongolian.alias
--- a/textproc/aspell/pkg-plist.ms
+++ b/textproc/aspell/pkg-plist.ms
@ -1,4 +1,4 @@
+lib/aspell-%%VER%%/ms.dat
 share/aspell/malay.alias
-share/aspell/ms.dat
 share/aspell/ms.multi
 share/aspell/ms.rws
--- a/textproc/aspell/pkg-plist.mt
+++ b/textproc/aspell/pkg-plist.mt
@ -1,6 +1,6 @@
-share/aspell/mt.dat
+lib/aspell-%%VER%%/mt_phonet.dat
+lib/aspell-%%VER%%/mt.dat
 share/aspell/mt.multi
 share/aspell/mt.rws
 share/aspell/maltese.alias
 share/aspell/malti.alias
-share/aspell/mt_phonet.dat
--- a/textproc/aspell/pkg-plist.nb
+++ b/textproc/aspell/pkg-plist.nb
@ -1,5 +1,7 @@
-share/aspell/nb.dat
-share/aspell/nb.multi
-share/aspell/nb.rws
+lib/aspell-%%VER%%/nb.dat
 share/aspell/bokmal.alias
 share/aspell/bokmål.alias
+share/aspell/nb.multi
+share/aspell/nb.rws
+share/aspell/no.alias
+share/aspell/norsk.alias
--- a/textproc/aspell/pkg-plist.nl
+++ b/textproc/aspell/pkg-plist.nl
@ -1,4 +1,4 @@
+lib/aspell-%%VER%%/nl.dat
 share/aspell/dutch.alias
-share/aspell/nl.dat
 share/aspell/nl.multi
 share/aspell/nl.rws
--- a/textproc/aspell/pkg-plist.nn
+++ b/textproc/aspell/pkg-plist.nn
@ -1,4 +1,4 @@
-share/aspell/nn.dat
+lib/aspell-%%VER%%/nn.dat
 share/aspell/nn.multi
 share/aspell/nn.rws
 share/aspell/nynorsk.alias
--- a/textproc/aspell/pkg-plist.ny
+++ b/textproc/aspell/pkg-plist.ny
@ -0,0 +1,6 @@
+lib/aspell-%%VER%%/ny.dat
+share/aspell/chewa.alias
+share/aspell/chichewa.alias
+share/aspell/ny.multi
+share/aspell/ny.rws
+share/aspell/nyanja.alias
--- a/textproc/aspell/pkg-plist.pl
+++ b/textproc/aspell/pkg-plist.pl
@ -1,4 +1,4 @@
-share/aspell/pl.dat
+lib/aspell-%%VER%%/pl.dat
 share/aspell/pl.multi
 share/aspell/pl.rws
 share/aspell/polish.alias
--- a/textproc/aspell/pkg-plist.pt
+++ b/textproc/aspell/pkg-plist.pt
@ -1,8 +1,8 @@
+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.dat
 share/aspell/pt.multi
 share/aspell/pt_BR-only.rws
 share/aspell/pt_BR.multi
--- a/textproc/aspell/pkg-plist.qu
+++ b/textproc/aspell/pkg-plist.qu
@ -0,0 +1,5 @@
+lib/aspell-%%VER%%/qu.dat
+lib/aspell-%%VER%%/qu_affix.dat
+share/aspell/qu.multi
+share/aspell/qu.rws
+share/aspell/quechua.alias
--- a/textproc/aspell/pkg-plist.ro
+++ b/textproc/aspell/pkg-plist.ro
@ -1,4 +1,4 @@
-share/aspell/ro.dat
+lib/aspell-%%VER%%/ro.dat
 share/aspell/ro.multi
 share/aspell/ro.rws
 share/aspell/romaneste.alias
--- a/textproc/aspell/pkg-plist.ru
+++ b/textproc/aspell/pkg-plist.ru
@ -1,5 +1,8 @@
-share/aspell/ru.dat
+lib/aspell-%%VER%%/ru.dat
+lib/aspell-%%VER%%/ru_affix.dat
+share/aspell/ru-ye.multi
+share/aspell/ru-ye.rws
+share/aspell/ru-yeyo.multi
+share/aspell/ru-yo.multi
+share/aspell/ru-yo.rws
 share/aspell/ru.multi
-share/aspell/ru.rws
-share/aspell/ru_phonet.dat
-share/aspell/russian.alias
--- a/textproc/aspell/pkg-plist.rw
+++ b/textproc/aspell/pkg-plist.rw
@ -0,0 +1,3 @@
+lib/aspell-%%VER%%/rw.dat
+share/aspell/rw.multi
+share/aspell/rw.rws
--- a/textproc/aspell/pkg-plist.sc
+++ b/textproc/aspell/pkg-plist.sc
@ -0,0 +1,5 @@
+lib/aspell-%%VER%%/sc.dat
+share/aspell/sardinian.alias
+share/aspell/sc.multi
+share/aspell/sc.rws
+share/aspell/srd.alias
--- a/textproc/aspell/pkg-plist.sk
+++ b/textproc/aspell/pkg-plist.sk
@ -1,6 +1,6 @@
+lib/aspell-%%VER%%/sk.dat
 share/aspell/sk-extend.rws
 share/aspell/sk-extended.multi
-share/aspell/sk.dat
 share/aspell/sk.multi
 share/aspell/sk.rws
 share/aspell/sk_SK-extended.alias
--- a/textproc/aspell/pkg-plist.sl
+++ b/textproc/aspell/pkg-plist.sl
@ -1,4 +1,4 @@
-share/aspell/sl.dat
+lib/aspell-%%VER%%/sl.dat
 share/aspell/sl.multi
 share/aspell/sl.rws
 share/aspell/slovenian.alias
--- a/textproc/aspell/pkg-plist.sv
+++ b/textproc/aspell/pkg-plist.sv
@ -1,6 +1,6 @@
-share/aspell/sv.dat
+lib/aspell-%%VER%%/sv_phonet.dat
+lib/aspell-%%VER%%/sv.dat
 share/aspell/sv.multi
 share/aspell/sv.rws
-share/aspell/sv_phonet.dat
 share/aspell/svenska.alias
 share/aspell/swedish.alias
--- a/textproc/aspell/pkg-plist.sw
+++ b/textproc/aspell/pkg-plist.sw
@ -1,5 +1,5 @@
+lib/aspell-%%VER%%/sw.dat
 share/aspell/kiswahili.alias
-share/aspell/sw.dat
 share/aspell/sw.multi
 share/aspell/sw.rws
 share/aspell/swahili.alias
--- a/textproc/aspell/pkg-plist.ta
+++ b/textproc/aspell/pkg-plist.ta
@ -0,0 +1,6 @@
+lib/aspell-%%VER%%/ta.dat
+lib/aspell-%%VER%%/u-taml.cmap
+lib/aspell-%%VER%%/u-taml.cset
+share/aspell/ta.multi
+share/aspell/ta.rws
+share/aspell/tamil.alias
--- a/textproc/aspell/pkg-plist.tet
+++ b/textproc/aspell/pkg-plist.tet
@ -0,0 +1,5 @@
+lib/aspell-%%VER%%/tet.dat
+share/aspell/tet.multi
+share/aspell/tet.rws
+share/aspell/tetum.alias
+share/aspell/tetun.alias
--- a/textproc/aspell/pkg-plist.tl
+++ b/textproc/aspell/pkg-plist.tl
@ -0,0 +1,4 @@
+lib/aspell-%%VER%%/tl.dat
+share/aspell/tagalog.alias
+share/aspell/tl.multi
+share/aspell/tl.rws
--- a/textproc/aspell/pkg-plist.tn
+++ b/textproc/aspell/pkg-plist.tn
@ -1,5 +1,5 @@
+lib/aspell-%%VER%%/tn.dat
 share/aspell/setswana.alias
-share/aspell/tn.dat
 share/aspell/tn.multi
 share/aspell/tn.rws
 share/aspell/tswana.alias
--- a/textproc/aspell/pkg-plist.tr
+++ b/textproc/aspell/pkg-plist.tr
@ -1,3 +1,3 @@
-share/aspell/tr.dat
+lib/aspell-%%VER%%/tr.dat
 share/aspell/tr.multi
 share/aspell/tr.rws
--- a/textproc/aspell/pkg-plist.uk
+++ b/textproc/aspell/pkg-plist.uk
@ -1,4 +1,4 @@
-share/aspell/uk.dat
+lib/aspell-%%VER%%/uk.dat
 share/aspell/uk.multi
 share/aspell/uk.rws
 share/aspell/ukrainian.alias
--- a/textproc/aspell/pkg-plist.uz
+++ b/textproc/aspell/pkg-plist.uz
@ -0,0 +1,6 @@
+lib/aspell-%%VER%%/l-uz.cmap
+lib/aspell-%%VER%%/l-uz.cset
+lib/aspell-%%VER%%/uz.dat
+share/aspell/uz.multi
+share/aspell/uz.rws
+share/aspell/uzbek.alias
--- a/textproc/aspell/pkg-plist.vi
+++ b/textproc/aspell/pkg-plist.vi
@ -0,0 +1,8 @@
+lib/aspell-%%VER%%/tcvn3.cmap
+lib/aspell-%%VER%%/tcvn3.cset
+lib/aspell-%%VER%%/vi.dat
+lib/aspell-%%VER%%/viscii.cmap
+lib/aspell-%%VER%%/viscii.cset
+share/aspell/vi.multi
+share/aspell/vi.rws
+share/aspell/viet.alias
--- a/textproc/aspell/pkg-plist.wa
+++ b/textproc/aspell/pkg-plist.wa
@ -1,6 +1,6 @@
-share/aspell/wa.dat
+lib/aspell-%%VER%%/wa_phonet.dat
+lib/aspell-%%VER%%/wa.dat
 share/aspell/wa.multi
-share/aspell/wa_phonet.dat
 share/aspell/wa.rws
 share/aspell/walloon.alias
 share/aspell/walon.alias
--- a/textproc/aspell/pkg-plist.yi
+++ b/textproc/aspell/pkg-plist.yi
@ -0,0 +1,6 @@
+lib/aspell-%%VER%%/u-hebr.cmap
+lib/aspell-%%VER%%/u-hebr.cset
+lib/aspell-%%VER%%/yi.dat
+share/aspell/yi.multi
+share/aspell/yi.rws
+share/aspell/yiddish.alias
--- a/textproc/aspell/pkg-plist.zu
+++ b/textproc/aspell/pkg-plist.zu
@ -1,4 +1,4 @@
-share/aspell/zu.dat
+lib/aspell-%%VER%%/zu.dat
 share/aspell/zu.multi
 share/aspell/zu.rws
 share/aspell/zulu.alias