20 files changed, 11 insertions, 22 deletions

diff --git a/textproc/en-hunspell/Makefile b/textproc/en-hunspell/Makefile
index 3f5120f1f1d6..b4e7c2712b4e 100644
--- a/textproc/en-hunspell/Makefile
+++ b/textproc/en-hunspell/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	English hunspell dictionaries
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/es-hunspell/Makefile b/textproc/es-hunspell/Makefile
index ebe24c0465df..ea9202b319b4 100644
--- a/textproc/es-hunspell/Makefile
+++ b/textproc/es-hunspell/Makefile
@@ -15,7 +15,6 @@ COMMENT=	Spanish hunspell dictionaries
 LICENSE=	GPLv3 LGPL3 MPL
 LICENSE_COMB=	dual
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/it-hunspell/Makefile b/textproc/it-hunspell/Makefile
index 3843bfc2e1e8..3a83273a1008 100644
--- a/textproc/it-hunspell/Makefile
+++ b/textproc/it-hunspell/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Italian hunspell dictionaries
 
 LICENSE=	GPLv3
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/nl-hunspell/Makefile b/textproc/nl-hunspell/Makefile
index 2b6e1253364e..1f745613a9a6 100644
--- a/textproc/nl-hunspell/Makefile
+++ b/textproc/nl-hunspell/Makefile
@@ -15,7 +15,6 @@ COMMENT=	Dutch hunspell dictionaries
 
 LICENSE=	BSD
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/no-hunspell/Makefile b/textproc/no-hunspell/Makefile
index f55860b5c69e..3280c72374ee 100644
--- a/textproc/no-hunspell/Makefile
+++ b/textproc/no-hunspell/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Norwegian (Nynorsk and Bokmaal) hunspell dictionaries
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/nb_NO.aff \
@@ -22,8 +22,9 @@ PLIST_FILES=	%%DATADIR%%/nb_NO.aff \
 PLIST_DIRSTRY=	%%DATADIR%%
 
 post-extract:
-	@${EXTRACT_CMD} ${WRKDIR}/nb_NO.zip -d ${WRKSRC}/
-	@${EXTRACT_CMD} ${WRKDIR}/nn_NO.zip -d ${WRKSRC}/
+	@${MKDIR} ${WRKSRC}
+	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/nb_NO.zip -C ${WRKSRC}/
+	@${EXTRACT_CMD} ${EXTRACT_BEOFRE_ARGS} ${WRKDIR}/nn_NO.zip -C ${WRKSRC}/
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
diff --git a/textproc/ro-hunspell/Makefile b/textproc/ro-hunspell/Makefile
index d69fd7a0aba9..450818f0dd14 100644
--- a/textproc/ro-hunspell/Makefile
+++ b/textproc/ro-hunspell/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Romanian hunspell dictionaries
 LICENSE=	LGPL21 GPLv2 MPL
 LICENSE_COMB=	dual
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/sk-hunspell/Makefile b/textproc/sk-hunspell/Makefile
index 0da12b812158..693a493ab5eb 100644
--- a/textproc/sk-hunspell/Makefile
+++ b/textproc/sk-hunspell/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Slovak hunspell dictionaries
 LICENSE=	LGPL21 GPLv2 MPL
 LICENSE_COMB=	dual
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/sk_SK.aff \
diff --git a/textproc/so-hunspell/Makefile b/textproc/so-hunspell/Makefile
index a86cce826733..8b926504a38c 100644
--- a/textproc/so-hunspell/Makefile
+++ b/textproc/so-hunspell/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Somali hunspell dictionaries
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/textproc/sq-hunspell/Makefile b/textproc/sq-hunspell/Makefile
index 94d86240d068..9e92e83d40f9 100644
--- a/textproc/sq-hunspell/Makefile
+++ b/textproc/sq-hunspell/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Albanian hunspell dictionaries
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/sq_AL.aff \
diff --git a/textproc/sr-hunspell/Makefile b/textproc/sr-hunspell/Makefile
index fa5ad32f663c..653811f1fc1a 100644
--- a/textproc/sr-hunspell/Makefile
+++ b/textproc/sr-hunspell/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Serbian hunspell dictionaries
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/textproc/ss-hunspell/Makefile b/textproc/ss-hunspell/Makefile
index d97dd1045a19..3784400665ad 100644
--- a/textproc/ss-hunspell/Makefile
+++ b/textproc/ss-hunspell/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Swati hunspell dictionaries
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/textproc/sw-hunspell/Makefile b/textproc/sw-hunspell/Makefile
index 6b6a74428ff2..67132918f080 100644
--- a/textproc/sw-hunspell/Makefile
+++ b/textproc/sw-hunspell/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Swedish hunspell dictionaries
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PROJECTHOST=	dsso
diff --git a/textproc/ti-hunspell/Makefile b/textproc/ti-hunspell/Makefile
index cde00e216d5f..f0e9faf353c8 100644
--- a/textproc/ti-hunspell/Makefile
+++ b/textproc/ti-hunspell/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Tigrigna hunspell dictionaries
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/tk-hunspell/Makefile b/textproc/tk-hunspell/Makefile
index c8f3eb96498e..ec366f56a795 100644
--- a/textproc/tk-hunspell/Makefile
+++ b/textproc/tk-hunspell/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Turkmen hunspell dictionaries
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/textproc/tn-hunspell/Makefile b/textproc/tn-hunspell/Makefile
index a67776470a59..c0655c0b56ee 100644
--- a/textproc/tn-hunspell/Makefile
+++ b/textproc/tn-hunspell/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Tswana hunspell dictionaries
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/textproc/ts-hunspell/Makefile b/textproc/ts-hunspell/Makefile
index f44380b8d3cc..97fd2082f9cd 100644
--- a/textproc/ts-hunspell/Makefile
+++ b/textproc/ts-hunspell/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Tsonga hunspell dictionaries
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/textproc/ve-hunspell/Makefile b/textproc/ve-hunspell/Makefile
index 2c972537fb09..d6bb60f501e6 100644
--- a/textproc/ve-hunspell/Makefile
+++ b/textproc/ve-hunspell/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Venda hunspell dictionaries
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/textproc/xh-hunspell/Makefile b/textproc/xh-hunspell/Makefile
index a2b76578d14a..e6e4761c6e2b 100644
--- a/textproc/xh-hunspell/Makefile
+++ b/textproc/xh-hunspell/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Xhosa hunspell dictionaries
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/textproc/yi-hunspell/Makefile b/textproc/yi-hunspell/Makefile
index 28a447a4de59..eb2006dc77c9 100644
--- a/textproc/yi-hunspell/Makefile
+++ b/textproc/yi-hunspell/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Yiddish hunspell dictionaries
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/textproc/zu-hunspell/Makefile b/textproc/zu-hunspell/Makefile
index c7a1a19307ba..81795213b30d 100644
--- a/textproc/zu-hunspell/Makefile
+++ b/textproc/zu-hunspell/Makefile
@@ -14,7 +14,6 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Zulu hunspell dictionaries
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries