- 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

3 files changed, 20 insertions, 20 deletions

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>