7 files changed, 24 insertions, 60 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 1e47dd325075..a36b06eff4a1 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1418,11 +1418,11 @@
     SUBDIR += stardict-MerrianWebster
     SUBDIR += stardict-OxfordCollocation
     SUBDIR += stardict-dict-fa_IR
+    SUBDIR += stardict-dictd_mova
     SUBDIR += stardict-longman
     SUBDIR += stardict-oald
+    SUBDIR += stardict-quick
     SUBDIR += stardict-rptts
-    SUBDIR += stardict2-dictd_mova
-    SUBDIR += stardict2-quick
     SUBDIR += stardict3
     SUBDIR += supercat
     SUBDIR += sv-aspell
diff --git a/textproc/stardict2-dictd_mova/Makefile b/textproc/stardict-dictd_mova/Makefile
index 40182a8a984e..c33998293a66 100644
--- a/textproc/stardict2-dictd_mova/Makefile
+++ b/textproc/stardict-dictd_mova/Makefile
@@ -1,27 +1,23 @@
 # Created by: Timur I. Bakeyev <timur@gnome.org>
 # $FreeBSD$
 
-PORTNAME=	stardict
+PORTNAME=	stardict-dictd_mova
 PORTVERSION=	2.4.2
 PORTREVISION=	8
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dictionaries-mova/${PORTVERSION}
-PKGNAMESUFFIX=	-dictd_mova
+MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/mova.org/
 DIST_SUBDIR=	stardict
 
-MAINTAINER=	timur@FreeBSD.org
+MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dictionaries from www.mova.org for StarDict
 
 .MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
 USE_BZIP2=	yes
 
-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
-STARDICT_DIR=	share/stardict
-DICTDIR=	${STARDICT_DIR}/dic
-
-DISTSUFFIX=	-dictd_www.mova.org
+DATADIR=	${PREFIX}/share/stardict
+DICTDIR=	${DATADIR}/dic
+PORTDATA=	*
 
 DICTIONARIES=	1000pbio aviation beslov biology brok_and_efr compbe \
 		deutsch engcom ethnographic findict geology_enru geology_ruen \
@@ -36,43 +32,29 @@ DICTIONARIES=	1000pbio aviation beslov biology brok_and_efr compbe \
 		smiley sokrat_enru sokrat_ruen swedish teo ushakov \
 		zhelezyaki_abbr zhelezyaki_analogs
 
-.if !defined(DICT_PACK)
 OPTIONS_DEFINE=	ALL
 OPTIONS_DEFAULT=	ALL
 ALL_DESC=	All dictionaries
 .for dict in ${DICTIONARIES}
 OPTIONS_DEFINE+=	${dict:U:S|-|_|g}
 ${dict:U:S|-|_|g}_DESC=	${dict} dictionary
+${dict}_DISTNAME=	stardict-dictd_www.mova.org_${dict}-${PORTVERSION}
 .endfor
-.endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .for dict in ${DICTIONARIES}
 .if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${dict:U:S|-|_|g}}
 INSTALL_DICTIONARIES+=	${dict}
+DISTFILES+=	${${dict}_DISTNAME}${EXTRACT_SUFX}
 .endif
 .endfor
 
-.for dict in ${INSTALL_DICTIONARIES}
-DISTFILES+=	${PORTNAME}${DISTSUFFIX}_${dict}-${PORTVERSION}${EXTRACT_SUFX}
-.endfor
-
-do-build:
-	    @${DO_NADA}
-
 do-install:
-	    ${MKDIR} ${PREFIX}/${DICTDIR}
+	${MKDIR} ${STAGEDIR}${DICTDIR}
 .for dict in ${INSTALL_DICTIONARIES}
