From owner-svn-ports-all@FreeBSD.ORG Fri Jun 6 10:13:55 2014 Return-Path: Delivered-To: svn-ports-all@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 D78FCA95; Fri, 6 Jun 2014 10:13:55 +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 AD3722E7F; Fri, 6 Jun 2014 10:13:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56ADtUR047719; Fri, 6 Jun 2014 10:13:55 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56ADt7X047718; Fri, 6 Jun 2014 10:13:55 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406061013.s56ADt7X047718@svn.freebsd.org> From: John Marino Date: Fri, 6 Jun 2014 10:13:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356759 - head/japanese/edict X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2014 10:13:55 -0000 Author: marino Date: Fri Jun 6 10:13:55 2014 New Revision: 356759 URL: http://svnweb.freebsd.org/changeset/ports/356759 QAT: https://qat.redports.org/buildarchive/r356759/ Log: japanese/edict: Remove unnecessary extract target and dependency This port never needed a roll-your-own extract target; all it needed was the EXTRACT_ONLY definition. While touching this unmaintained port, change it to use TAR instead of UNZIP_CMD during installation. Poudriere-verified to install the same way as before. And pet portlint a bit. Modified: head/japanese/edict/Makefile Modified: head/japanese/edict/Makefile ============================================================================== --- head/japanese/edict/Makefile Fri Jun 6 10:11:58 2014 (r356758) +++ head/japanese/edict/Makefile Fri Jun 6 10:13:55 2014 (r356759) @@ -16,12 +16,11 @@ MASTER_SITES= \ ftp://ftp.monash.edu.au/pub/nihongo/ EXTRACT_SUFX= DISTFILES= ${DICTFILES} ${SRCFILES} ${DOCFILES} +EXTRACT_ONLY= ${SRCFILES} MAINTAINER= ports@FreeBSD.org COMMENT= Japanese-English dictionaries with access and maintenance utilities -BUILD_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip - DIST_SUBDIR= edict DICTFILES= edict.gz edicth enamdict.gz compdic.gz \ @@ -53,7 +52,7 @@ DOCSDIR= ${PREFIX}/share/doc/xjdic NO_WRKSUBDIR= yes -sparc64_BROKEN= Fails to install on sparc64 with error 2 +sparc64_BROKEN= Fails on sparc64 during installation with error 2 OPTIONS_DEFINE= DOCS @@ -61,25 +60,17 @@ post-patch: @${GREP} -l '^main' ${WRKSRC}/*.c | ${XARGS} ${REINPLACE_CMD} \ -e '/argv/s/unsigned//' -do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} -.for file in ${SRCFILES} - (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${_DISTDIR}/${file} ${EXTRACT_AFTER_ARGS}) -.endfor - do-install: (cd ${WRKDIR} && ${INSTALL_PROGRAM} ${BINFILES} ${STAGEDIR}${PREFIX}/bin) @${MKDIR} ${STAGEDIR}${DATADIR} ${CP} ${_DISTDIR}/edicth ${STAGEDIR}${DATADIR} -.for file in edict enamdict compdic j_places kanjidic kanjd212 geodic - ${GZIP_CMD} -cd ${_DISTDIR}/${file}.gz > ${STAGEDIR}${DATADIR}/${file} +.for f in edict enamdict compdic j_places kanjidic kanjd212 geodic + ${GZIP_CMD} -cd ${_DISTDIR}/${f}.gz > ${STAGEDIR}${DATADIR}/${f} .endfor -.for file in ediclsd3 lawgledt lingdic pandpdic aviation findic mktdic \ +.for f in ediclsd3 lawgledt lingdic pandpdic aviation findic mktdic \ 4jword3_edict concrete - ${UNZIP_CMD} -o ${_DISTDIR}/${file}.zip ${file:S|edict|edict.euc|} \ - -d ${STAGEDIR}${DATADIR} + cd ${STAGEDIR}${DATADIR} && \ + ${TAR} -xf ${_DISTDIR}/${f}.zip ${f:S|edict|edict.euc|} .endfor .for dict in ${DICTFILES:S|_edict|_edict.euc|} (cd ${STAGEDIR}${DATADIR} && ${STAGEDIR}${PREFIX}/bin/xjdxgen ${dict:R})