Date: Wed, 25 Feb 2015 01:30:50 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379861 - in head/textproc/wordnet: . files Message-ID: <201502250130.t1P1UowQ063014@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Wed Feb 25 01:30:49 2015 New Revision: 379861 URL: https://svnweb.freebsd.org/changeset/ports/379861 QAT: https://qat.redports.org/buildarchive/r379861/ Log: Use the 3.1 version of the dictionary, released in 2012. The latest available code remains at 3.0. Install the data files directly -- instead of extracting them into WRKSRC first. Only install files actually used by the applications -- the distfiles also contain data, that is used to build the databases, but aren't used at runtime. Deleted: head/textproc/wordnet/files/dict.Makefile Modified: head/textproc/wordnet/Makefile head/textproc/wordnet/distinfo head/textproc/wordnet/files/Makefile head/textproc/wordnet/files/patch-src__wnb_2 head/textproc/wordnet/files/pkg-message.in head/textproc/wordnet/pkg-plist Modified: head/textproc/wordnet/Makefile ============================================================================== --- head/textproc/wordnet/Makefile Wed Feb 25 00:57:18 2015 (r379860) +++ head/textproc/wordnet/Makefile Wed Feb 25 01:30:49 2015 (r379861) @@ -3,13 +3,17 @@ PORTNAME= WordNet PORTVERSION= 3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc -MASTER_SITES= http://wordnetcode.princeton.edu/${PORTVERSION}/ +MASTER_SITES= http://wordnetcode.princeton.edu/${PORTVERSION}/:code \ + http://wordnetcode.princeton.edu/:dict +DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:code wn3.1.dict.tar.gz:dict MAINTAINER= mi@aldan.algebra.com COMMENT= Dictionaries and thesauri with devel. libraries (C, TCL) and browsers +EXTRACT_ONLY= ${DISTFILES:M*code:S/:code//} +EXTRACT_AFTER_ARGS=--exclude dict USES= tcl uidfix tar:bzip2 SCRIPTS_ENV+= TCL_DVER=${TCL_VER} VER=${PORTVERSION} MAKE_ENV+= TCL_DVER=${TCL_VER} VER=${PORTVERSION} STAGEDIR="${STAGEDIR}" @@ -20,8 +24,16 @@ SUB_FILES= pkg-message SUB_LIST+= TCL_VER=${TCL_VER} post-patch: - ${REINPLACE_CMD} -e 's,/usr/local/WordNet-2.1,${DATADIR},g' \ + ${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' \ ${WRKSRC}/src/wnb ${WRKSRC}/doc/man/*.? ${REINPLACE_CMD} -e 's, *\\n,\\n,' ${WRKSRC}/include/wn.h +post-install: + ${MKDIR} ${STAGEDIR}${DATADIR} + ${TAR} -C ${STAGEDIR}${DATADIR} -x --no-same-owner \ + --strip-components 1 \ + -f ${_DISTDIR}${DISTFILES:M*dict:S/:dict//} \ + `${SED} -n -e '/\.xbm/d' -e 's,^%%DATADIR%%/,dict/,p' ${PLIST}` + @${CAT} ${PKGMESSAGE} + .include <bsd.port.mk> Modified: head/textproc/wordnet/distinfo ============================================================================== --- head/textproc/wordnet/distinfo Wed Feb 25 00:57:18 2015 (r379860) +++ head/textproc/wordnet/distinfo Wed Feb 25 01:30:49 2015 (r379861) @@ -1,2 +1,4 @@ SHA256 (WordNet-3.0.tar.bz2) = 6c492d0c7b4a40e7674d088191d3aa11f373bb1da60762e098b8ee2dda96ef22 -SHA256 (WordNet-3.0.tar.bz2) = ab232433fb6828dcbf00bc213c12a8da79e80d70fed808d6cf85f79da5e91f2c +SIZE (WordNet-3.0.tar.bz2) = 9060524 +SHA256 (wn3.1.dict.tar.gz) = 3f7d8be8ef6ecc7167d39b10d66954ec734280b5bdcd57f7d9eafe429d11c22a +SIZE (wn3.1.dict.tar.gz) = 16358468 Modified: head/textproc/wordnet/files/Makefile ============================================================================== --- head/textproc/wordnet/files/Makefile Wed Feb 25 00:57:18 2015 (r379860) +++ head/textproc/wordnet/files/Makefile Wed Feb 25 01:30:49 2015 (r379861) @@ -4,7 +4,6 @@ SUBDIR= include \ lib \ lib/wnres \ src \ - dict \ doc/man .include <bsd.subdir.mk> Modified: head/textproc/wordnet/files/patch-src__wnb_2 ============================================================================== --- head/textproc/wordnet/files/patch-src__wnb_2 Wed Feb 25 00:57:18 2015 (r379860) +++ head/textproc/wordnet/files/patch-src__wnb_2 Wed Feb 25 01:30:49 2015 (r379861) @@ -12,7 +12,7 @@ dictionaries and the bitmap into ${PREFI --- src/wnb Tue Jun 7 15:19:22 2005 +++ src/wnb Sun Jan 15 07:42:38 2006 -@@ -103,9 +100,15 @@ +@@ -103,9 +100,14 @@ if {$tcl_platform(platform) == "unix"} { - if {[lsearch -exact [array names env] WNHOME] == -1} { @@ -20,8 +20,7 @@ dictionaries and the bitmap into ${PREFI - } else { - set resourcedir "$env(WNHOME)/lib/wnres" + set resourcedirs { -+ /usr/local/WordNet-3.0 -+ /usr/local/WordNet-3.0/lib/wnres ++ /usr/local/WordNet + } + if {[info exists env(WNHOME)]} { + lappend resourcedirs $env(WNHOME) $env(WNHOME)/lib/wnres Modified: head/textproc/wordnet/files/pkg-message.in ============================================================================== --- head/textproc/wordnet/files/pkg-message.in Wed Feb 25 00:57:18 2015 (r379860) +++ head/textproc/wordnet/files/pkg-message.in Wed Feb 25 01:30:49 2015 (r379861) @@ -3,5 +3,5 @@ be installed. This dependency is not automatic, because there are plenty of uses for WordNet on servers without X11. - The command-line utilit ``wn'', for example, requires only Tcl. + The command-line utility ``wn'', for example, requires only Tcl. Modified: head/textproc/wordnet/pkg-plist ============================================================================== --- head/textproc/wordnet/pkg-plist Wed Feb 25 00:57:18 2015 (r379860) +++ head/textproc/wordnet/pkg-plist Wed Feb 25 01:30:49 2015 (r379861) @@ -10,13 +10,11 @@ lib/libtclwn2.so lib/tcl%%TCL_DVER%%/Wordnet/pkgIndex.tcl %%DATADIR%%/adj.exc %%DATADIR%%/adv.exc -%%DATADIR%%/cntlist %%DATADIR%%/cntlist.rev %%DATADIR%%/data.adj %%DATADIR%%/data.adv %%DATADIR%%/data.noun %%DATADIR%%/data.verb -%%DATADIR%%/frames.vrb %%DATADIR%%/index.adj %%DATADIR%%/index.adv %%DATADIR%%/index.noun @@ -26,7 +24,6 @@ lib/tcl%%TCL_DVER%%/Wordnet/pkgIndex.tcl %%DATADIR%%/sentidx.vrb %%DATADIR%%/sents.vrb %%DATADIR%%/verb.exc -%%DATADIR%%/verb.Framestext %%DATADIR%%/wn.xbm man/man1/wn.1.gz man/man1/wnb.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502250130.t1P1UowQ063014>