Hi,
This diff updates py-nltk to the latest release 2.0.4.
Tested on amd64.
Comments ? OK ?
Cheers,
benoit
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-nltk/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 16 Sep 2011 11:41:41 -0000 1.8
+++ Makefile 4 Jan 2013 09:11:21 -0000
@@ -2,10 +2,9 @@
COMMENT= Natural Language ToolKit
-MODPY_EGG_VERSION= 2.0b9
+MODPY_EGG_VERSION= 2.0.4
DISTNAME= nltk-${MODPY_EGG_VERSION}
PKGNAME= py-nltk-${MODPY_EGG_VERSION}
-REVISION= 4
CATEGORIES= textproc
HOMEPAGE= http://www.nltk.org/
@@ -16,10 +15,11 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://nltk.googlecode.com/files/
-EXTRACT_SUFX= .zip
+MASTER_SITES= ${MASTER_SITE_PYPI:=n/nltk/}
MODULES= lang/python
+
+MODPY_SETUPTOOLS = Yes
BUILD_DEPENDS= textproc/py-yaml
RUN_DEPENDS= graphics/py-matplotlib \
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/py-nltk/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 30 Aug 2010 07:16:02 -0000 1.2
+++ distinfo 4 Jan 2013 09:11:21 -0000
@@ -1,5 +1,2 @@
-MD5 (nltk-2.0b9.zip) = 7pg/gCM3XytlqkYHxAWphg==
-RMD160 (nltk-2.0b9.zip) = a9dySD7ialJ9I6RIP21fDIIQ+h0=
-SHA1 (nltk-2.0b9.zip) = oBAghoa/jYqAzeyXT3IumQre1w8=
-SHA256 (nltk-2.0b9.zip) = vb41A/ItB2YFTZIKC40FaX3NV2VAIxwraklJrVySgdk=
-SIZE (nltk-2.0b9.zip) = 1043217
+SHA256 (nltk-2.0.4.tar.gz) = pVTWucXHyLWXoJDYhIpveMb8RmWuQ8mmptalsgfZjGU=
+SIZE (nltk-2.0.4.tar.gz) = 955978
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/textproc/py-nltk/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -r1.2 patch-setup_py
--- patches/patch-setup_py 30 Aug 2010 07:16:02 -0000 1.2
+++ patches/patch-setup_py 4 Jan 2013 09:11:21 -0000
@@ -1,15 +1,15 @@
-$OpenBSD: patch-setup_py,v 1.2 2010/08/30 07:16:02 jasper Exp $
+$OpenBSD$
- don't install random java files.
---- setup.py.orig Mon Aug 30 00:06:34 2010
-+++ setup.py Mon Aug 30 00:06:44 2010
-@@ -32,7 +32,7 @@ setup(
-
- #############################################
- ## Package Data
-- package_data = {'nltk': ['nltk.jar', 'test/*.doctest']},
-+ package_data = {'nltk': ['test/*.doctest']},
-
- #############################################
- ## Package List
+--- setup.py.orig Mon Sep 24 11:29:14 2012
++++ setup.py Thu Jan 3 22:54:25 2013
+@@ -69,7 +69,7 @@
+ 'Topic :: Text Processing :: Indexing',
+ 'Topic :: Text Processing :: Linguistic',
+ ],
+- package_data = {'nltk': ['nltk.jar', 'test/*.doctest', 'VERSION']},
++ package_data = {'nltk': ['test/*.doctest', 'VERSION']},
+ packages = find_packages(),
+ zip_safe=False, # since normal files will be present too?
+ install_requires=['PyYAML>=3.09'],
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/py-nltk/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 30 Aug 2010 07:16:02 -0000 1.2
+++ pkg/PLIST 4 Jan 2013 09:11:21 -0000
@@ -1,8 +1,17 @@
@comment $OpenBSD: PLIST,v 1.2 2010/08/30 07:16:02 jasper Exp $
lib/python${MODPY_VERSION}/site-packages/nltk/
-lib/python${MODPY_VERSION}/site-packages/nltk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/nltk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/nltk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/nltk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/nltk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/nltk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/nltk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/nltk-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/nltk/VERSION
lib/python${MODPY_VERSION}/site-packages/nltk/__init__.py
lib/python${MODPY_VERSION}/site-packages/nltk/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/align.py
+lib/python${MODPY_VERSION}/site-packages/nltk/align.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/app/
lib/python${MODPY_VERSION}/site-packages/nltk/app/__init__.py
lib/python${MODPY_VERSION}/site-packages/nltk/app/__init__.pyc
@@ -24,8 +33,6 @@
lib/python${MODPY_VERSION}/site-packages/nltk/app/wordfreq_app.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/app/wordnet_app.py
lib/python${MODPY_VERSION}/site-packages/nltk/app/wordnet_app.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/app/wxwordnet_app.py
-lib/python${MODPY_VERSION}/site-packages/nltk/app/wxwordnet_app.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/book.py
lib/python${MODPY_VERSION}/site-packages/nltk/book.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/ccg/
@@ -80,8 +87,14 @@
lib/python${MODPY_VERSION}/site-packages/nltk/classify/megam.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/classify/naivebayes.py
lib/python${MODPY_VERSION}/site-packages/nltk/classify/naivebayes.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/classify/positivenaivebayes.py
+lib/python${MODPY_VERSION}/site-packages/nltk/classify/positivenaivebayes.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/classify/rte_classify.py
lib/python${MODPY_VERSION}/site-packages/nltk/classify/rte_classify.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/classify/scikitlearn.py
+lib/python${MODPY_VERSION}/site-packages/nltk/classify/scikitlearn.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/classify/svm.py
+lib/python${MODPY_VERSION}/site-packages/nltk/classify/svm.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/classify/tadm.py
lib/python${MODPY_VERSION}/site-packages/nltk/classify/tadm.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/classify/util.py
@@ -103,10 +116,6 @@
lib/python${MODPY_VERSION}/site-packages/nltk/cluster/util.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/collocations.py
lib/python${MODPY_VERSION}/site-packages/nltk/collocations.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/compat.py
-lib/python${MODPY_VERSION}/site-packages/nltk/compat.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/containers.py
-lib/python${MODPY_VERSION}/site-packages/nltk/containers.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/__init__.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/__init__.pyc
@@ -115,12 +124,18 @@
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/__init__.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/aligned.py
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/aligned.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/api.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/api.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/bnc.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/bnc.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/bracket_parse.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/bracket_parse.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/chasen.py
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/chasen.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/childes.py
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/childes.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/chunked.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/chunked.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/cmudict.py
@@ -135,6 +150,10 @@
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/indian.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/ipipan.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/ipipan.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/knbc.py
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/knbc.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/lin.py
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/lin.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/nombank.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/nombank.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/nps_chat.py
@@ -149,6 +168,8 @@
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/propbank.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/rte.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/rte.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/semcor.py
+lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/semcor.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/senseval.py
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/senseval.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/corpus/reader/sinica_treebank.py
@@ -196,17 +217,6 @@
lib/python${MODPY_VERSION}/site-packages/nltk/draw/tree.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/draw/util.py
lib/python${MODPY_VERSION}/site-packages/nltk/draw/util.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/etree/
-lib/python${MODPY_VERSION}/site-packages/nltk/etree/ElementInclude.py
-lib/python${MODPY_VERSION}/site-packages/nltk/etree/ElementInclude.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/etree/ElementPath.py
-lib/python${MODPY_VERSION}/site-packages/nltk/etree/ElementPath.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/etree/ElementTree.py
-lib/python${MODPY_VERSION}/site-packages/nltk/etree/ElementTree.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/etree/__init__.py
-lib/python${MODPY_VERSION}/site-packages/nltk/etree/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/evaluate.py
-lib/python${MODPY_VERSION}/site-packages/nltk/evaluate.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/examples/
lib/python${MODPY_VERSION}/site-packages/nltk/examples/__init__.py
lib/python${MODPY_VERSION}/site-packages/nltk/examples/__init__.pyc
@@ -252,6 +262,8 @@
lib/python${MODPY_VERSION}/site-packages/nltk/metrics/distance.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/metrics/scores.py
lib/python${MODPY_VERSION}/site-packages/nltk/metrics/scores.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/metrics/segmentation.py
+lib/python${MODPY_VERSION}/site-packages/nltk/metrics/segmentation.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/metrics/spearman.py
lib/python${MODPY_VERSION}/site-packages/nltk/metrics/spearman.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/metrics/windowdiff.py
@@ -276,8 +288,6 @@
lib/python${MODPY_VERSION}/site-packages/nltk/model/api.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/model/ngram.py
lib/python${MODPY_VERSION}/site-packages/nltk/model/ngram.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/olac.py
-lib/python${MODPY_VERSION}/site-packages/nltk/olac.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/parse/
lib/python${MODPY_VERSION}/site-packages/nltk/parse/__init__.py
lib/python${MODPY_VERSION}/site-packages/nltk/parse/__init__.pyc
@@ -293,6 +303,8 @@
lib/python${MODPY_VERSION}/site-packages/nltk/parse/featurechart.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/parse/generate.py
lib/python${MODPY_VERSION}/site-packages/nltk/parse/generate.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/parse/generate2.py
+lib/python${MODPY_VERSION}/site-packages/nltk/parse/generate2.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/parse/malt.py
lib/python${MODPY_VERSION}/site-packages/nltk/parse/malt.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/parse/nonprojectivedependencyparser.py
@@ -338,6 +350,8 @@
lib/python${MODPY_VERSION}/site-packages/nltk/sem/logic.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/sem/relextract.py
lib/python${MODPY_VERSION}/site-packages/nltk/sem/relextract.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/sem/skolemize.py
+lib/python${MODPY_VERSION}/site-packages/nltk/sem/skolemize.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/sem/util.py
lib/python${MODPY_VERSION}/site-packages/nltk/sem/util.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/sourcedstring.py
@@ -374,17 +388,27 @@
lib/python${MODPY_VERSION}/site-packages/nltk/tag/hmm.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/tag/hunpos.py
lib/python${MODPY_VERSION}/site-packages/nltk/tag/hunpos.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/tag/senna.py
+lib/python${MODPY_VERSION}/site-packages/nltk/tag/senna.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/tag/sequential.py
lib/python${MODPY_VERSION}/site-packages/nltk/tag/sequential.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/tag/simplify.py
lib/python${MODPY_VERSION}/site-packages/nltk/tag/simplify.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/tag/stanford.py
+lib/python${MODPY_VERSION}/site-packages/nltk/tag/stanford.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/tag/tnt.py
lib/python${MODPY_VERSION}/site-packages/nltk/tag/tnt.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/tag/util.py
lib/python${MODPY_VERSION}/site-packages/nltk/tag/util.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/test/
+lib/python${MODPY_VERSION}/site-packages/nltk/test/__init__.py
+lib/python${MODPY_VERSION}/site-packages/nltk/test/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/test/align.doctest
+lib/python${MODPY_VERSION}/site-packages/nltk/test/all.py
+lib/python${MODPY_VERSION}/site-packages/nltk/test/all.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/test/ccg.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/chat80.doctest
+lib/python${MODPY_VERSION}/site-packages/nltk/test/childes.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/chunk.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/classify.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/collocations.doctest
@@ -392,6 +416,12 @@
lib/python${MODPY_VERSION}/site-packages/nltk/test/data.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/dependency.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/discourse.doctest
+lib/python${MODPY_VERSION}/site-packages/nltk/test/doctest_driver.py
+lib/python${MODPY_VERSION}/site-packages/nltk/test/doctest_driver.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/test/doctest_nose_plugin.py
+lib/python${MODPY_VERSION}/site-packages/nltk/test/doctest_nose_plugin.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/test/doctest_utils.py
+lib/python${MODPY_VERSION}/site-packages/nltk/test/doctest_utils.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/test/drt.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/featgram.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/featstruct.doctest
@@ -400,6 +430,7 @@
lib/python${MODPY_VERSION}/site-packages/nltk/test/grammartestsuites.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/inference.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/internals.doctest
+lib/python${MODPY_VERSION}/site-packages/nltk/test/japanese.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/logic.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/metrics.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/misc.doctest
@@ -409,6 +440,9 @@
lib/python${MODPY_VERSION}/site-packages/nltk/test/probability.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/relextract.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/resolution.doctest
+lib/python${MODPY_VERSION}/site-packages/nltk/test/runtests.py
+lib/python${MODPY_VERSION}/site-packages/nltk/test/runtests.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/test/segmentation.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/semantics.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/simple.doctest
lib/python${MODPY_VERSION}/site-packages/nltk/test/sourcedstring.doctest
@@ -441,11 +475,8 @@
lib/python${MODPY_VERSION}/site-packages/nltk/tokenize/treebank.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/tokenize/util.py
lib/python${MODPY_VERSION}/site-packages/nltk/tokenize/util.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/toolbox/
-lib/python${MODPY_VERSION}/site-packages/nltk/toolbox/__init__.py
-lib/python${MODPY_VERSION}/site-packages/nltk/toolbox/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/nltk/toolbox/toolbox.py
-lib/python${MODPY_VERSION}/site-packages/nltk/toolbox/toolbox.pyc
+lib/python${MODPY_VERSION}/site-packages/nltk/toolbox.py
+lib/python${MODPY_VERSION}/site-packages/nltk/toolbox.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/tree.py
lib/python${MODPY_VERSION}/site-packages/nltk/tree.pyc
lib/python${MODPY_VERSION}/site-packages/nltk/treetransforms.py
