Stagify, use bsdtar to extract

9 files changed, 32 insertions, 43 deletions

diff --git a/textproc/bg-mythes/Makefile b/textproc/bg-mythes/Makefile
index a4dac98..b71983e 100644
--- a/textproc/bg-mythes/Makefile
+++ b/textproc/bg-mythes/Makefile
@@ -15,16 +15,15 @@ COMMENT=	Bulgarian thesaurus
 LICENSE=	GPLv2 LGPL21 MPL
 LICENSE_COMB=	dual
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/th_bg_BG.dat \
 		%%DATADIR%%/th_bg_BG.idx
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/th_bg_BG.dat ${WRKSRC}/th_bg_BG.idx ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_bg_BG.dat ${WRKSRC}/th_bg_BG.idx ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/cs-mythes/Makefile b/textproc/cs-mythes/Makefile
index 026c2ef..f57a931 100644
--- a/textproc/cs-mythes/Makefile
+++ b/textproc/cs-mythes/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Czech thesaurus
 
 LICENSE=	BSD
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -22,9 +21,8 @@ PLIST_FILES=	%%DATADIR%%/th_cs_CZ_v2.dat \
 		%%DATADIR%%/th_cs_CZ_v2.idx
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/th_cs_CZ_v2.dat ${WRKSRC}/th_cs_CZ_v2.idx ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_cs_CZ_v2.dat ${WRKSRC}/th_cs_CZ_v2.idx ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/en-mythes/Makefile b/textproc/en-mythes/Makefile
index a892673..0899c91 100644
--- a/textproc/en-mythes/Makefile
+++ b/textproc/en-mythes/Makefile
@@ -14,7 +14,7 @@ COMMENT=	English thesaurus
 
 LICENSE=	LGPL21
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -29,13 +29,12 @@ PLIST_FILES+=	%%DATADIR%%/th_${ALIAS}_v2.dat \
 		%%DATADIR%%/th_${ALIAS}_v2.idx
 .endfor
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/th_en_US_v2.dat ${WRKSRC}/th_en_US_v2.idx ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_en_US_v2.dat ${WRKSRC}/th_en_US_v2.idx ${STAGEDIR}${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
+	${LN} -s th_en_US_v2.dat ${STAGEDIR}${DATADIR}/th_${ALIAS}_v2.dat
+	${LN} -s th_en_US_v2.idx ${STAGEDIR}${DATADIR}/th_${ALIAS}_v2.idx
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/it-mythes/Makefile b/textproc/it-mythes/Makefile
index 156719f..6fcc048 100644
--- a/textproc/it-mythes/Makefile
+++ b/textproc/it-mythes/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Italian thesaurus
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -20,9 +20,8 @@ PLIST_FILES=	%%DATADIR%%/th_it_IT.dat \
 		%%DATADIR%%/th_it_IT.idx
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/th_it_IT.dat ${WRKSRC}/th_it_IT.idx ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_it_IT.dat ${WRKSRC}/th_it_IT.idx ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/nl-mythes/Makefile b/textproc/nl-mythes/Makefile
index 0fe1865..ba77d8d 100644
--- a/textproc/nl-mythes/Makefile
+++ b/textproc/nl-mythes/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Dutch thesaurus
 
 LICENSE=	BSD
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -28,14 +27,13 @@ PLIST_FILES+=	%%DATADIR%%/th_${ALIAS}_v2.dat \
 		%%DATADIR%%/th_${ALIAS}_v2.idx
 .endfor
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/th_nl_v2.dat ${DATADIR}/th_nl_NL_v2.dat
-	${INSTALL_DATA} ${WRKSRC}/th_nl_v2.dat ${DATADIR}/th_nl_NL_v2.idx
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_nl_v2.dat ${STAGEDIR}${DATADIR}/th_nl_NL_v2.dat
+	${INSTALL_DATA} ${WRKSRC}/th_nl_v2.dat ${STAGEDIR}${DATADIR}/th_nl_NL_v2.idx
 .for ALIAS in ${NLALIASES}
-	${LN} -s th_nl_NL_v2.dat ${DATADIR}/th_${ALIAS}_v2.dat
-	${LN} -s th_nl_NL_v2.idx ${DATADIR}/th_${ALIAS}_v2.idx
+	${LN} -s th_nl_NL_v2.dat ${STAGEDIR}${DATADIR}/th_${ALIAS}_v2.dat
+	${LN} -s th_nl_NL_v2.idx ${STAGEDIR}${DATADIR}/th_${ALIAS}_v2.idx
 .endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/ro-mythes/Makefile b/textproc/ro-mythes/Makefile
index 8734f40..dad03ec 100644
--- a/textproc/ro-mythes/Makefile
+++ b/textproc/ro-mythes/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Romanian thesaurus
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -22,9 +22,8 @@ PLIST_FILES=	%%DATADIR%%/th_ro_RO.dat \
 		%%DATADIR%%/th_ro_RO.idx
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/th_ro_RO.dat ${WRKSRC}/th_ro_RO.idx ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_ro_RO.dat ${WRKSRC}/th_ro_RO.idx ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sk-mythes/Makefile b/textproc/sk-mythes/Makefile
index cd4b82e..fdcdd94 100644
--- a/textproc/sk-mythes/Makefile
+++ b/textproc/sk-mythes/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Slovak thesaurus
 
 LICENSE=	BSD
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -21,9 +21,8 @@ PLIST_FILES=	%%DATADIR%%/th_sk_SK_v2.dat \
 		%%DATADIR%%/th_sk_SK_v2.idx
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/th_sk_SK_v2.dat ${WRKSRC}/th_sk_SK_v2.idx ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_sk_SK_v2.dat ${WRKSRC}/th_sk_SK_v2.idx ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sl-mythes/Makefile b/textproc/sl-mythes/Makefile
index 1fa1b68..8c4a7a2 100644
--- a/textproc/sl-mythes/Makefile
+++ b/textproc/sl-mythes/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Slovenian thesaurus
 
 LICENSE=	LGPL21
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -21,9 +21,8 @@ PLIST_FILES=	%%DATADIR%%/th_sl_SI_v2.dat \
 		%%DATADIR%%/th_sl_SI_v2.idx
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/th_sl_SI_v2.dat ${WRKSRC}/th_sl_SI_v2.idx ${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_sl_SI_v2.dat ${WRKSRC}/th_sl_SI_v2.idx ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sv-mythes/Makefile b/textproc/sv-mythes/Makefile
index 53b1fa7..c3d1874 100644
--- a/textproc/sv-mythes/Makefile
+++ b/textproc/sv-mythes/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Swedish thesaurus
 
 LICENSE=	MIT
 
-USE_ZIP=	yes
+EXTRACT_SUFX=	.zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -24,11 +24,10 @@ PLIST_FILES=	%%DATADIR%%/th_sv_SE.dat \
 		%%DATADIR%%/th_sv_FI.idx
 PLIST_DIRSTRY=	%%DATADIR%%
 
-NO_STAGE=	yes
 do-install:
-	${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
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/th_sv_SE.dat ${WRKSRC}/th_sv_SE.idx ${STAGEDIR}${DATADIR}/
+	${LN} -s th_sv_SE.dat ${STAGEDIR}${DATADIR}/th_sv_FI.dat
+	${LN} -s th_sv_SE.idx ${STAGEDIR}${DATADIR}/th_sv_FI.idx
 
 .include <bsd.port.mk>