Index: head/textproc/wordnet/Makefile =================================================================== --- head/textproc/wordnet/Makefile (revision 379860) +++ head/textproc/wordnet/Makefile (revision 379861) @@ -1,27 +1,39 @@ # Created by: Mikhail Teterin # $FreeBSD$ 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}" PLIST_SUB+= TCL_DVER=${TCL_VER} VER=${PORTVERSION} REINPLACE_ARGS= -i "" USE_LDCONFIG= yes 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 Index: head/textproc/wordnet/distinfo =================================================================== --- head/textproc/wordnet/distinfo (revision 379860) +++ head/textproc/wordnet/distinfo (revision 379861) @@ -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 Index: head/textproc/wordnet/files/dict.Makefile =================================================================== --- head/textproc/wordnet/files/dict.Makefile (revision 379860) +++ head/textproc/wordnet/files/dict.Makefile (nonexistent) @@ -1,22 +0,0 @@ -WN_INSTALLDIR= ${STAGEDIR}${PREFIX}/share/WordNet -WN_FILES= adj.exc adv.exc cntlist cntlist.rev data.adj \ - data.adv data.noun data.verb frames.vrb index.adj \ - index.adv index.noun index.sense index.verb \ - noun.exc sentidx.vrb sents.vrb verb.Framestext verb.exc - -all: $(WN_FILES) - -${WN_INSTALLDIR}: - mkdir -p ${WN_INSTALLDIR} - -.for f in ${WN_FILES} -INSTALLED+= ${WN_INSTALLDIR}/$f - -${WN_INSTALLDIR}/$f: $f - ${BSD_INSTALL_DATA} $f ${WN_INSTALLDIR}/$f -.endfor - -install: ${WN_INSTALLDIR} ${INSTALLED} - -NO_OBJ= noobj -.include Property changes on: head/textproc/wordnet/files/dict.Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/wordnet/files/Makefile =================================================================== --- head/textproc/wordnet/files/Makefile (revision 379860) +++ head/textproc/wordnet/files/Makefile (revision 379861) @@ -1,10 +1,9 @@ # $FreeBSD$ SUBDIR= include \ lib \ lib/wnres \ src \ - dict \ doc/man .include Index: head/textproc/wordnet/files/patch-src__wnb_2 =================================================================== --- head/textproc/wordnet/files/patch-src__wnb_2 (revision 379860) +++ head/textproc/wordnet/files/patch-src__wnb_2 (revision 379861) @@ -1,57 +1,56 @@ This patch makes wnb use man(1) to access its own man-pages instead of relying on textual copies of them being in the $resourcedir. Similarly, it looks for the compiled-in license instead of opening its textual copy. These leave wn.xbm as the only "resource" file, thus removing the need for a separate resource directory. FreeBSD port installs all -- the dictionaries and the bitmap into ${PREFIX}/share/WordNet. -mi --- 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} { - set resourcedir "/usr/local/WordNet-3.0/lib/wnres" - } 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 } + foreach resourcedir $resourcedirs { + if {[file exists $resourcedir/wn.xbm]} break + } + unset resourcedirs set configfile "$env(HOME)/.wnrc" if [ file exists $configfile ] { @@ -575,7 +578,19 @@ .$w.top.text configure \ -state normal - set fileid [open $filename "r"] - set filetext [read $fileid] - close $fileid + switch -glob -- $filename { + *.man { + set manpage [file tail $filename] + set manpage [string range $manpage 0 end-4] + set fileid [open "|man $manpage"] + } */license.txt { + set filetext [wnlicense] + } default { + set fileid [open $filename] + } + } + if {[info exists fileid]} { + set filetext [read $fileid] + close $fileid + } regsub -all ".\b" $filetext "" filetext .$w.top.text insert end $filetext Index: head/textproc/wordnet/files/pkg-message.in =================================================================== --- head/textproc/wordnet/files/pkg-message.in (revision 379860) +++ head/textproc/wordnet/files/pkg-message.in (revision 379861) @@ -1,7 +1,7 @@ For the GUI word-browser ``wnb'' to function, Tk-%%TCL_VER%% must 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. Index: head/textproc/wordnet/pkg-plist =================================================================== --- head/textproc/wordnet/pkg-plist (revision 379860) +++ head/textproc/wordnet/pkg-plist (revision 379861) @@ -1,52 +1,49 @@ bin/wnb bin/wn include/WordNet/wn.h include/WordNet/wngrind.h lib/libWN.a lib/libWN.so.2 lib/libWN.so lib/libtclwn2.so.0 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 %%DATADIR%%/index.sense %%DATADIR%%/index.verb %%DATADIR%%/noun.exc %%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 man/man1/wnintro.1.gz man/man3/binsrch.3.gz man/man3/morph.3.gz man/man3/wnintro.3.gz man/man3/wnsearch.3.gz man/man3/wnutil.3.gz man/man5/cntlist.5.gz man/man5/lexnames.5.gz man/man5/senseidx.5.gz man/man5/wndb.5.gz man/man5/wninput.5.gz man/man5/wnintro.5.gz man/man7/morphy.7.gz man/man7/uniqbeg.7.gz man/man7/wngloss.7.gz man/man7/wngroups.7.gz man/man7/wnintro.7.gz man/man7/wnlicens.7.gz man/man7/wnpkgs.7.gz man/man7/wnstats.7.gz