- Move language prefix to PKGNAMEPREFIX

- Use DATADIR - Use PLIST_DIRSTRY for DATADIR - Explicitly list installing filenames - Bump PORTREVISION for PORTNAME and PLIST change - Sort PLIST - Cosmetic change
author: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> 2011-07-29 13:13:17 +0000
committer: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> 2011-07-29 13:13:17 +0000
commit: 72c08ec487edbe98662f3278bee17f8726ee4ce4 (patch)
tree: a3c6d7d2a4a492c3e55a418f3fa370e951b5ccc7
parent: - Update MASTER_SITES (diff)
65 files changed, 639 insertions, 564 deletions
diff --git a/french/hunspell/Makefile b/french/hunspell/Makefile
index bd2685374462..2ce5c0377e3f 100644
--- a/french/hunspell/Makefile
+++ b/french/hunspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hunspell
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	french textproc
 MASTER_SITES=	http://www.dicollecte.org/download/fr/
 DISTNAME=	hunspell-fr-moderne-v${PORTVERSION}
@@ -17,23 +18,23 @@ COMMENT=	Hunspell modern french dictionary
 USE_ZIP=	yes
 NO_BUILD=	yes
 
+PLIST_FILES=	%%DATADIR%%/fr_FR.aff \
+		%%DATADIR%%/fr_FR.dic
+PLIST_DIRSTRY=	%%DATADIR%%
+
 FRALIASES=	fr_BE fr_CA fr_CH fr_LU
-PLIST_FILES=	share/hunspell/fr_FR.aff \
-		share/hunspell/fr_FR.dic
 .for ALIAS in ${FRALIASES}
-PLIST_FILES+=	share/hunspell/${ALIAS}.aff \
-		share/hunspell/${ALIAS}.dic
+PLIST_FILES+=	%%DATADIR%%/${ALIAS}.aff \
+		%%DATADIR%%/${ALIAS}.dic
 .endfor
-PLIST_DIRS=	share/hunspell
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/fr-moderne.aff ${PREFIX}/share/hunspell/fr_FR.aff
-	@${INSTALL_DATA} ${WRKDIR}/fr-moderne.dic ${PREFIX}/share/hunspell/fr_FR.dic
-	@cd ${PREFIX}/share/hunspell; \
-	for alias in ${FRALIASES}; do \
-		${LN} -s fr_FR.aff $${alias}.aff ; \
-		${LN} -s fr_FR.dic $${alias}.dic ; \
-	done
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/fr-moderne.aff ${DATADIR}/fr_FR.aff
+	${INSTALL_DATA} ${WRKDIR}/fr-moderne.dic ${DATADIR}/fr_FR.dic
+.for ALIAS in ${FRALIASES}
+	${LN} -s fr_FR.aff ${DATADIR}/${ALIAS}.aff
+	${LN} -s fr_FR.dic ${DATADIR}/${ALIAS}.dic
+.endfor
 
 .include <bsd.port.mk>
diff --git a/french/hyphen/Makefile b/french/hyphen/Makefile
index 8a31ee9a3b49..b1c5200b86c0 100644
--- a/french/hyphen/Makefile
+++ b/french/hyphen/Makefile
@@ -7,8 +7,7 @@
 
 PORTNAME=	hyphen
 PORTVERSION=	2.0
-#PORTREVISION=	0
-#PORTEPOCH=	0
+PORTREVISION=	1
 CATEGORIES=	french textproc
 MASTER_SITES=	http://www.dicollecte.org/download/fr/
 DISTNAME=	hyph_fr_${PORTVERSION:S/./-/}
@@ -19,21 +18,19 @@ COMMENT=	French hyphenation rules
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_fr_FR.dic
+PLIST_FILES=	%%DATADIR%%/hyph_fr_FR.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 FRALIASES=	fr_BE fr_CA fr_CH fr_LU
-
 .for ALIAS in ${FRALIASES}
-PLIST_FILES+=	share/hyphen/hyph_${ALIAS}.dic
+PLIST_FILES+=	%%DATADIR%%/hyph_${ALIAS}.dic
 .endfor
-PLIST_DIRS=	share/hyphen
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_fr_FR.dic ${PREFIX}/share/hyphen
-	@cd ${PREFIX}/share/hyphen; \
-	for alias in ${FRALIASES}; do \
-		${LN} -s hyph_fr_FR.dic hyph_$${alias}.dic ; \
-	done
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_fr_FR.dic ${DATADIR}/
+.for ALIAS in ${FRALIASES}
+	${LN} -s hyph_fr_FR.dic ${DATADIR}/hyph_${ALIAS}.dic
+.endfor
 
 .include <bsd.port.mk>
diff --git a/french/mythes/Makefile b/french/mythes/Makefile
index 297211e54e54..3101c5ed697e 100644
--- a/french/mythes/Makefile
+++ b/french/mythes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mythes
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	french textproc
 MASTER_SITES=	http://www.dicollecte.org/download/fr/
 DISTNAME=	thesaurus-v${PORTVERSION}
@@ -18,27 +19,25 @@ LICENSE=	LGPL21
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-FRALIASES=	fr_BE fr_CA fr_CH fr_LU
-
-PLIST_FILES=	share/mythes/th_fr_FR_v2.dat \
-		share/mythes/th_fr_FR_v2.idx
+PLIST_FILES=	%%DATADIR%%/th_fr_FR_v2.dat \
+		%%DATADIR%%/th_fr_FR_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
+FRALIASES=	fr_BE fr_CA fr_CH fr_LU
 .for ALIAS in ${FRALIASES}
-PLIST_FILES+=	share/mythes/th_${ALIAS}_v2.dat \
-		share/mythes/th_${ALIAS}_v2.idx
+PLIST_FILES+=	%%DATADIR%%/th_${ALIAS}_v2.dat \
+		%%DATADIR%%/th_${ALIAS}_v2.idx
 .endfor
 
-PLIST_DIRS=	share/mythes
-
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/thes_fr.dat ${PREFIX}/share/mythes/th_fr_FR_v2.dat
-	@${INSTALL_DATA} ${WRKDIR}/thes_fr.idx ${PREFIX}/share/mythes/th_fr_FR_v2.idx
-	@cd ${PREFIX}/share/mythes; \
-	for alias in ${FRALIASES}; do \
-	  ${LN} -s th_fr_FR_v2.idx th_$${alias}_v2.idx ; \
-	  ${LN} -s th_fr_FR_v2.dat th_$${alias}_v2.dat ; \
-	done
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/thes_fr.dat ${DATADIR}/th_fr_FR_v2.dat
+	${INSTALL_DATA} ${WRKSRC}/thes_fr.idx ${DATADIR}/th_fr_FR_v2.idx
+.for ALIAS in ${FRALIASES}
+	${LN} -s th_fr_FR_v2.dat ${DATADIR}/th_${ALIAS}_v2.dat
+	${LN} -s th_fr_FR_v2.idx ${DATADIR}/th_${ALIAS}_v2.idx
+.endfor
 
 .include <bsd.port.mk>
diff --git a/german/hunspell/Makefile b/german/hunspell/Makefile
index 8d5b80ddbead..54e1798eb075 100644
--- a/german/hunspell/Makefile
+++ b/german/hunspell/Makefile
@@ -22,31 +22,31 @@ ALL_TARGET=	hunspell-all
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
 
-PLIST_FILES=	share/hunspell/de_AT.aff \
-		share/hunspell/de_AT.dic \
-		share/hunspell/de_CH.aff \
-		share/hunspell/de_CH.dic \
-		share/hunspell/de_DE.aff \
-		share/hunspell/de_DE.dic
-PLIST_DIRSTRY=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/de_AT.aff \
+		%%DATADIR%%/de_AT.dic \
+		%%DATADIR%%/de_CH.aff \
+		%%DATADIR%%/de_CH.dic \
+		%%DATADIR%%/de_DE.aff \
+		%%DATADIR%%/de_DE.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 CHALIASES=	de_LI
 DEALIASES=	de_BE de_LU
 .for ALIAS in ${CHALIASES} ${DEALIASES}
-PLIST_FILES+=	share/hunspell/${ALIAS}.aff \
-		share/hunspell/${ALIAS}.dic
+PLIST_FILES+=	%%DATADIR%%/${ALIAS}.aff \
+		%%DATADIR%%/${ALIAS}.dic
 .endfor
 
 do-install:
