3 files changed, 20 insertions, 12 deletions

diff --git a/textproc/py-martel/Makefile b/textproc/py-martel/Makefile
index 90a9cc6bd89f..5c935b2f8630 100644
--- a/textproc/py-martel/Makefile
+++ b/textproc/py-martel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	martel
-PORTVERSION=	0.3
-PORTREVISION=	1
+PORTVERSION=	0.35
 CATEGORIES=	textproc biology python
 MASTER_SITES=	http://www.biopython.org/~dalke/Martel/
 PKGNAMEPREFIX=	py-
@@ -15,11 +14,9 @@ DISTNAME=	Martel-${PORTVERSION}
 
 MAINTAINER=	johann@egenetics.com
 
-RUN_DEPENDS=	${PYXML} \
-		${PYTHON_SITELIBDIR}/TextTools/__init__.py:${PORTSDIR}/textproc/py-mxTextTools
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/TextTools/__init__.py:${PORTSDIR}/textproc/py-mxTextTools
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/Martel
-USE_PYTHON=	yes
+PYTHON_VERSION=	python2.0
 NO_BUILD=	yes
 
 MARTEL_DIR=	${PYTHON_SITELIBDIR}/Martel
diff --git a/textproc/py-martel/distinfo b/textproc/py-martel/distinfo
index 806bf314eb84..008e484a8357 100644
--- a/textproc/py-martel/distinfo
+++ b/textproc/py-martel/distinfo
@@ -1 +1 @@
-MD5 (Martel-0.3.tar.gz) = 4fc36181c39b564a3dbbacaab59b7ab8
+MD5 (Martel-0.35.tar.gz) = 8743c59c37132ecfe6a99c91f774409e
diff --git a/textproc/py-martel/pkg-plist b/textproc/py-martel/pkg-plist
index 9a0bf9ff8b53..5513064284ee 100644
--- a/textproc/py-martel/pkg-plist
+++ b/textproc/py-martel/pkg-plist
@@ -4,6 +4,9 @@ lib/%%PYTHON_VERSION%%/site-packages/Martel/Expression.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/Generate.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/Generate.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/Generate.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Martel/Iterator.py
+lib/%%PYTHON_VERSION%%/site-packages/Martel/Iterator.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Martel/Iterator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/Parser.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/Parser.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/Parser.pyo
@@ -41,6 +44,9 @@ lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/blastall_2_0_10.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/blastall_2_0_10.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/blastall_2_0_10.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/prosite16.py
+lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/prosite16.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/prosite16.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/swissprot38.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/swissprot38.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/formats/swissprot38.pyo
@@ -65,6 +71,9 @@ lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Expression.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Generate.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Generate.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Generate.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Iterator.py
+lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Iterator.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Iterator.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_MDL_10_1996.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_MDL_10_1996.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_MDL_10_1996.pyo
@@ -77,6 +86,9 @@ lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_PIR_3_0.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_ParseRecords.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_ParseRecords.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_ParseRecords.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Parser.py
+lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Parser.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_Parser.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_RecordReader.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_RecordReader.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_RecordReader.pyo
@@ -89,13 +101,12 @@ lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_convert_re.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_optimize.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_optimize.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_optimize.pyo
+lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_prosite16.py
+lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_prosite16.pyc
+lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_prosite16.pyo
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_swissprot38.py
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_swissprot38.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Martel/test/test_swissprot38.pyo
-share/doc/martel/HISTORY
-share/doc/martel/README
-share/doc/martel/tech_description.txt
-share/doc/martel/writing_a_format.txt
 share/examples/martel/README
 share/examples/martel/pdb1plm.ent
 share/examples/martel/sample.swissprot
@@ -103,8 +114,8 @@ share/examples/martel/swissprot2html.py
 share/examples/martel/test.mol
 share/examples/martel/toxml.py
 @dirrm share/examples/martel
-@dirrm share/doc/martel
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Martel/test
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Martel/formats
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Martel/examples
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/Martel
+@unexec rm -rf %D/share/doc/martel 2>/dev/null || true