- 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, 34 insertions, 34 deletions

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>