-	${MKDIR} ${PREFIX}/share/hunspell/
-	${INSTALL_DATA} ${WRKSRC}/hunspell/*.aff ${WRKSRC}/hunspell/*.dic ${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/hunspell/*.aff ${WRKSRC}/hunspell/*.dic ${DATADIR}/
 .for ALIAS in ${CHALIASES}
-	${LN} -s de_CH.aff ${PREFIX}/share/hunspell/${ALIAS}.aff
-	${LN} -s de_CH.dic ${PREFIX}/share/hunspell/${ALIAS}.dic
+	${LN} -s de_CH.aff ${DATADIR}/${ALIAS}.aff
+	${LN} -s de_CH.dic ${DATADIR}/${ALIAS}.dic
 .endfor
 .for ALIAS in ${DEALIASES}
-	${LN} -s de_DE.aff ${PREFIX}/share/hunspell/${ALIAS}.aff
-	${LN} -s de_DE.dic ${PREFIX}/share/hunspell/${ALIAS}.dic
+	${LN} -s de_DE.aff ${DATADIR}/${ALIAS}.aff
+	${LN} -s de_DE.dic ${DATADIR}/${ALIAS}.dic
 .endfor
 
 .include <bsd.port.mk>
diff --git a/german/hyphen/Makefile b/german/hyphen/Makefile
index 1ac1d9e5ec62..cbfe7e9cbd75 100644
--- a/german/hyphen/Makefile
+++ b/german/hyphen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hyphen
 PORTVERSION=	2007.02.17
+PORTREVISION=	1
 CATEGORIES=	german textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
 DISTNAME=	hyph_de_DE
@@ -19,20 +20,19 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-DEALIASES=	de_AT de_BE de_CH de_LI de_LU
+PLIST_FILES=	%%DATADIR%%/hyph_de_DE.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
-PLIST_FILES=	share/hyphen/hyph_de_DE.dic
+DEALIASES=	de_AT de_BE de_CH de_LI de_LU
 .for ALIAS in ${DEALIASES}
-PLIST_FILES+=	share/hyphen/hyph_${ALIAS}.dic
+PLIST_FILES+=	%%DATADIR%%/hyph_${ALIAS}.dic
 .endfor
-PLIST_DIRS=	share/hyphen
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_de_DE.dic ${PREFIX}/share/hyphen
-	@cd ${PREFIX}/share/hyphen; \
-	for alias in ${DEALIASES}; do \
-	  ${LN} -s hyph_de_DE.dic hyph_$${alias}.dic ; \
-	done
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_de_DE.dic ${DATADIR}/
+.for ALIAS in ${DEALIASES}
+	${LN} -s hyph_de_DE.dic ${DATADIR}/hyph_${ALIAS}.dic
+.endfor
 
 .include <bsd.port.mk>
diff --git a/german/mythes/Makefile b/german/mythes/Makefile
index 4eedacaa7dee..22be1501c4ff 100644
--- a/german/mythes/Makefile
+++ b/german/mythes/Makefile
@@ -21,23 +21,23 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_de_DE_v2.idx \
-		share/mythes/th_de_DE_v2.dat
-PLIST_DIRSTRY=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_de_DE_v2.idx \
+		%%DATADIR%%/th_de_DE_v2.dat
+PLIST_DIRSTRY=	%%DATADIR%%
 
 DEALIASES=	de_AT de_BE de_CH de_LI de_LU
 
 .for ALIAS in ${DEALIASES}
-PLIST_FILES+=	share/mythes/th_${ALIAS}_v2.idx \
-		share/mythes/th_${ALIAS}_v2.dat
+PLIST_FILES+=	%%DATADIR%%/th_${ALIAS}_v2.idx \
+		%%DATADIR%%/th_${ALIAS}_v2.dat
 .endfor
 
 do-install:
-	${MKDIR} ${PREFIX}/share/mythes/
-	${INSTALL_DATA} ${WRKSRC}/th_de_DE_v2.dat ${WRKSRC}/th_de_DE_v2.idx ${PREFIX}/share/mythes/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_de_DE_v2.dat ${WRKSRC}/th_de_DE_v2.idx ${DATADIR}/
 .for ALIAS in ${DEALIASES}
-	${LN} -s th_de_DE_v2.dat ${PREFIX}/share/mythes/th_${ALIAS}_v2.dat
-	${LN} -s th_de_DE_v2.idx ${PREFIX}/share/mythes/th_${ALIAS}_v2.idx
+	${LN} -s th_de_DE_v2.dat ${DATADIR}/th_${ALIAS}_v2.dat
+	${LN} -s th_de_DE_v2.idx ${DATADIR}/th_${ALIAS}_v2.idx
 .endfor
 
 .include <bsd.port.mk>
diff --git a/hebrew/hunspell/Makefile b/hebrew/hunspell/Makefile
index 901d9763e65e..527aee2418e2 100644
--- a/hebrew/hunspell/Makefile
+++ b/hebrew/hunspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hunspell
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	hebrew textproc
 MASTER_SITES=	http://hspell.ivrix.org.il/
 DISTNAME=	hspell-${PORTVERSION}
@@ -16,22 +17,21 @@ COMMENT=	Hunspell hebrew dictionary
 
 BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 
-GNU_CONFIGURE=	yes
+ALL_TARGET=	myspell
 CONFIGURE_ARGS=	--enable-fatverb
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
-ALL_TARGET=	myspell
 
-PLIST_FILES=	share/hunspell/he.aff \
-		share/hunspell/he.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/he.aff \
+		%%DATADIR%%/he.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 post-patch:
-		@${REINPLACE_CMD} 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/pmerge
+	@${REINPLACE_CMD} 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/pmerge
+
 do-install:
-		@${MKDIR} ${PREFIX}/share/hunspell
-		@${INSTALL_DATA} ${WRKSRC}/he.aff \
-			${WRKSRC}/he.dic \
-			${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/he.aff ${WRKSRC}/he.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/hungarian/hyphen/Makefile b/hungarian/hyphen/Makefile
index c080b125665b..c598b448e0b7 100644
--- a/hungarian/hyphen/Makefile
+++ b/hungarian/hyphen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hyphen
 PORTVERSION=	2007.05.17
+PORTREVISION=	1
 CATEGORIES=	hungarian textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
 DISTNAME=	hyph_hu_HU
@@ -19,11 +20,11 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_hu_HU.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_hu_HU.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_hu_HU.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_hu_HU.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/hungarian/mythes/Makefile b/hungarian/mythes/Makefile
index a320d10f97ad..aa5b2fc58db1 100644
--- a/hungarian/mythes/Makefile
+++ b/hungarian/mythes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mythes
 PORTVERSION=	2003.09.29
+PORTREVISION=	1
 CATEGORIES=	hungarian textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
 DISTNAME=	thes_hu_HU
@@ -18,13 +19,14 @@ LICENSE=	GPLv2
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_hu_HU.dat \
-		share/mythes/th_hu_HU.idx
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_hu_HU.dat \
+		%%DATADIR%%/th_hu_HU.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/th_hu_HU.* ${PREFIX}/share/mythes
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_hu_HU.dat ${WRKSRC}/th_hu_HU.idx ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/polish/hyphen/Makefile b/polish/hyphen/Makefile
index 83f94bd729d6..b9f0618a03b8 100644
--- a/polish/hyphen/Makefile
+++ b/polish/hyphen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hyphen
 PORTVERSION=	2007.04.16
+PORTREVISION=	1
 CATEGORIES=	polish textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
 DISTNAME=	hyph_pl_PL
@@ -19,11 +20,11 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_pl_PL.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_pl_PL.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_pl_PL.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_pl_PL.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/polish/mythes/Makefile b/polish/mythes/Makefile
index 64f931fcf1f4..5cbd53f21869 100644
--- a/polish/mythes/Makefile
+++ b/polish/mythes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mythes
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	polish textproc
 MASTER_SITES=	SF/synonimy/synonimy/${PORTVERSION}/
 DISTNAME=	OOo2-Thesaurus-${PORTVERSION}
@@ -18,14 +19,14 @@ LICENSE=	LGPL21
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_pl_PL_v2.dat \
-		share/mythes/th_pl_PL_v2.idx
-
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_pl_PL_v2.dat \
+		%%DATADIR%%/th_pl_PL_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/th_pl_PL_v2.* ${PREFIX}/share/mythes
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_pl_PL_v2.dat ${WRKSRC}/th_pl_PL_v2.idx ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/portuguese/hunspell/Makefile b/portuguese/hunspell/Makefile
index c207d3bd0452..7cc5e447dbef 100644
--- a/portuguese/hunspell/Makefile
+++ b/portuguese/hunspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hunspell
 PORTVERSION=	20110608
+PORTREVISION=	1
 CATEGORIES=	portuguese textproc
 MASTER_SITES=	http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/ \
 		http://www.broffice.org/files/:BR
@@ -18,23 +19,20 @@ COMMENT=	Hunspell portuguese dictionary
 
 # rely on bsdtar ability to extract .gz and .zip archives
 EXTRACT_CMD=	${CAT}
-EXTRACT_BEFORE_ARGS=
+EXTRACT_BEFORE_ARGS=	# empty
 
 NO_BUILD=	yes
-WRKSRC=	${WRKDIR}/hunspell-pt_PT-${PORTVERSION}
+WRKSRC=		${WRKDIR}/hunspell-pt_PT-${PORTVERSION}
 
-PLIST_FILES=	share/hunspell/pt_PT.aff \
-		share/hunspell/pt_PT.dic \
-		share/hunspell/pt_BR.aff \
-		share/hunspell/pt_BR.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/pt_BR.aff \
+		%%DATADIR%%/pt_BR.dic \
+		%%DATADIR%%/pt_PT.aff \
+		%%DATADIR%%/pt_PT.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-		@${MKDIR} ${PREFIX}/share/hunspell
-		@${INSTALL_DATA} ${WRKDIR}/pt_BR.aff \
-			${WRKDIR}/pt_BR.dic \
-			${WRKSRC}/pt_PT.aff \
-			${WRKSRC}/pt_PT.dic \
-			${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/pt_BR.aff ${WRKDIR}/pt_BR.dic \
+	  	${WRKSRC}/pt_PT.aff ${WRKSRC}/pt_PT.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/portuguese/hyphen/Makefile b/portuguese/hyphen/Makefile
index d32551a583ec..b0348de72e34 100644
--- a/portuguese/hyphen/Makefile
+++ b/portuguese/hyphen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hyphen
 PORTVERSION=	2004.04.15
+PORTREVISION=	1
 CATEGORIES=	portuguese textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
 DISTNAME=	hyph_pt_PT
@@ -19,13 +20,13 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_pt_PT.dic \
-		share/hyphen/hyph_pt_BR.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_pt_BR.dic \
+		%%DATADIR%%/hyph_pt_PT.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_pt_PT.dic ${PREFIX}/share/hyphen
-	@cd ${PREFIX}/share/hyphen; ${LN} -s hyph_pt_PT.dic hyph_pt_BR.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_pt_PT.dic ${DATADIR}/
+	${LN} -s hyph_pt_PT.dic ${DATADIR}/hyph_pt_BR.dic
 
 .include <bsd.port.mk>
diff --git a/portuguese/mythes/Makefile b/portuguese/mythes/Makefile
index de2f6717535a..2045c6582d7d 100644
--- a/portuguese/mythes/Makefile
+++ b/portuguese/mythes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mythes
 PORTVERSION=	2006.08.17
+PORTREVISION=	1
 CATEGORIES=	portuguese textproc
 MASTER_SITES=	http://openthesaurus.caixamagica.pt/download/
 DISTNAME=	thes_pt_PT_v2
@@ -18,18 +19,18 @@ LICENSE=	GPLv2
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_pt_PT_v2.dat \
-		share/mythes/th_pt_PT_v2.idx \
-		share/mythes/th_pt_BR_v2.dat \
-		share/mythes/th_pt_BR_v2.idx
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_pt_BR_v2.dat \
+		%%DATADIR%%/th_pt_BR_v2.idx \
+		%%DATADIR%%/th_pt_PT_v2.dat \
+		%%DATADIR%%/th_pt_PT_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/th_pt_PT_v2.* ${PREFIX}/share/mythes
-	@cd ${PREFIX}/share/mythes; \
-	${LN} -s th_pt_PT_v2.dat th_pt_BR_v2.dat ; \
-	${LN} -s th_pt_PT_v2.idx th_pt_BR_v2.idx
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/th_pt_PT_v2.dat ${WRKSRC}/th_pt_PT_v2.idx ${DATADIR}/
+	${LN} -s th_pt_PT_v2.dat ${DATADIR}/th_pt_BR_v2.dat
+	${LN} -s th_pt_PT_v2.idx ${DATADIR}/th_pt_BR_v2.idx
 
 .include <bsd.port.mk>
diff --git a/russian/hunspell/Makefile b/russian/hunspell/Makefile
index ae6aad864a84..8f4fa7e31bd6 100644
--- a/russian/hunspell/Makefile
+++ b/russian/hunspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hunspell
 PORTVERSION=	20110701
+PORTREVISION=	1
 CATEGORIES=	russian textproc
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	ru_RU_UTF8
@@ -14,18 +15,16 @@ DISTNAME=	ru_RU_UTF8
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Hunspell russian dictionary
 
-PROJECTHOST=	hunspell-ru
 USE_ZIP=	yes
 NO_BUILD=	yes
+PROJECTHOST=	hunspell-ru
 
-PLIST_FILES=	share/hunspell/ru_RU.aff \
-		share/hunspell/ru_RU.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/ru_RU.aff \
+		%%DATADIR%%/ru_RU.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-		@${MKDIR} ${PREFIX}/share/hunspell
-		@${INSTALL_DATA} ${WRKDIR}/ru_RU.aff \
-			${WRKDIR}/ru_RU.dic \
-			${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/ru_RU.aff ${WRKDIR}/ru_RU.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/russian/hyphen/Makefile b/russian/hyphen/Makefile
index 0553620ca898..1466fc8c0e83 100644
--- a/russian/hyphen/Makefile
+++ b/russian/hyphen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hyphen
 PORTVERSION=	2004.04.15
+PORTREVISION=	1
 CATEGORIES=	russian textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
 DISTNAME=	hyph_ru_RU
@@ -19,13 +20,13 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_ru_RU.dic \
-		share/hyphen/hyph_ru_UA.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_ru_RU.dic \
+		%%DATADIR%%/hyph_ru_UA.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_ru_RU.dic ${PREFIX}/share/hyphen
-	@cd ${PREFIX}/share/hyphen; ${LN} -s hyph_ru_RU.dic hyph_ru_UA.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_ru_RU.dic ${DATADIR}/
+	${LN} -s hyph_ru_RU.dic ${DATADIR}/hyph_ru_UA.dic
 
 .include <bsd.port.mk>
diff --git a/russian/mythes/Makefile b/russian/mythes/Makefile
index e564f3da0a5f..39218ebc8aef 100644
--- a/russian/mythes/Makefile
+++ b/russian/mythes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mythes
 PORTVERSION=	2007.06.13
+PORTREVISION=	1
 CATEGORIES=	russian textproc
 MASTER_SITES=	http://download.i-rs.ru/pub/openoffice/dict/
 DISTNAME=	thes_ru_RU_v2
@@ -18,19 +19,18 @@ LICENSE=	LGPL21
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_ru_RU_v2.dat \
-		share/mythes/th_ru_RU_v2.idx \
-		share/mythes/th_ru_UA_v2.dat \
-		share/mythes/th_ru_UA_v2.idx
-
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_ru_RU_v2.dat \
+		%%DATADIR%%/th_ru_RU_v2.idx \
+		%%DATADIR%%/th_ru_UA_v2.dat \
+		%%DATADIR%%/th_ru_UA_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-		@${MKDIR} ${PREFIX}/share/mythes
-		@${INSTALL_DATA} ${WRKDIR}/th_ru_RU_v2.* ${PREFIX}/share/mythes
-		@cd ${PREFIX}/share/mythes; \
-		${LN} -s th_ru_RU_v2.dat th_ru_UA_v2.dat; \
-		${LN} -s th_ru_RU_v2.idx th_ru_UA_v2.idx
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_ru_RU_v2.dat ${WRKSRC}/th_ru_RU_v2.idx ${DATADIR}/
+	${LN} -s th_ru_RU_v2.dat ${DATADIR}/th_ru_UA_v2.dat
+	${LN} -s th_ru_RU_v2.idx ${DATADIR}/th_ru_UA_v2.idx
 
 .include <bsd.port.mk>
diff --git a/textproc/bg-hyphen/Makefile b/textproc/bg-hyphen/Makefile
index 9bdcbcf34942..245776f9d031 100644
--- a/textproc/bg-hyphen/Makefile
+++ b/textproc/bg-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bg-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	4.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/bgoffice/OpenOffice.org%20Hyphenation%20BG/${PORTVERSION}/
+PKGNAMEPREFIX=	bg-
 DISTNAME=	OOo-hyph-bg-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
@@ -20,11 +22,11 @@ LICENSE_COMB=	dual
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_bg_BG.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_bg_BG.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen/
-	@${INSTALL_DATA} ${WRKSRC}/hyph_bg_BG.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/hyph_bg_BG.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/bg-mythes/Makefile b/textproc/bg-mythes/Makefile
index 147691fce334..44d3878e8d8c 100644
--- a/textproc/bg-mythes/Makefile
+++ b/textproc/bg-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bg-mythes
+PORTNAME=	mythes
 PORTVERSION=	4.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/bgoffice/OpenOffice.org%20Thesaurus%20BG/${PORTVERSION}/
+PKGNAMEPREFIX=	bg-
 DISTNAME=	OOo-thes-bg-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
@@ -20,13 +22,12 @@ LICENSE_COMB=	dual
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/mythes/th_bg_BG.dat \
-		share/mythes/th_bg_BG.idx
-
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_bg_BG.dat \
+		%%DATADIR%%/th_bg_BG.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKSRC}/th_bg_BG.* ${PREFIX}/share/mythes
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_bg_BG.dat ${WRKSRC}/th_bg_BG.idx ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/cs-mythes/Makefile b/textproc/cs-mythes/Makefile
index fec2ac029aca..bd5a51cdb175 100644
--- a/textproc/cs-mythes/Makefile
+++ b/textproc/cs-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	cs-mythes
+PORTNAME=	mythes
 PORTVERSION=	2007.09.26
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	cs-
 DISTNAME=	thes_cs_CZ_v2
 
 MAINTAINER=	office@FreeBSD.org
@@ -18,13 +20,14 @@ LICENSE=	BSD
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_cs_CZ_v2.dat \
-		share/mythes/th_cs_CZ_v2.idx
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_cs_CZ_v2.dat \
+		%%DATADIR%%/th_cs_CZ_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/th_cs_CZ_v2.* ${PREFIX}/share/mythes
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_cs_CZ_v2.dat ${WRKSRC}/th_cs_CZ_v2.idx ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/da-hyphen/Makefile b/textproc/da-hyphen/Makefile
index 67a08c6312fa..3918f3f174d6 100644
--- a/textproc/da-hyphen/Makefile
+++ b/textproc/da-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	da-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2007.09.30
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	da-
 DISTNAME=	hyph_da_DK
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,11 +21,11 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_da_DK.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_da_DK.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_da_DK.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_da_DK.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/el-hyphen/Makefile b/textproc/el-hyphen/Makefile
index ca665e0ade62..6f2fb84bf1a9 100644
--- a/textproc/el-hyphen/Makefile
+++ b/textproc/el-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	el-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2005.10.17
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	el-
 DISTNAME=	hyph_el_GR
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,15 +21,13 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_el_GR.dic \
-		share/hyphen/hyph_el_CY.dic
-
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_el_CY.dic \
+		%%DATADIR%%/hyph_el_GR.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_el_GR.dic ${PREFIX}/share/hyphen
-	@cd ${PREFIX}/share/hyphen; \
-	${LN} -s hyph_el_GR.dic hyph_el_CY.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_el_GR.dic ${DATADIR}/
+	${LN} -s hyph_el_GR.dic ${DATADIR}/hyph_el_CY.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/en-hunspell/Makefile b/textproc/en-hunspell/Makefile
index 59aab5b4694e..6364e0440120 100644
--- a/textproc/en-hunspell/Makefile
+++ b/textproc/en-hunspell/Makefile
@@ -5,12 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	en-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	7.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/wordlist/Hunspell%20en_US/${PORTVERSION}-0/ \
 		SF/wordlist/Hunspell%20en_CA/${PORTVERSION}-0/:CA \
 		http://en-gb.pyxidium.co.uk/dictionary/:GB
+PKGNAMEPREFIX=	en-
 DISTFILES=	hunspell-en_US-${PORTVERSION}-0${EXTRACT_SUFX} \
 		hunspell-en_CA-${PORTVERSION}-0${EXTRACT_SUFX}:CA \
 		en_GB.zip:GB
@@ -21,39 +23,32 @@ COMMENT=	Hunspell english dictionaries
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hunspell/en_GB.dic \
-		share/hunspell/en_GB.aff \
-		share/hunspell/en_CA.aff \
-		share/hunspell/en_CA.dic \
-		share/hunspell/en_US.aff \
-		share/hunspell/en_US.dic \
+PLIST_FILES=	%%DATADIR%%/en_CA.aff \
+		%%DATADIR%%/en_CA.dic \
+		%%DATADIR%%/en_GB.dic \
+		%%DATADIR%%/en_GB.aff \
+		%%DATADIR%%/en_US.aff \
+		%%DATADIR%%/en_US.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
-GBALIASES=	en_AG en_AU en_BS en_BW en_BZ en_DK en_GH en_HK en_IE en_IN en_JM \
-		en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZW
+GBALIASES=	en_AG en_AU en_BS en_BW en_BZ en_DK en_GH en_HK en_IE en_IN \
+		en_JM en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZW
 USALIASES=	en_PH
+.for ALIAS in ${GBALIASES} ${USALIASES}
+PLIST_FILES+=	%%DATADIR%%/${ALIAS}.aff \
+		%%DATADIR%%/${ALIAS}.dic
+.endfor
 
+do-install:
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/*.aff ${WRKDIR}/*.dic ${DATADIR}/
 .for ALIAS in ${GBALIASES}
-PLIST_FILES+=	share/hunspell/${ALIAS}.aff \
-		share/hunspell/${ALIAS}.dic
+	${LN} -s en_GB.aff ${DATADIR}/${ALIAS}.aff
+	${LN} -s en_GB.dic ${DATADIR}/${ALIAS}.dic
 .endfor
 .for ALIAS in ${USALIASES}
-PLIST_FILES+=	share/hunspell/${ALIAS}.aff \
-		share/hunspell/${ALIAS}.dic
+	${LN} -s en_US.aff ${DATADIR}/${ALIAS}.aff
+	${LN} -s en_US.dic ${DATADIR}/${ALIAS}.dic
 .endfor
 
-PLIST_DIRS=	share/hunspell
-
-do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/*.dic ${WRKDIR}/*.aff ${PREFIX}/share/hunspell
-	@cd ${PREFIX}/share/hunspell; \
-	for alias in ${GBALIASES}; do \
-		${LN} -s en_GB.aff $${alias}.aff ; \
-		${LN} -s en_GB.dic $${alias}.dic ; \
-	done; \
-	for alias in ${USALIASES}; do \
-		${LN} -s en_US.aff $${alias}.aff ; \
-		${LN} -s en_US.dic $${alias}.dic ; \
-	done; \
-
 .include <bsd.port.mk>
diff --git a/textproc/en-mythes/Makefile b/textproc/en-mythes/Makefile
index bfb872158a5b..b00729c7c054 100644
--- a/textproc/en-mythes/Makefile
+++ b/textproc/en-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	en-mythes
+PORTNAME=	mythes
 PORTVERSION=	2006.12.08
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	en-
 DISTNAME=	thes_en_US_v2
 
 MAINTAINER=	office@FreeBSD.org
@@ -18,27 +20,25 @@ LICENSE=	LGPL21
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+
+PLIST_FILES=	%%DATADIR%%/th_en_US_v2.dat \
+		%%DATADIR%%/th_en_US_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 USALIASES=	en_AG en_AU en_BS en_BW en_BZ en_CA en_DK en_GB en_GH en_IE \
 		en_IN en_JM en_NA en_NG en_NZ en_PH en_SG en_TT en_ZA en_ZW
-
-PLIST_FILES=	share/mythes/th_en_US_v2.dat \
-		share/mythes/th_en_US_v2.idx
-
 .for ALIAS in ${USALIASES}
-PLIST_FILES+=	share/mythes/th_${ALIAS}_v2.dat \
-		share/mythes/th_${ALIAS}_v2.idx
+PLIST_FILES+=	%%DATADIR%%/th_${ALIAS}_v2.dat \
+		%%DATADIR%%/th_${ALIAS}_v2.idx
 .endfor
 
-PLIST_DIRS=	share/mythes
-
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/th_en_US_v2.* ${PREFIX}/share/mythes
-	@cd ${PREFIX}/share/mythes; \
-	for alias in ${USALIASES}; do \
-	  ${LN} -s th_en_US_v2.idx th_$${alias}_v2.idx ; \
-	  ${LN} -s th_en_US_v2.dat th_$${alias}_v2.dat ; \
-	done
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_en_US_v2.dat ${WRKSRC}/th_en_US_v2.idx ${DATADIR}/
+.for ALIAS in ${USALIASES}
+	${LN} -s th_en_US_v2.dat ${DATADIR}/th_${ALIAS}_v2.dat
+	${LN} -s th_en_US_v2.idx ${DATADIR}/th_${ALIAS}_v2.idx
+.endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/es-hunspell/Makefile b/textproc/es-hunspell/Makefile
index de0ddac0149a..94c3dc17faed 100644
--- a/textproc/es-hunspell/Makefile
+++ b/textproc/es-hunspell/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	es-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://extensions.services.openoffice.org/e-files/1639/2/
+PKGNAMEPREFIX=	es-
 DISTNAME=	es_ANY
 EXTRACT_SUFX=	.oxt
 
@@ -21,27 +23,24 @@ LICENSE_COMB=	dual
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-ESALIASES=	es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN es_MX \
-		es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE
-
-PLIST_FILES=	share/hunspell/es_ES.aff \
-		share/hunspell/es_ES.dic
+PLIST_FILES=	%%DATADIR%%/es_ES.aff \
+		%%DATADIR%%/es_ES.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
+ESALIASES=	es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN \
+		es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE
 .for ALIAS in ${ESALIASES}
-PLIST_FILES+=	share/hunspell/${ALIAS}.aff \
-		share/hunspell/${ALIAS}.dic
+PLIST_FILES+=	%%DATADIR%%/${ALIAS}.aff \
+		%%DATADIR%%/${ALIAS}.dic
 .endfor
 
-PLIST_DIRS=	share/hunspell
-
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/es_ANY.aff ${PREFIX}/share/hunspell/es_ES.aff
-	@${INSTALL_DATA} ${WRKDIR}/es_ANY.dic ${PREFIX}/share/hunspell/es_ES.dic
-	@cd ${PREFIX}/share/hunspell; \
-	for alias in ${ESALIASES}; do \
-		${LN} -s es_ES.aff $${alias}.aff ; \
-		${LN} -s es_ES.dic $${alias}.dic ; \
-	done
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/es_ANY.aff ${DATADIR}/es_ES.aff
+	${INSTALL_DATA} ${WRKDIR}/es_ANY.dic ${DATADIR}/es_ES.dic
+.for ALIAS in ${ESALIASES}
+	${LN} -s es_ES.aff ${DATADIR}/${ALIAS}.aff
+	${LN} -s es_ES.dic ${DATADIR}/${ALIAS}.dic
+.endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/es-hyphen/Makefile b/textproc/es-hyphen/Makefile
index d28205dfb01f..bf11db825c74 100644
--- a/textproc/es-hyphen/Makefile
+++ b/textproc/es-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	es-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2005.11.18
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	es-
 DISTNAME=	hyph_es_ES
 
 MAINTAINER=	office@FreeBSD.org
@@ -17,21 +19,20 @@ COMMENT=	Spanish hyphenation rules
 USE_ZIP=	yes
 NO_BUILD=	yes
 
+PLIST_FILES=	%%DATADIR%%/hyph_es_ES.dic
+PLIST_DIRSTRY=	%%DATADIR%%
+
 ESALIASES=	es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN \
 		es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE
-
-PLIST_FILES=	share/hyphen/hyph_es_ES.dic
 .for ALIAS in ${ESALIASES}
-PLIST_FILES+=	share/hyphen/hyph_${ALIAS}.dic
+PLIST_FILES+=	%%DATADIR%%/hyph_${ALIAS}.dic
 .endfor
-PLIST_DIRS=	share/hyphen
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_es_ES.dic ${PREFIX}/share/hyphen
-	@cd ${PREFIX}/share/hyphen; \
-	for alias in ${ESALIASES}; do \
-	  ${LN} -s hyph_es_ES.dic hyph_$${alias}.dic ; \
-	done
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_es_ES.dic ${DATADIR}/
+.for ALIAS in ${ESALIASES}
+	${LN} -s hyph_es_ES.dic ${DATADIR}/hyph_${ALIAS}.dic
+.endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/es-mythes/Makefile b/textproc/es-mythes/Makefile
index b312233e6622..e7552ee6655d 100644
--- a/textproc/es-mythes/Makefile
+++ b/textproc/es-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	es-mythes
+PORTNAME=	mythes
 PORTVERSION=	20101002
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://openthes-es.berlios.de/download/
+PKGNAMEPREFIX=	es-
 DISTNAME=	OOo2-thes_es_ES
 
 MAINTAINER=	office@FreeBSD.org
@@ -18,27 +20,25 @@ LICENSE=	LGPL21
 
 USE_BZIP2=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-ESALIASES=	es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN es_MX \
-		es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE
-
-PLIST_FILES=	share/mythes/th_es_ES_v2.dat \
-		share/mythes/th_es_ES_v2.idx
+PLIST_FILES=	%%DATADIR%%/th_es_ES_v2.dat \
+		%%DATADIR%%/th_es_ES_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
+ESALIASES=	es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN \
+		es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE
 .for ALIAS in ${ESALIASES}
-PLIST_FILES+=	share/mythes/th_${ALIAS}_v2.dat \
-		share/mythes/th_${ALIAS}_v2.idx
+PLIST_FILES+=	%%DATADIR%%/th_${ALIAS}_v2.dat \
+		%%DATADIR%%/th_${ALIAS}_v2.idx
 .endfor
 
-PLIST_DIRS=	share/mythes
-
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/th_es_ES_v2.* ${PREFIX}/share/mythes
-	@cd ${PREFIX}/share/mythes; \
-	for alias in ${ESALIASES}; do \
-	  ${LN} -s th_es_ES_v2.idx th_$${alias}_v2.idx ; \
-	  ${LN} -s th_es_ES_v2.dat th_$${alias}_v2.dat ; \
-	done
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_es_ES_v2.dat ${WRKSRC}/th_es_ES_v2.idx ${DATADIR}/
+.for ALIAS in ${ESALIASES}
+	${LN} -s th_es_ES_v2.dat ${DATADIR}/th_${ALIAS}_v2.dat
+	${LN} -s th_es_ES_v2.idx ${DATADIR}/th_${ALIAS}_v2.idx
+.endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/id-hyphen/Makefile b/textproc/id-hyphen/Makefile
index 240a765c2d7b..d517b0a52f22 100644
--- a/textproc/id-hyphen/Makefile
+++ b/textproc/id-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	id-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2004.08.12
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	id-
 DISTNAME=	hyph_id_ID
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,11 +21,11 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_id_ID.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_id_ID.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_id_ID.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_id_ID.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/it-hunspell/Makefile b/textproc/it-hunspell/Makefile
index 9acbbc798d95..f92e7c94f188 100644
--- a/textproc/it-hunspell/Makefile
+++ b/textproc/it-hunspell/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	it-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	2.4.2007.09.01
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/linguistico/Dizionario%20italiano%20per%20OOo/${PORTVERSION:S/./_/g}/
+PKGNAMEPREFIX=	it-
 DISTNAME=	italiano_${PORTVERSION:S/./_/g}
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,14 +21,12 @@ LICENSE=	GPLv3
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hunspell/it_IT.aff \
-		share/hunspell/it_IT.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/it_IT.aff \
+		%%DATADIR%%/it_IT.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-		@${MKDIR} ${PREFIX}/share/hunspell
-		@${INSTALL_DATA} ${WRKDIR}/it_IT.aff \
-			${WRKDIR}/it_IT.dic \
-			${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/it_IT.aff ${WRKDIR}/it_IT.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/it-hyphen/Makefile b/textproc/it-hyphen/Makefile
index 8964db3302a2..1226d88f6d26 100644
--- a/textproc/it-hyphen/Makefile
+++ b/textproc/it-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	it-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2007.11.26
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	it-
 DISTNAME=	hyph_it_IT
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,13 +21,13 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_it_IT.dic \
-		share/hyphen/hyph_it_CH.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_it_CH.dic \
+		%%DATADIR%%/hyph_it_IT.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_it_IT.dic ${PREFIX}/share/hyphen
-	@cd ${PREFIX}/share/hyphen; ${LN} -s hyph_it_IT.dic hyph_it_CH.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_it_IT.dic ${DATADIR}/
+	${LN} -s hyph_it_IT.dic ${DATADIR}/hyph_it_CH.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/it-mythes/Makefile b/textproc/it-mythes/Makefile
index 7d1dd624dc4f..316364174191 100644
--- a/textproc/it-mythes/Makefile
+++ b/textproc/it-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	it-mythes
+PORTNAME=	mythes
 DISTVERSION=	02_09_l
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/linguistico/Thesaurus%20OOo%202.x.x/${DISTVERSION}_2008_11_29/
+PKGNAMEPREFIX=	it-
 DISTNAME=	thesaurus2_it_${DISTVERSION}_2008_11_29
 
 MAINTAINER=	office@FreeBSD.org
@@ -16,13 +18,14 @@ COMMENT=	Italian thesaurus
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_it_IT.dat \
-		share/mythes/th_it_IT.idx
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_it_IT.dat \
+		%%DATADIR%%/th_it_IT.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/th_it_IT.* ${PREFIX}/share/mythes
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_it_IT.dat ${WRKSRC}/th_it_IT.idx ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/lt-hyphen/Makefile b/textproc/lt-hyphen/Makefile
index 15fa1f7c689f..87c28e517ea5 100644
--- a/textproc/lt-hyphen/Makefile
+++ b/textproc/lt-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	lt-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2004.04.15
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	lt-
 DISTNAME=	hyph_lt_LT
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,11 +21,11 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_lt_LT.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_lt_LT.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_lt_LT.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_lt_LT.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/nl-hyphen/Makefile b/textproc/nl-hyphen/Makefile
index 71fd1070a043..debb22abf779 100644
--- a/textproc/nl-hyphen/Makefile
+++ b/textproc/nl-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nl-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2005.10.16
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	nl-
 DISTNAME=	hyph_nl_NL
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,11 +21,11 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_nl_NL.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_nl_NL.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_nl_NL.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_nl_NL.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/nl-mythes/Makefile b/textproc/nl-mythes/Makefile
index 2a98cfb49064..16a15ccd5166 100644
--- a/textproc/nl-mythes/Makefile
+++ b/textproc/nl-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nl-mythes
+PORTNAME=	mythes
 PORTVERSION=	2011.07.26
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://data.opentaal.org/opentaalbank/thesaurus/download/
+PKGNAMEPREFIX=	nl-
 DISTNAME=	thes_nl
 EXTRACT_SUFX=	.oxt
 
@@ -20,23 +22,23 @@ LICENSE=	BSD
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/mythes/th_nl_NL_v2.dat \
-		share/mythes/th_nl_NL_v2.idx
-PLIST_DIRSTRY=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_nl_NL_v2.dat \
+		%%DATADIR%%/th_nl_NL_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 NLALIASES=	nl_AW nl_BE
 .for ALIAS in ${NLALIASES}
-PLIST_FILES+=	share/mythes/th_${ALIAS}_v2.dat \
-		share/mythes/th_${ALIAS}_v2.idx
+PLIST_FILES+=	%%DATADIR%%/th_${ALIAS}_v2.dat \
+		%%DATADIR%%/th_${ALIAS}_v2.idx
 .endfor
 
 do-install:
-	${MKDIR} ${PREFIX}/share/mythes/
-	${INSTALL_DATA} ${WRKDIR}/th_nl_v2.dat ${PREFIX}/share/mythes/th_nl_NL_v2.dat
-	${INSTALL_DATA} ${WRKDIR}/th_nl_v2.dat ${PREFIX}/share/mythes/th_nl_NL_v2.idx
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/th_nl_v2.dat ${DATADIR}/th_nl_NL_v2.dat
+	${INSTALL_DATA} ${WRKDIR}/th_nl_v2.dat ${DATADIR}/th_nl_NL_v2.idx
 .for ALIAS in ${NLALIASES}
-	${LN} -s th_nl_NL_v2.dat ${PREFIX}/share/mythes/th_${ALIAS}_v2.dat
-	${LN} -s th_nl_NL_v2.idx ${PREFIX}/share/mythes/th_${ALIAS}_v2.idx
+	${LN} -s th_nl_NL_v2.dat ${DATADIR}/th_${ALIAS}_v2.dat
+	${LN} -s th_nl_NL_v2.idx ${DATADIR}/th_${ALIAS}_v2.idx
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/no-hunspell/Makefile b/textproc/no-hunspell/Makefile
index abb6d0a09945..bbb5ca072d24 100644
--- a/textproc/no-hunspell/Makefile
+++ b/textproc/no-hunspell/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	no-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	2.0.10
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://alioth.debian.org/frs/download.php/2357/
+PKGNAMEPREFIX=	no-
 DISTNAME=	no_NO-pack2-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
@@ -17,18 +19,19 @@ COMMENT=	Norwegian (Nynorsk and Bokmaal) hunspell dictionaries
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hunspell/nb_NO.aff \
-		share/hunspell/nb_NO.dic \
-		share/hunspell/nn_NO.aff \
-		share/hunspell/nn_NO.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/nb_NO.aff \
+		%%DATADIR%%/nb_NO.dic \
+		%%DATADIR%%/nn_NO.aff \
+		%%DATADIR%%/nn_NO.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 post-extract:
 	@${EXTRACT_CMD} ${WRKDIR}/nb_NO.zip -d ${WRKSRC}
 	@${EXTRACT_CMD} ${WRKDIR}/nn_NO.zip -d ${WRKSRC}
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKSRC}/n?_NO.* ${PREFIX}/share/hunspell
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/nb_NO.aff ${WRKSRC}/nb_NO.dic \
+		${WRKSRC}/nn_NO.aff ${WRKSRC}/nn_NO.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/ro-hunspell/Makefile b/textproc/ro-hunspell/Makefile
index 3897cb388234..e85d9d850cc3 100644
--- a/textproc/ro-hunspell/Makefile
+++ b/textproc/ro-hunspell/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ro-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	3.3.6
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/rospell/Romanian%20dictionaries/dict-${PORTVERSION}/
+PKGNAMEPREFIX=	ro-
 DISTNAME=	ro_RO.${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
@@ -20,12 +22,12 @@ LICENSE_COMB=	dual
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hunspell/ro_RO.aff \
-		share/hunspell/ro_RO.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/ro_RO.aff \
+		%%DATADIR%%/ro_RO.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/ro_RO.* ${PREFIX}/share/hunspell
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/ro_RO.aff ${WRKDIR}/ro_RO.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/ro-hyphen/Makefile b/textproc/ro-hyphen/Makefile
index 6cf4991e0d3b..88c68731c974 100644
--- a/textproc/ro-hyphen/Makefile
+++ b/textproc/ro-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ro-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	3.3.6
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/rospell/Romanian%20dictionaries/dict-${PORTVERSION}/
+PKGNAMEPREFIX=	ro-
 DISTNAME=	hyph_ro_RO.${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
@@ -20,11 +22,11 @@ LICENSE_COMB=	dual
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_ro_RO.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_ro_RO.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_ro_RO.* ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_ro_RO.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/ro-mythes/Makefile b/textproc/ro-mythes/Makefile
index c83ba1f3e16c..c5c583ff6a2c 100644
--- a/textproc/ro-mythes/Makefile
+++ b/textproc/ro-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ro-mythes
+PORTNAME=	mythes
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/rospell/Romanian%20dictionaries/dict-${PORTVERSION}/
+PKGNAMEPREFIX=	ro-
 DISTNAME=	th_ro_RO.${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
@@ -18,13 +20,14 @@ LICENSE=	GPLv2
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_ro_RO.dat \
-		share/mythes/th_ro_RO.idx
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_ro_RO.dat \
+		%%DATADIR%%/th_ro_RO.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/th_ro_RO.* ${PREFIX}/share/mythes
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_ro_RO.dat ${WRKSRC}/th_ro_RO.idx ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sk-hunspell/Makefile b/textproc/sk-hunspell/Makefile
index f1a915d950e4..73af79f3932c 100644
--- a/textproc/sk-hunspell/Makefile
+++ b/textproc/sk-hunspell/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sk-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	20110228
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.sk-spell.sk.cx/files/
+PKGNAMEPREFIX=	sk-
 DISTNAME=	hunspell-sk-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
@@ -20,12 +22,12 @@ LICENSE_COMB=	dual
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hunspell/sk_SK.aff \
-		share/hunspell/sk_SK.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/sk_SK.aff \
+		%%DATADIR%%/sk_SK.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKSRC}/sk_SK* ${PREFIX}/share/hunspell
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/sk_SK.aff ${WRKSRC}/sk_SK.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sk-hyphen/Makefile b/textproc/sk-hyphen/Makefile
index eac403e2123e..8789d324f5ac 100644
--- a/textproc/sk-hyphen/Makefile
+++ b/textproc/sk-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sk-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2004.04.15
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	sk-
 DISTNAME=	hyph_sk_SK
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,11 +21,11 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_sk_SK.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_sk_SK.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_sk_SK.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_sk_SK.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sk-mythes/Makefile b/textproc/sk-mythes/Makefile
index 3573e67f03cc..1c508625ea40 100644
--- a/textproc/sk-mythes/Makefile
+++ b/textproc/sk-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sk-mythes
+PORTNAME=	mythes
 PORTVERSION=	2011.07.26
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.sk-spell.sk.cx/thesaurus/download/
+PKGNAMEPREFIX=	sk-
 DISTNAME=	OOo-Thesaurus2-sk_SK
 
 MAINTAINER=	office@FreeBSD.org
@@ -20,12 +22,12 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_sk_SK_v2.dat \
-		share/mythes/th_sk_SK_v2.idx
-PLIST_DIRSTRY=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_sk_SK_v2.dat \
+		%%DATADIR%%/th_sk_SK_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	${MKDIR} ${PREFIX}/share/mythes/
-	${INSTALL_DATA} ${WRKSRC}/th_sk_SK_v2.dat ${WRKSRC}/th_sk_SK_v2.idx ${PREFIX}/share/mythes/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_sk_SK_v2.dat ${WRKSRC}/th_sk_SK_v2.idx ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sl-hyphen/Makefile b/textproc/sl-hyphen/Makefile
index 1757787a1212..c7ea00c9f7a9 100644
--- a/textproc/sl-hyphen/Makefile
+++ b/textproc/sl-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sl-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2007.01.27
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	sl-
 DISTNAME=	hyph_sl_SI
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,11 +21,11 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_sl_SI.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_sl_SI.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_sl_SI.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_sl_SI.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sl-mythes/Makefile b/textproc/sl-mythes/Makefile
index 5c5d4f0942da..008e7c6b4279 100644
--- a/textproc/sl-mythes/Makefile
+++ b/textproc/sl-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sl-mythes
+PORTNAME=	mythes
 PORTVERSION=	2011.07.27
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://193.2.66.133:85/download/
+PKGNAMEPREFIX=	sl-
 DISTNAME=	thes_sl_SI_v2
 
 MAINTAINER=	office@FreeBSD.org
@@ -20,12 +22,12 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_sl_SI_v2.dat \
-		share/mythes/th_sl_SI_v2.idx
-PLIST_DIRSTRY=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_sl_SI_v2.dat \
+		%%DATADIR%%/th_sl_SI_v2.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	${MKDIR} ${PREFIX}/share/mythes/
-	${INSTALL_DATA} ${WRKSRC}/th_sl_SI_v2.dat ${WRKSRC}/th_sl_SI_v2.idx ${PREFIX}/share/mythes/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_sl_SI_v2.dat ${WRKSRC}/th_sl_SI_v2.idx ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/so-hunspell/Makefile b/textproc/so-hunspell/Makefile
index cb1d8b530e9c..0be049cb2e5d 100644
--- a/textproc/so-hunspell/Makefile
+++ b/textproc/so-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	so-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	 ${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/13375
+PKGNAMEPREFIX=	so-
 DISTNAME=	qaamuuska_af_soomaaliga-${PORTVERSION}-tb+fx
 EXTRACT_SUFX=	.xpi
 
@@ -20,13 +22,14 @@ LICENSE=	GPLv2
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
-PLIST_FILES=	share/hunspell/so_SO.aff \
-		share/hunspell/so_SO.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/so_SO.aff \
+		%%DATADIR%%/so_SO.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/so_SO* ${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/so_SO.aff ${WRKSRC}/so_SO.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sq-hunspell/Makefile b/textproc/sq-hunspell/Makefile
index a6fce4c438ee..4e7351c1afe5 100644
--- a/textproc/sq-hunspell/Makefile
+++ b/textproc/sq-hunspell/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sq-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.shkenca.org/shkarkime/
+PKGNAMEPREFIX=	sq-
 DISTNAME=	myspell-sq_AL-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
@@ -17,12 +19,12 @@ COMMENT=	Albanian hunspell dictionaries
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hunspell/sq_AL.aff \
-		share/hunspell/sq_AL.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/sq_AL.aff \
+		%%DATADIR%%/sq_AL.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKSRC}/sq_AL.* ${PREFIX}/share/hunspell
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/sq_AL.aff ${WRKSRC}/sq_AL.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sr-hunspell/Makefile b/textproc/sr-hunspell/Makefile
index 46ee5bcc4b5f..0f57d86acf0a 100644
--- a/textproc/sr-hunspell/Makefile
+++ b/textproc/sr-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sr-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/10894
+PKGNAMEPREFIX=	sr-
 DISTNAME=	serbian_dictionary-${PORTVERSION}-fx+tb+sm
 EXTRACT_SUFX=	.xpi
 
@@ -18,20 +20,19 @@ COMMENT=	Serbian hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
-PLIST_FILES=	share/hunspell/sr_YU.aff \
-		share/hunspell/sr_YU.dic \
-		share/hunspell/sh_YU.aff \
-		share/hunspell/sh_YU.dic
-
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/sh_YU.aff \
+		%%DATADIR%%/sh_YU.dic \
+		%%DATADIR%%/sr_YU.aff \
+		%%DATADIR%%/sr_YU.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/sr-RS-Cyrl.aff ${PREFIX}/share/hunspell/sr_YU.aff
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/sr-RS-Cyrl.dic ${PREFIX}/share/hunspell/sr_YU.dic
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/sr-RS-Latn.aff ${PREFIX}/share/hunspell/sh_YU.aff
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/sr-RS-Latn.dic ${PREFIX}/share/hunspell/sh_YU.dic
-
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/sr-RS-Latn.aff ${DATADIR}/sh_YU.aff
+	${INSTALL_DATA} ${WRKSRC}/sr-RS-Latn.dic ${DATADIR}/sh_YU.dic
+	${INSTALL_DATA} ${WRKSRC}/sr-RS-Cyrl.aff ${DATADIR}/sr_YU.aff
+	${INSTALL_DATA} ${WRKSRC}/sr-RS-Cyrl.dic ${DATADIR}/sr_YU.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/ss-hunspell/Makefile b/textproc/ss-hunspell/Makefile
index fb7a8c758e96..4bafaabaf55f 100644
--- a/textproc/ss-hunspell/Makefile
+++ b/textproc/ss-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ss-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	20110323
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/46614
+PKGNAMEPREFIX=	ss-
 DISTNAME=	swati_spell_checker-${PORTVERSION}-tb+sm+fx+fn
 EXTRACT_SUFX=	.xpi
 
@@ -18,14 +20,15 @@ COMMENT=	Swati hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
-PLIST_FILES=	share/hunspell/ss_ZA.aff \
-		share/hunspell/ss_ZA.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/ss_ZA.aff \
+		%%DATADIR%%/ss_ZA.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/ss-ZA.aff ${PREFIX}/share/hunspell/ss_ZA.aff
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/ss-ZA.dic ${PREFIX}/share/hunspell/ss_ZA.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/ss-ZA.aff ${DATADIR}/ss_ZA.aff
+	${INSTALL_DATA} ${WRKSRC}/ss-ZA.dic ${DATADIR}/ss_ZA.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/sv-hyphen/Makefile b/textproc/sv-hyphen/Makefile
index f16a9f25b280..257a06e69bb8 100644
--- a/textproc/sv-hyphen/Makefile
+++ b/textproc/sv-hyphen/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sv-hyphen
+PORTNAME=	hyphen
 PORTVERSION=	2005.04.15
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	sv-
 DISTNAME=	hyph_sv_SE
 
 MAINTAINER=	office@FreeBSD.org
@@ -19,13 +21,13 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_sv_SE.dic \
-		share/hyphen/hyph_sv_FI.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_sv_FI.dic \
+		%%DATADIR%%/hyph_sv_SE.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_sv_SE.dic ${PREFIX}/share/hyphen
-	@cd ${PREFIX}/share/hyphen; ${LN} -s hyph_sv_SE.dic hyph_sv_FI.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_sv_SE.dic ${DATADIR}/
+	${LN} -s hyph_sv_SE.dic ${DATADIR}/hyph_sv_FI.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/sv-mythes/Makefile b/textproc/sv-mythes/Makefile
index d40f12902ed2..dbe0023bd357 100644
--- a/textproc/sv-mythes/Makefile
+++ b/textproc/sv-mythes/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sv-mythes
+PORTNAME=	mythes
 PORTVERSION=	2008.06.10
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
+PKGNAMEPREFIX=	sv-
 DISTNAME=	thes_sv_SE_v2
 
 MAINTAINER=	office@FreeBSD.org
@@ -18,18 +20,18 @@ LICENSE=	MIT
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/mythes/th_sv_SE.dat \
-		share/mythes/th_sv_SE.idx \
-		share/mythes/th_sv_FI.dat \
-		share/mythes/th_sv_FI.idx
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_sv_SE.dat \
+		%%DATADIR%%/th_sv_SE.idx \
+		%%DATADIR%%/th_sv_FI.dat \
+		%%DATADIR%%/th_sv_FI.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKDIR}/th_sv_SE.* ${PREFIX}/share/mythes
-	@cd ${PREFIX}/share/mythes; \
-	${LN} -s th_sv_SE.dat th_sv_FI.dat; \
-	${LN} -s th_sv_SE.idx th_sv_FI.idx
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_sv_SE.dat ${WRKSRC}/th_sv_SE.idx ${DATADIR}/
+	${LN} -s th_sv_SE.dat ${DATADIR}/th_sv_FI.dat
+	${LN} -s th_sv_SE.idx ${DATADIR}/th_sv_FI.idx
 
 .include <bsd.port.mk>
diff --git a/textproc/sw-hunspell/Makefile b/textproc/sw-hunspell/Makefile
index 3d5e07d4303a..801efea161dc 100644
--- a/textproc/sw-hunspell/Makefile
+++ b/textproc/sw-hunspell/Makefile
@@ -5,30 +5,32 @@
 # $FreeBSD$
 #
 
-PORTNAME=	sw-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	1.46
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GOOGLE_CODE
+PKGNAMEPREFIX=	sw-
 DISTNAME=	sv-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Swedish hunspell dictionaries
 
-PROJECTHOST=	dsso
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+PROJECTHOST=	dsso
 
-PLIST_FILES=	share/hunspell/sv_SE.aff \
-		share/hunspell/sv_SE.dic \
-		share/hunspell/sv_FI.aff \
-		share/hunspell/sv_FI.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/sv_FI.aff \
+		%%DATADIR%%/sv_FI.dic \
+		%%DATADIR%%/sv_SE.aff \
+		%%DATADIR%%/sv_SE.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/sv_SE* ${PREFIX}/share/hunspell
-	@cd ${PREFIX}/share/hunspell; \
-	${LN} -s sv_SE.aff sv_FI.aff; \
-	${LN} -s sv_SE.dic sv_FI.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/sv_SE.aff ${WRKSRC}/sv_SE.dic ${DATADIR}/
+	${LN} -s sv_SE.aff ${DATADIR}/sv_FI.aff
+	${LN} -s sv_SE.dic ${DATADIR}/sv_FI.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/te-hunspell/Makefile b/textproc/te-hunspell/Makefile
index d13c9855af03..eb7d9796a2b0 100644
--- a/textproc/te-hunspell/Makefile
+++ b/textproc/te-hunspell/Makefile
@@ -5,32 +5,33 @@
 # $FreeBSD$
 #
 
-PORTNAME=	te-hunspell
+PORTNAME=	hunspell
 DISTVERSION=	0.01-2
+PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.gnu.org/gnu/aspell/dict/te/
+MASTER_SITES=	GNU/aspell/dict/te
+PKGNAMEPREFIX=	te-
 DISTNAME=	aspell6-te-${DISTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Telugu hunspell dictionaries
 
-BUILD_DEPENDS=	wordlist2hunspell:${PORTSDIR}/textproc/hunspell \
-		prezip-bin:${PORTSDIR}/textproc/aspell
-USE_BZIP2=	yes
+BUILD_DEPENDS=	prezip-bin:${PORTSDIR}/textproc/aspell \
+		wordlist2hunspell:${PORTSDIR}/textproc/hunspell
 
-PLIST_FILES=	share/hunspell/te_IN.aff \
-		share/hunspell/te_IN.dic
+USE_BZIP2=	yes
 
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/te_IN.aff \
+		%%DATADIR%%/te_IN.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-build:
 	@cd ${WRKSRC}; \
-	${LOCALBASE}/bin/prezip-bin -d < te.cwl > te.txt; \
-	LANG=te_IN.utf8	${LOCALBASE}/bin/wordlist2hunspell te.txt te_IN
+		${LOCALBASE}/bin/prezip-bin -d < te.cwl > te.txt; \
+		${SETENV} LANG=te_IN.utf8 ${LOCALBASE}/bin/wordlist2hunspell te.txt te_IN
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKSRC}/te_IN.aff ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKSRC}/te_IN.dic ${PREFIX}/share/hunspell
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/te_IN.aff ${WRKSRC}/te_IN.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/ti-hunspell/Makefile b/textproc/ti-hunspell/Makefile
index 80205cded6f4..055b7f35adda 100644
--- a/textproc/ti-hunspell/Makefile
+++ b/textproc/ti-hunspell/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ti-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	20090911
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.cs.ru.nl/~biniam/geez/dict/
+PKGNAMEPREFIX=	ti-
 DISTNAME=	ti_ER
 
 MAINTAINER=	office@FreeBSD.org
@@ -16,18 +18,18 @@ COMMENT=	Tigrigna hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	share/hunspell/ti_ER.dic \
-		share/hunspell/ti_ER.aff \
-		share/hunspell/ti_ET.dic \
-		share/hunspell/ti_ET.aff
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/ti_ER.dic \
+		%%DATADIR%%/ti_ER.aff \
+		%%DATADIR%%/ti_ET.dic \
+		%%DATADIR%%/ti_ET.aff
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/ti_ER* ${PREFIX}/share/hunspell
-	@cd ${PREFIX}/share/hunspell; \
-	${LN} -s ti_ER.aff ti_ET.aff; \
-	${LN} -s ti_ER.dic ti_ET.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/ti_ER.aff ${WRKSRC}/ti_ER.dic ${DATADIR}/
+	${LN} -s ti_ER.aff ${DATADIR}/ti_ET.aff
+	${LN} -s ti_ER.dic ${DATADIR}/ti_ET.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/tk-hunspell/Makefile b/textproc/tk-hunspell/Makefile
index e64512419b9f..481360f404d9 100644
--- a/textproc/tk-hunspell/Makefile
+++ b/textproc/tk-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	tk-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/204314
+PKGNAMEPREFIX=	tk-
 DISTNAME=	turkmen_spell_checker-${PORTVERSION}-fx+tb+sm
 EXTRACT_SUFX=	.xpi
 
@@ -18,13 +20,14 @@ COMMENT=	Turkmen hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
-PLIST_FILES=	share/hunspell/tk.aff \
-		share/hunspell/tk.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/tk.aff \
+		%%DATADIR%%/tk.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/tk* ${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/tk.aff ${WRKSRC}/tk.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/tn-hunspell/Makefile b/textproc/tn-hunspell/Makefile
index 686bc1153be4..c131575dc81d 100644
--- a/textproc/tn-hunspell/Makefile
+++ b/textproc/tn-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	tn-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	20110323
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/46617
+PKGNAMEPREFIX=	tn-
 DISTNAME=	tswana_spell_checker-${PORTVERSION}-tb+sm+fx+fn
 EXTRACT_SUFX=	.xpi
 
@@ -18,19 +20,19 @@ COMMENT=	Tswana hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
-PLIST_FILES=	share/hunspell/tn_ZA.aff \
-		share/hunspell/tn_ZA.dic \
-		share/hunspell/tn_BW.aff \
-		share/hunspell/tn_BW.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/tn_BW.aff \
+		%%DATADIR%%/tn_BW.dic \
+		%%DATADIR%%/tn_ZA.aff \
+		%%DATADIR%%/tn_ZA.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/tn-ZA.aff ${PREFIX}/share/hunspell/tn_ZA.aff
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/tn-ZA.dic ${PREFIX}/share/hunspell/tn_ZA.dic
-	@cd ${PREFIX}/share/hunspell ; \
-	${LN} -s tn_ZA.aff tn_BW.aff ; \
-	${LN} -s tn_ZA.dic tn_BW.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/tn-ZA.aff ${DATADIR}/tn_ZA.aff
+	${INSTALL_DATA} ${WRKSRC}/tn-ZA.dic ${DATADIR}/tn_ZA.dic
+	${LN} -s tn_ZA.aff ${DATADIR}/tn_BW.aff
+	${LN} -s tn_ZA.dic ${DATADIR}/tn_BW.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/ts-hunspell/Makefile b/textproc/ts-hunspell/Makefile
index 373de723caa3..5b80e1f7d8ec 100644
--- a/textproc/ts-hunspell/Makefile
+++ b/textproc/ts-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ts-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	20110323
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/46611
+PKGNAMEPREFIX=	ts-
 DISTNAME=	tsonga_spell_checker-${PORTVERSION}-tb+sm+fx+fn
 EXTRACT_SUFX=	.xpi
 
@@ -19,13 +21,13 @@ COMMENT=	Tsonga hunspell dictionaries
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hunspell/ts_ZA.aff \
-		share/hunspell/ts_ZA.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/ts_ZA.aff \
+		%%DATADIR%%/ts_ZA.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/ts-ZA.aff ${PREFIX}/share/hunspell/ts_ZA.aff
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/ts-ZA.dic ${PREFIX}/share/hunspell/ts_ZA.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/dictionaries/ts-ZA.aff ${DATADIR}/ts_ZA.aff
+	${INSTALL_DATA} ${WRKDIR}/dictionaries/ts-ZA.dic ${DATADIR}/ts_ZA.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/uz-hunspell/Makefile b/textproc/uz-hunspell/Makefile
index e285db5fd1a6..9672a2ec1c00 100644
--- a/textproc/uz-hunspell/Makefile
+++ b/textproc/uz-hunspell/Makefile
@@ -5,26 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	uz-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www-user.uni-bremen.de/~kmashrab/uzbek-word-list/
+PKGNAMEPREFIX=	uz-
 DISTNAME=	uzbek-wordlist-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Uzbek hunspell dictionaries
 
 USE_BZIP2=	yes
-WRKSRC=	${WRKDIR}/${DISTNAME}/hunspell
 ALL_TARGET=	uz_UZ.dic
+WRKSRC=		${WRKDIR}/${DISTNAME}/hunspell
 
-PLIST_FILES=	share/hunspell/uz_UZ.dic \
-		share/hunspell/uz_UZ.aff
-
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/uz_UZ.aff \
+		%%DATADIR%%/uz_UZ.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKSRC}/uz* ${PREFIX}/share/hunspell
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/uz_UZ.aff ${WRKSRC}/uz_UZ.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/ve-hunspell/Makefile b/textproc/ve-hunspell/Makefile
index bd9cac4d0721..2d4db87c2019 100644
--- a/textproc/ve-hunspell/Makefile
+++ b/textproc/ve-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ve-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	20110323
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/46601
+PKGNAMEPREFIX=	ve-
 DISTNAME=	venda_spell_checker-${PORTVERSION}-tb+fn+fx+sm
 EXTRACT_SUFX=	.xpi
 
@@ -18,14 +20,15 @@ COMMENT=	Venda hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
-PLIST_FILES=	share/hunspell/ve.aff \
-		share/hunspell/ve.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/ve.aff \
+		%%DATADIR%%/ve.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/ve-ZA.aff ${PREFIX}/share/hunspell/ve.aff
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/ve-ZA.dic ${PREFIX}/share/hunspell/ve.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/ve-ZA.aff ${DATADIR}/ve.aff
+	${INSTALL_DATA} ${WRKSRC}/ve-ZA.dic ${DATADIR}/ve.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/wa-hunspell/Makefile b/textproc/wa-hunspell/Makefile
index c207c5e1a43f..cfdf22e53c26 100644
--- a/textproc/wa-hunspell/Makefile
+++ b/textproc/wa-hunspell/Makefile
@@ -5,10 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	wa-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	0.4.15
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://chanae.walon.org/walon/
+PKGNAMEPREFIX=	wa-
 DISTNAME=	aspell-wa-${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
@@ -16,18 +18,15 @@ COMMENT=	Wallon hunspell dictionaries
 
 BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
 
-ALL_TARGET=	myspell
-
 USE_BZIP2=	yes
-WRKSRC=	${WRKDIR}/${DISTNAME}
-
-PLIST_FILES=	share/hunspell/wa.aff \
-		share/hunspell/wa.dic
+ALL_TARGET=	myspell
 
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/wa.aff \
+		%%DATADIR%%/wa.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKSRC}/wa.aff ${WRKSRC}/wa.dic ${PREFIX}/share/hunspell
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/wa.aff ${WRKSRC}/wa.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/xh-hunspell/Makefile b/textproc/xh-hunspell/Makefile
index 704efa61001f..2a17ec3e410f 100644
--- a/textproc/xh-hunspell/Makefile
+++ b/textproc/xh-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xh-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	20110323
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/46599
+PKGNAMEPREFIX=	xh-
 DISTNAME=	xhosa_spell_checker-${PORTVERSION}-tb+fn+fx+sm
 EXTRACT_SUFX=	.xpi
 
@@ -18,14 +20,15 @@ COMMENT=	Xhosa hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
-PLIST_FILES=	share/hunspell/xh.aff \
-		share/hunspell/xh.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/xh.aff \
+		%%DATADIR%%/xh.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/xh-ZA.aff ${PREFIX}/share/hunspell/xh.aff
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/xh-ZA.dic ${PREFIX}/share/hunspell/xh.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/xh-ZA.aff ${DATADIR}/xh.aff
+	${INSTALL_DATA} ${WRKSRC}/xh-ZA.dic ${DATADIR}/xh.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/yi-hunspell/Makefile b/textproc/yi-hunspell/Makefile
index 9f78a4d404a9..60f3bfa66676 100644
--- a/textproc/yi-hunspell/Makefile
+++ b/textproc/yi-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	yi-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	0.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/222538
+PKGNAMEPREFIX=	yi-
 DISTNAME=	yiddish_spell_checker__yivo_-${PORTVERSION}-fx+tb+sm+fn
 EXTRACT_SUFX=	.xpi
 
@@ -18,13 +20,14 @@ COMMENT=	Yiddish hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
-PLIST_FILES=	share/hunspell/yi.aff \
-		share/hunspell/yi.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/yi.aff \
+		%%DATADIR%%/yi.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/* ${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/yi.aff ${WRKSRC}/yi.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/zu-hunspell/Makefile b/textproc/zu-hunspell/Makefile
index 229a2c164e9e..bc0f5da7a99e 100644
--- a/textproc/zu-hunspell/Makefile
+++ b/textproc/zu-hunspell/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	zu-hunspell
+PORTNAME=	hunspell
 PORTVERSION=	20110323
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	addons/46490
+PKGNAMEPREFIX=	zu-
 DISTNAME=	zulu_spell_checker-${PORTVERSION}-tb+fn+fx+sm
 EXTRACT_SUFX=	.xpi
 
@@ -18,14 +20,15 @@ COMMENT=	Zulu hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
-PLIST_FILES=	share/hunspell/zu.aff \
-		share/hunspell/zu.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/zu.aff \
+		%%DATADIR%%/zu.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hunspell
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/zu-ZA.aff ${PREFIX}/share/hunspell/zu.aff
-	@${INSTALL_DATA} ${WRKDIR}/dictionaries/zu-ZA.dic ${PREFIX}/share/hunspell/zu.dic
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/zu-ZA.aff ${DATADIR}/zu.aff
+	${INSTALL_DATA} ${WRKSRC}/zu-ZA.dic ${DATADIR}/zu.dic
 
 .include <bsd.port.mk>
diff --git a/ukrainian/hunspell/Makefile b/ukrainian/hunspell/Makefile
index f03ae3b43024..ee1a983d329b 100644
--- a/ukrainian/hunspell/Makefile
+++ b/ukrainian/hunspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hunspell
 PORTVERSION=	1.6.5
+PORTREVISION=	1
 CATEGORIES=	ukrainian textproc
 MASTER_SITES=	SF/ispell-uk/spell-uk/${PORTVERSION}
 DISTNAME=	spell-uk-${PORTVERSION}
@@ -17,19 +18,16 @@ COMMENT=	Hunspell ukrainian dictionary
 
 BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 
-WRKSRC=	${WRKDIR}/spell-uk-${PORTVERSION}
+ALL_TARGET=	myspell
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
 
-ALL_TARGET=	myspell
-
-PLIST_FILES=	share/hunspell/uk_UA.aff \
-		share/hunspell/uk_UA.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/uk_UA.aff \
+		%%DATADIR%%/uk_UA.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-		@${MKDIR} ${PREFIX}/share/hunspell
-		@${INSTALL_DATA} ${WRKSRC}/dist/myspell-uk-${PORTVERSION}/uk_UA.aff \
-			${WRKSRC}/dist/myspell-uk-${PORTVERSION}/uk_UA.dic \
-			${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	cd ${WRKSRC}/dist/my${DISTNAME}/ && ${INSTALL_DATA} uk_UA.aff uk_UA.dic ${DATADIR}/
+
 .include <bsd.port.mk>
diff --git a/ukrainian/hyphen/Makefile b/ukrainian/hyphen/Makefile
index 334f9ed22a36..9ce3a21e1106 100644
--- a/ukrainian/hyphen/Makefile
+++ b/ukrainian/hyphen/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hyphen
 PORTVERSION=	2005.03.08
+PORTREVISION=	1
 CATEGORIES=	ukrainian textproc
 MASTER_SITES=	http://ftp.osuosl.org/pub/openoffice/contrib/dictionaries/
 DISTNAME=	hyph_uk_UA
@@ -19,11 +20,11 @@ LICENSE=	LGPL21
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	share/hyphen/hyph_uk_UA.dic
-PLIST_DIRS=	share/hyphen
+PLIST_FILES=	%%DATADIR%%/hyph_uk_UA.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/hyphen
-	@${INSTALL_DATA} ${WRKDIR}/hyph_uk_UA.dic ${PREFIX}/share/hyphen
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKDIR}/hyph_uk_UA.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/ukrainian/mythes/Makefile b/ukrainian/mythes/Makefile
index d2c16bd71a7d..02bef44dee56 100644
--- a/ukrainian/mythes/Makefile
+++ b/ukrainian/mythes/Makefile
@@ -5,8 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mythe
+PORTNAME=	mythes
 PORTVERSION=	1.6.5
+PORTREVISION=	1
 CATEGORIES=	ukrainian textproc
 MASTER_SITES=	SF/ispell-uk/spell-uk/${PORTVERSION}
 DISTNAME=	spell-uk-${PORTVERSION}
@@ -20,15 +21,15 @@ LICENSE_COMB=	dual
 
 USE_PERL5_BUILD=	yes
 
-PLIST_FILES=	share/mythes/th_uk_UA.dat \
-		share/mythes/th_uk_UA.idx
-PLIST_DIRS=	share/mythes
+PLIST_FILES=	%%DATADIR%%/th_uk_UA.dat \
+		%%DATADIR%%/th_uk_UA.idx
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-build:
 	@${PERL} ${WRKSRC}/bin/th_gen_idx.pl < ${WRKSRC}/src/thesaurus/th_uk_UA.dat > ${WRKSRC}/src/thesaurus/th_uk_UA.idx
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/mythes
-	@${INSTALL_DATA} ${WRKSRC}/src/thesaurus/th_uk_UA.* ${PREFIX}/share/mythes
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/src/thesaurus/th_uk_UA.dat ${WRKSRC}/src/thesaurus/th_uk_UA.idx ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/vietnamese/hunspell/Makefile b/vietnamese/hunspell/Makefile
index 21a4c85cdf78..7803267d0e93 100644
--- a/vietnamese/hunspell/Makefile
+++ b/vietnamese/hunspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hunspell
 PORTVERSION=	20080604
+PORTREVISION=	1
 CATEGORIES=	vietnamese textproc
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	vi_VN
@@ -14,18 +15,17 @@ DISTNAME=	vi_VN
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Hunspell vietnamese dictionary
 
-PROJECTHOST=	hunspell-spellcheck-vi
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+PROJECTHOST=	hunspell-spellcheck-vi
 
-PLIST_FILES=	share/hunspell/vi_VN.aff \
-		share/hunspell/vi_VN.dic
-PLIST_DIRS=	share/hunspell
+PLIST_FILES=	%%DATADIR%%/vi_VN.aff \
+		%%DATADIR%%/vi_VN.dic
+PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
-		@${MKDIR} ${PREFIX}/share/hunspell
-		@${INSTALL_DATA} ${WRKDIR}/vi_VN.aff \
-			${WRKDIR}/vi_VN.dic \
-			${PREFIX}/share/hunspell/
+	${MKDIR} ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/vi_VN.aff ${WRKSRC}/vi_VN.dic ${DATADIR}/
 
 .include <bsd.port.mk>
author	Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>	2011-07-29 13:13:17 +0000
committer	Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>	2011-07-29 13:13:17 +0000
commit	72c08ec487edbe98662f3278bee17f8726ee4ce4 (patch)
tree	a3c6d7d2a4a492c3e55a418f3fa370e951b5ccc7
parent	- Update MASTER_SITES (diff)