From owner-svn-ports-head@FreeBSD.ORG  Sat Aug 30 13:41:14 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 ESMTPS id 3701CEA0;
 Sat, 30 Aug 2014 13:41:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2309C1C7B;
 Sat, 30 Aug 2014 13:41:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UDfETs042032;
 Sat, 30 Aug 2014 13:41:14 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UDfDNs042031;
 Sat, 30 Aug 2014 13:41:13 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201408301341.s7UDfDNs042031@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sat, 30 Aug 2014 13:41:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r366618 - head/japanese/eijiro-fpw
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Aug 2014 13:41:14 -0000

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"; \