Date: Sat, 30 Aug 2014 13:41:13 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366618 - head/japanese/eijiro-fpw Message-ID: <201408301341.s7UDfDNs042031@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Aug 30 13:41:13 2014 New Revision: 366618 URL: http://svnweb.freebsd.org/changeset/ports/366618 QAT: https://qat.redports.org/buildarchive/r366618/ Log: japanese/eijiro-fpw: Small fix to cover compressed case The previous change was tested and needs a small patch to work in all cases. Patch functioning confirmed by PR submitter PR: 193061 Submitted by: turutani (kyoto) Modified: head/japanese/eijiro-fpw/Makefile Modified: head/japanese/eijiro-fpw/Makefile ============================================================================== --- head/japanese/eijiro-fpw/Makefile Sat Aug 30 13:19:35 2014 (r366617) +++ head/japanese/eijiro-fpw/Makefile Sat Aug 30 13:41:13 2014 (r366618) @@ -37,11 +37,12 @@ PLIST_DIRS= share/dict/eijiro-fpw/eijiro # (http://www.alc.co.jp/alcshop/eng/eijiro/) # Avoid copying uncompressed srcfile, it is > 50Mb -.if exists(${WRKDIR}/${SRCFILE}) -MAKE_ARGS+= SRCFILE=${WRKDIR}/${SRCFILE} -.else -MAKE_ARGS+= SRCFILE=${DICT_PATH}/${SRCFILE} +.if exists(${DICT_PATH}/${SRCFILE}) # uncompressed +SOURCE_FILE= ${DICT_PATH}/${SRCFILE} +.else # assume decompression works +SOURCE_FILE= ${WRKDIR}/${SRCFILE} .endif +MAKE_ARGS+= SRCFILE=${SOURCE_FILE:Q} OPTIONS_DEFINE= DOCS @@ -50,7 +51,8 @@ OPTIONS_DEFINE= DOCS post-extract: @if [ -f ${DICT_PATH}/eijiro-original/*.exe ]; then \ lha xiw=${WRKDIR} ${DICT_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \ - elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \ + fi + @if [ ! -f ${SOURCE_FILE:Q} ]; then \ ${ECHO} "###################################################"; \ ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \ ${ECHO} "Specify the Eijiro Dictionary file with the full path"; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408301341.s7UDfDNs042031>