8 files changed, 26 insertions, 36 deletions

diff --git a/french/hunspell/Makefile b/french/hunspell/Makefile
index cd97fefcbbab..6c5742d0250f 100644
--- a/french/hunspell/Makefile
+++ b/french/hunspell/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Modern French hunspell dictionaries
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/german/hunspell/Makefile b/german/hunspell/Makefile
index 13ec25fadfc6..d85a3384c6fc 100644
--- a/german/hunspell/Makefile
+++ b/german/hunspell/Makefile
@@ -13,10 +13,9 @@ COMMENT=	German hunspell dictionaries
 BUILD_DEPENDS=	buildhash:${PORTSDIR}/textproc/ispell \
 		hunspell:${PORTSDIR}/textproc/hunspell
 
-USES=		shebangfix perl5
+USES=		gmake shebangfix perl5
 USE_BZIP2=	yes
 ALL_TARGET=	hunspell-all
-USE_GMAKE=	yes
 USE_PERL5=	build
 SHEBANG_FILES=	bin/*.pl
 
@@ -35,19 +34,18 @@ PLIST_FILES+=	%%DATADIR%%/${ALIAS}.aff \
 		%%DATADIR%%/${ALIAS}.dic
 .endfor
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/hunspell/de_AT.aff ${WRKSRC}/hunspell/de_AT.dic \
 		${WRKSRC}/hunspell/de_CH.aff ${WRKSRC}/hunspell/de_CH.dic \
-		${WRKSRC}/hunspell/de_DE.aff ${WRKSRC}/hunspell/de_DE.dic ${DATADIR}/
+		${WRKSRC}/hunspell/de_DE.aff ${WRKSRC}/hunspell/de_DE.dic ${STAGEDIR}${DATADIR}/
 .for ALIAS in ${CHALIASES}
-	${LN} -s de_CH.aff ${DATADIR}/${ALIAS}.aff
-	${LN} -s de_CH.dic ${DATADIR}/${ALIAS}.dic
+	${LN} -s de_CH.aff ${STAGEDIR}${DATADIR}/${ALIAS}.aff
+	${LN} -s de_CH.dic ${STAGEDIR}${DATADIR}/${ALIAS}.dic
 .endfor
 .for ALIAS in ${DEALIASES}
-	${LN} -s de_DE.aff ${DATADIR}/${ALIAS}.aff
-	${LN} -s de_DE.dic ${DATADIR}/${ALIAS}.dic
+	${LN} -s de_DE.aff ${STAGEDIR}${DATADIR}/${ALIAS}.aff
+	${LN} -s de_DE.dic ${STAGEDIR}${DATADIR}/${ALIAS}.dic
 .endfor
 
 .include <bsd.port.mk>
diff --git a/hebrew/hunspell/Makefile b/hebrew/hunspell/Makefile
index aacf312904a6..9bbc270e42fd 100644
--- a/hebrew/hunspell/Makefile
+++ b/hebrew/hunspell/Makefile
@@ -15,18 +15,15 @@ ALL_TARGET=	hunspell
 CONFIGURE_ARGS=	--enable-fatverb
 GNU_CONFIGURE=	yes
 USE_PERL5=	build
-USES=		gmake iconv:build perl5
+USES=		gmake iconv:build perl5 shebangfix
+SHEBANG_FILES=	${WRKSRC}/pmerge
 
 PLIST_FILES=	%%DATADIR%%/he.aff \
 		%%DATADIR%%/he.dic
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/pmerge
-
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/he.aff ${WRKSRC}/he.dic ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/he.aff ${WRKSRC}/he.dic ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/hungarian/hunspell/Makefile b/hungarian/hunspell/Makefile
index c57fe0b2ce2e..395bea7bb100 100644
--- a/hungarian/hunspell/Makefile
+++ b/hungarian/hunspell/Makefile
@@ -20,9 +20,8 @@ PLIST_FILES=	%%DATADIR%%/hu_HU.aff \
 		%%DATADIR%%/hu_HU.dic
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/hu_HU.aff ${WRKSRC}/hu_HU.dic ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/hu_HU.aff ${WRKSRC}/hu_HU.dic ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/korean/hunspell/Makefile b/korean/hunspell/Makefile
index d98b710580b7..7d5935172fd2 100644
--- a/korean/hunspell/Makefile
+++ b/korean/hunspell/Makefile
@@ -14,7 +14,7 @@ LICENSE_COMB=	dual
 
 BUILD_DEPENDS+=	py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 
-USE_GMAKE=		yes
+USES=		gmake
 USE_PYTHON_BUILD=	yes
 USE_XZ=			yes
 
@@ -26,10 +26,9 @@ PROJECTHOST=	spellcheck-ko
 
 MAKE_ENV+=	PYTHON=${PYTHON_CMD}
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/ko.aff ${DATADIR}/ko_KR.aff
-	${INSTALL_DATA} ${WRKSRC}/ko.dic ${DATADIR}/ko_KR.dic
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/ko.aff ${STAGEDIR}${DATADIR}/ko_KR.aff
+	${INSTALL_DATA} ${WRKSRC}/ko.dic ${STAGEDIR}${DATADIR}/ko_KR.dic
 
 .include <bsd.port.mk>
diff --git a/russian/hunspell/Makefile b/russian/hunspell/Makefile
index 83ab21b50361..556159c61080 100644
--- a/russian/hunspell/Makefile
+++ b/russian/hunspell/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Russian hunspell dictionaries
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PROJECTHOST=	hunspell-ru
@@ -19,9 +19,8 @@ PLIST_FILES=	%%DATADIR%%/ru_RU.aff \
 		%%DATADIR%%/ru_RU.dic
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/ru_RU.aff ${WRKSRC}/ru_RU.dic ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/ru_RU.aff ${WRKSRC}/ru_RU.dic ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/ukrainian/hunspell/Makefile b/ukrainian/hunspell/Makefile
index 43d9f695b43d..f3999c345c59 100644
--- a/ukrainian/hunspell/Makefile
+++ b/ukrainian/hunspell/Makefile
@@ -21,9 +21,8 @@ PLIST_FILES=	%%DATADIR%%/uk_UA.aff \
 		%%DATADIR%%/uk_UA.dic
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	cd ${WRKSRC}/dist/my${DISTNAME}/ && ${INSTALL_DATA} uk_UA.aff uk_UA.dic ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	cd ${WRKSRC}/dist/my${DISTNAME}/ && ${INSTALL_DATA} uk_UA.aff uk_UA.dic ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/vietnamese/hunspell/Makefile b/vietnamese/hunspell/Makefile
index 78f1ce6c6d5b..5e7b9f3dec8b 100644
--- a/vietnamese/hunspell/Makefile
+++ b/vietnamese/hunspell/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Vietnamese hunspell dictionaries
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PROJECTHOST=	hunspell-spellcheck-vi
@@ -20,9 +20,8 @@ PLIST_FILES=	%%DATADIR%%/vi_VN.aff \
 		%%DATADIR%%/vi_VN.dic
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/vi_VN.aff ${WRKSRC}/vi_VN.dic ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/vi_VN.aff ${WRKSRC}/vi_VN.dic ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>