Date: Sun, 17 Nov 2013 16:45:45 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334104 - in head: . textproc textproc/stardict-dictd_mova textproc/stardict-quick textproc/stardict2-dictd_mova textproc/stardict2-quick Message-ID: <201311171645.rAHGjjnj071656@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Sun Nov 17 16:45:44 2013 New Revision: 334104 URL: http://svnweb.freebsd.org/changeset/ports/334104 Log: - Rename ports - Fix fetch - Simplify Makefile, bring stage support - Take maintainership PR: ports/183812 Approved by: timur (former maintainer) Added: head/textproc/stardict-dictd_mova/ - copied from r334103, head/textproc/stardict2-dictd_mova/ head/textproc/stardict-quick/ - copied from r333249, head/textproc/stardict2-quick/ Deleted: head/textproc/stardict2-dictd_mova/ head/textproc/stardict2-quick/ Modified: head/MOVED head/textproc/Makefile head/textproc/stardict-dictd_mova/Makefile head/textproc/stardict-quick/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sun Nov 17 16:35:31 2013 (r334103) +++ head/MOVED Sun Nov 17 16:45:44 2013 (r334104) @@ -5190,3 +5190,5 @@ net-im/decibel||2013-11-17|Has expired: databases/postgresql-libpq++||2013-11-17|Has expired: Not maintained upstreams for 10+ years. audio/gmpeg-devel||2013-11-17|Removed, no active development since more than 8 years graphics/gqview-devel||2013-11-17|Removed, no active development since more than 8 years +textproc/stardict2-dictd_mova|textproc/stardict-dictd_mova|2013-11-17|Renamed +textproc/stardict2-quick|textproc/stardict-quick|2013-11-17|Renamed Modified: head/textproc/Makefile ============================================================================== --- head/textproc/Makefile Sun Nov 17 16:35:31 2013 (r334103) +++ head/textproc/Makefile Sun Nov 17 16:45:44 2013 (r334104) @@ -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 Modified: head/textproc/stardict-dictd_mova/Makefile ============================================================================== --- head/textproc/stardict2-dictd_mova/Makefile Sun Nov 17 16:35:31 2013 (r334103) +++ head/textproc/stardict-dictd_mova/Makefile Sun Nov 17 16:45:44 2013 (r334104) @@ -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 b 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> Modified: head/textproc/stardict-quick/Makefile ============================================================================== --- head/textproc/stardict2-quick/Makefile Fri Nov 8 17:11:58 2013 (r333249) +++ head/textproc/stardict-quick/Makefile Sun Nov 17 16:45:44 2013 (r334104) @@ -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 da 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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311171645.rAHGjjnj071656>