-.for ext in dict.dz idx ifo
-	    ${INSTALL_DATA} \
-		${WRKDIR}/${PORTNAME}${DISTSUFFIX}_${dict}-${PORTVERSION}/${DISTSUFFIX:C|^-||}_${dict}.${ext} \
-		${PREFIX}/${DICTDIR}
-	    @${ECHO_CMD} "${DICTDIR}/${DISTSUFFIX:C|^-||}_${dict}.${ext}" >> ${TMPPLIST}
-.endfor
+	${INSTALL_DATA} ${WRKDIR}/${${dict}_DISTNAME}/* \
+		${STAGEDIR}${DICTDIR}
 .endfor
-	    @${ECHO_CMD} "@unexec ${RMDIR} %D/${DICTDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	    @${ECHO_CMD} "@unexec ${RMDIR} %D/${STARDICT_DIR} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/stardict2-dictd_mova/distinfo b/textproc/stardict-dictd_mova/distinfo
index c112b3b75d8f..c112b3b75d8f 100644
--- a/textproc/stardict2-dictd_mova/distinfo
+++ b/textproc/stardict-dictd_mova/distinfo
diff --git a/textproc/stardict2-dictd_mova/pkg-descr b/textproc/stardict-dictd_mova/pkg-descr
index f14b1f6cbbb6..f14b1f6cbbb6 100644
--- a/textproc/stardict2-dictd_mova/pkg-descr
+++ b/textproc/stardict-dictd_mova/pkg-descr
diff --git a/textproc/stardict2-quick/Makefile b/textproc/stardict-quick/Makefile
index 7e46963bd7ff..6b46590c00c4 100644
--- a/textproc/stardict2-quick/Makefile
+++ b/textproc/stardict-quick/Makefile
@@ -1,25 +1,23 @@
 # Created by: Timur I. Bakeyev <timur@gnome.org>
 # $FreeBSD$
 
-PORTNAME=	stardict
+PORTNAME=	stardict-quick
 PORTVERSION=	2.4.2
 PORTREVISION=	9
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-dictionaries-quick/${PORTVERSION}
-PKGNAMESUFFIX=	-quick
+MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/Quick/
 DIST_SUBDIR=	stardict
 
-MAINTAINER=	timur@FreeBSD.org
+MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dictionaries from Quick for StarDict
 
 .MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
 USE_BZIP2=	yes
 
-LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
-STARDICT_DIR=	share/stardict
-DICTDIR=	${STARDICT_DIR}/dic
+DATADIR=	${PREFIX}/share/stardict
+DICTDIR=	${DATADIR}/dic
+PORTDATA=	*
 
 DICTIONARIES=	afr-eng afr-swe bul-swe dan-deu dan-eng dan-fin dan-fra \
 		dan-hun dan-ind dan-ita dan-jpn dan-lat dan-nld dan-nor \
@@ -39,45 +37,29 @@ DICTIONARIES=	afr-eng afr-swe bul-swe dan-deu dan-eng dan-fin dan-fra \
 		swe-nld swe-nor swe-pol swe-por swe-rum swe-rus swe-slo \
 		swe-spa swe-swa swe-wel wel-swe
 
-.if !defined(DICT_PACK)
 OPTIONS_DEFINE=	ALL
 OPTIONS_DEFAULT=	ALL
 ALL_DESC=	All dictionaries
 .for dict in ${DICTIONARIES}
 OPTIONS_DEFINE+=	${dict:U:S|-|_|g}
 ${dict:U:S|-|_|g}_DESC=	${dict} dictionary
+${dict}_DISTNAME=	${PORTNAME}_${dict}-${PORTVERSION}
 .endfor
-.endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .for dict in ${DICTIONARIES}
 .if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${dict:U:S|-|_|g}}
 INSTALL_DICTIONARIES+=	${dict}
+DISTFILES+=	${${dict}_DISTNAME}${EXTRACT_SUFX}
 .endif
 .endfor
 
-.for dict in ${INSTALL_DICTIONARIES}
-DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}_${dict}-${PORTVERSION}${EXTRACT_SUFX}
-.endfor
-
-do-build:
-	@${DO_NADA}
-
 do-install:
-		@${MKDIR} ${PREFIX}/${DICTDIR}
-.for dict in ${INSTALL_DICTIONARIES}
-		${INSTALL_DATA} ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}_${dict}-${PORTVERSION}/* \
-			${PREFIX}/${DICTDIR}
-.endfor
-
-post-install:
+	@${MKDIR} ${STAGEDIR}${DICTDIR}
 .for dict in ${INSTALL_DICTIONARIES}
-		@cd ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}_${dict}-${PORTVERSION} && \
-		${FIND} -s . -type f -o -type l | ${SED} -e 's|^\.|${DICTDIR}|' >> ${TMPPLIST}
+	${INSTALL_DATA} ${WRKDIR}/${${dict}_DISTNAME}/* \
+		${STAGEDIR}${DICTDIR}
 .endfor
-		@${ECHO_CMD} "@unexec ${RMDIR} %D/${DICTDIR} 2>/dev/null || true" >> ${TMPPLIST}
-		@${ECHO_CMD} "@unexec ${RMDIR} %D/${STARDICT_DIR} 2>/dev/null || true" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/stardict2-quick/distinfo b/textproc/stardict-quick/distinfo
index d7325a279cb8..d7325a279cb8 100644
--- a/textproc/stardict2-quick/distinfo
+++ b/textproc/stardict-quick/distinfo
diff --git a/textproc/stardict2-quick/pkg-descr b/textproc/stardict-quick/pkg-descr
index b7df7c011e10..b7df7c011e10 100644
--- a/textproc/stardict2-quick/pkg-descr
+++ b/textproc/stardict-quick/pkg-descr