From owner-svn-ports-head@FreeBSD.ORG Fri Aug 29 21:27:29 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 727C1CEF; Fri, 29 Aug 2014 21:27:29 +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 526D21AC4; Fri, 29 Aug 2014 21:27:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7TLRTI5087379; Fri, 29 Aug 2014 21:27:29 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7TLRShi087377; Fri, 29 Aug 2014 21:27:28 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201408292127.s7TLRShi087377@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 29 Aug 2014 21:27:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366566 - in head/japanese/eijiro-fpw: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Aug 2014 21:27:29 -0000 Author: marino Date: Fri Aug 29 21:27:28 2014 New Revision: 366566 URL: http://svnweb.freebsd.org/changeset/ports/366566 QAT: https://qat.redports.org/buildarchive/r366566/ Log: Stage japanese/eijiro-fpw I modernized and simplified this port beyond the PR, including embedding the pkg-plist and converting patch-aa with DOS line endings and using dos2unix. I also removed the shell command at the small expense of making lha a permanent dependency. The downside is that this is a manual package with a restricted cdrom, so I can't test any of it. I'll commit this with the hope that it's correct and request the submitter, who does own the restricted data, verify that it's working as hoped. PR: 193061 Submitted by: turutani (kyoto) Added: head/japanese/eijiro-fpw/files/patch-Makefile (contents, props changed) Deleted: head/japanese/eijiro-fpw/files/patch-aa head/japanese/eijiro-fpw/pkg-plist Modified: head/japanese/eijiro-fpw/Makefile Modified: head/japanese/eijiro-fpw/Makefile ============================================================================== --- head/japanese/eijiro-fpw/Makefile Fri Aug 29 21:26:17 2014 (r366565) +++ head/japanese/eijiro-fpw/Makefile Fri Aug 29 21:27:28 2014 (r366566) @@ -3,7 +3,7 @@ PORTNAME= eijiro-fpw PORTVERSION= 1.0b -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/ DISTNAME= ${PORTNAME}${PORTVERSION}-src @@ -11,39 +11,45 @@ DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= EIJIRO English - Japanese Dictionary (EPWING V1 format) -EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing +EXTRACT_DEPENDS=${LOCALBASE}/share/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \ + lha:${PORTSDIR}/archivers/lha BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \ ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode -MANUAL_PACKAGE_BUILD=Needs data from CDROM +MANUAL_PACKAGE_BUILD= Needs data from CDROM +MAKE_JOBS_UNSAFE= yes + RESTRICTED= The original dictionary is not free -USES= perl5 gmake -MAKE_JOBS_UNSAFE=yes +USES= dos2unix gmake perl5 +DOS2UNIX_FILES= Makefile WRKSRC= ${WRKDIR}/eijiro-fpw${PORTVERSION} +PORTDOCS= readme.sjis DICT_PATH?= /cdrom SRCFILE?= eijiro52.txt +PLIST_FILES= share/dict/eijiro-fpw/eijiro/data/honmon \ + share/dict/eijiro-fpw/catalogs +PLIST_DIRS= share/dict/eijiro-fpw/eijiro/data \ + share/dict/eijiro-fpw/eijiro \ + share/dict/eijiro-fpw + # For eijiro included in a book sold by ALC Inc. # (http://www.alc.co.jp/alcshop/eng/eijiro/) +# Avoid copying uncompressed srcfile, it is > 50Mb -NO_STAGE= yes -.include - -DICT_ARCHIVE!= ${ECHO_CMD} ${DICT_PATH}/eijiro-original/*.exe || ${TRUE} -.if exists(${DICT_ARCHIVE}) -EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha - -CDROM_PATH:= ${DICT_PATH} -DICT_PATH:= ${WRKDIR} +.if exists(${WRKDIR}/${SRCFILE}) +MAKE_ARGS+= SRCFILE=${WRKDIR}/${SRCFILE} .else -CDROM_PATH= ${NONEXISTENT} -.endif +MAKE_ARGS+= SRCFILE=${DICT_PATH}/${SRCFILE} +.fi + +OPTIONS_DEFINE= DOCS -MAKE_ARGS:= SRCFILE=${DICT_PATH}/${SRCFILE} +.include post-extract: - @if [ -f ${CDROM_PATH}/eijiro-original/*.exe ]; then \ - lha xiw=${WRKDIR} ${CDROM_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \ + @if [ -f ${DICT_PATH}/eijiro-original/*.exe ]; then \ + lha xiw=${WRKDIR} ${DICT_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \ elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \ ${ECHO} "###################################################"; \ ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \ @@ -62,14 +68,12 @@ post-build: ${SETENV} CATDUMPFLAGS="-e sjis" fpwmake catalogs do-install: - ${MKDIR} ${PREFIX}/share/dict/eijiro-fpw/eijiro/data - ${INSTALL_DATA} ${WRKSRC}/honmon ${PREFIX}/share/dict/eijiro-fpw/eijiro/data - ${INSTALL_DATA} ${WRKSRC}/catalogs ${PREFIX}/share/dict/eijiro-fpw -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in readme.sjis - ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR} -.endfor -.endif + ${MKDIR} ${STAGEDIR}${PREFIX}/share/dict/eijiro-fpw/eijiro/data \ + ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/honmon \ + ${STAGEDIR}${PREFIX}/share/dict/eijiro-fpw/eijiro/data + ${INSTALL_DATA} ${WRKSRC}/catalogs \ + ${STAGEDIR}${PREFIX}/share/dict/eijiro-fpw + ${INSTALL_DATA} ${WRKSRC}/readme.sjis ${STAGEDIR}${DOCSDIR} -.include +.include Added: head/japanese/eijiro-fpw/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/eijiro-fpw/files/patch-Makefile Fri Aug 29 21:27:28 2014 (r366566) @@ -0,0 +1,11 @@ +--- Makefile.orig Sun Oct 8 14:40:55 2000 ++++ Makefile Mon Jun 13 11:55:22 2005 +@@ -47,7 +47,7 @@ + DIR = eijiro + + FPWPARSER = eijiro-fpw.pl +-FPWPARSERFLAGS = -- --charset=${CHARSET} ${SRCFILE} ++FPWPARSERFLAGS = -c "${CHARSET}" "${SRCFILE}" + + # fpwutils.mk must be located in one of the make include directories or + # you should user -I option.