From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 9 15:40:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8E74294A for ; Sat, 9 Nov 2013 15:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6EFAF24E6 for ; Sat, 9 Nov 2013 15:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9Fe2kJ037982 for ; Sat, 9 Nov 2013 15:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rA9Fe2W8037981; Sat, 9 Nov 2013 15:40:02 GMT (envelope-from gnats) Resent-Date: Sat, 9 Nov 2013 15:40:02 GMT Resent-Message-Id: <201311091540.rA9Fe2W8037981@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Max Brazhnikov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8F642940 for ; Sat, 9 Nov 2013 15:39:50 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6E7EF24DF for ; Sat, 9 Nov 2013 15:39:50 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rA9FdoHG085751 for ; Sat, 9 Nov 2013 15:39:50 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rA9FdoQd085750; Sat, 9 Nov 2013 15:39:50 GMT (envelope-from nobody) Message-Id: <201311091539.rA9FdoQd085750@oldred.freebsd.org> Date: Sat, 9 Nov 2013 15:39:50 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/183812: textproc/stardict2-quick: rename port, fix fetch, clean-up Makefile X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 15:40:02 -0000 >Number: 183812 >Category: ports >Synopsis: textproc/stardict2-quick: rename port, fix fetch, clean-up Makefile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Nov 09 15:40:02 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 9.2-STABLE amd64 >Organization: >Environment: >Description: - Rename ports - fix fetch - simplify Makefile, bring stage support >How-To-Repeat: >Fix: Patch attached with submission follows: Index: stardict-quick/Makefile =================================================================== --- stardict-quick/Makefile (revision 333249) +++ stardict-quick/Makefile (working copy) @@ -1,12 +1,11 @@ # Created by: Timur I. Bakeyev # $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 @@ -16,11 +15,10 @@ NO_BUILD= yes USE_BZIP2= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} +DATADIR= ${PREFIX}/share/stardict +DICTDIR= ${DATADIR}/dic +PORTDATA= * -STARDICT_DIR= share/stardict -DICTDIR= ${STARDICT_DIR}/dic - 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 \ dan-por dan-rus dan-spa dan-swa dan-swe deu-dan deu-deu \ @@ -39,7 +37,6 @@ 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 @@ -46,38 +43,23 @@ .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 .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} + @${MKDIR} ${STAGEDIR}${DICTDIR} .for dict in ${INSTALL_DICTIONARIES} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}_${dict}-${PORTVERSION}/* \ - ${PREFIX}/${DICTDIR} + ${INSTALL_DATA} ${WRKDIR}/${${dict}_DISTNAME}/* \ + ${STAGEDIR}${DICTDIR} .endfor -post-install: -.for dict in ${INSTALL_DICTIONARIES} - @cd ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}_${dict}-${PORTVERSION} && \ - ${FIND} -s . -type f -o -type l | ${SED} -e 's|^\.|${DICTDIR}|' >> ${TMPPLIST} -.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 Index: stardict-dictd_mova/Makefile =================================================================== --- stardict-dictd_mova/Makefile (revision 333249) +++ stardict-dictd_mova/Makefile (working copy) @@ -1,12 +1,11 @@ # Created by: Timur I. Bakeyev # $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 @@ -16,13 +15,10 @@ NO_BUILD= yes USE_BZIP2= yes -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} +DATADIR= ${PREFIX}/share/stardict +DICTDIR= ${DATADIR}/dic +PORTDATA= * -STARDICT_DIR= share/stardict -DICTDIR= ${STARDICT_DIR}/dic - -DISTSUFFIX= -dictd_www.mova.org - DICTIONARIES= 1000pbio aviation beslov biology brok_and_efr compbe \ deutsch engcom ethnographic findict geology_enru geology_ruen \ idioms korolew_enru korolew_ruen mech mueller7 ozhegov \ @@ -36,7 +32,6 @@ 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 @@ -43,36 +38,23 @@ .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 .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} + ${INSTALL_DATA} ${WRKDIR}/${${dict}_DISTNAME}/* \ + ${STAGEDIR}${DICTDIR} .endfor -.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 >Release-Note: >Audit-Trail: >Unformatted: