3 files changed, 57 insertions, 17 deletions

diff --git a/textproc/py-wordnet/Makefile b/textproc/py-wordnet/Makefile
index 54b4a11c0b0b..222af6723528 100644
--- a/textproc/py-wordnet/Makefile
+++ b/textproc/py-wordnet/Makefile
@@ -7,27 +7,43 @@
 
 PORTNAME=	wordnet
 PORTVERSION=	2.0.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}:pywn \
+		ftp://ftp.cogsci.princeton.edu/pub/wordnet/${WN_VERSION}/:wn \
+                http://www.cogsci.princeton.edu/${WN_VERSION}/:wn \
+		ftp://ftp.ims.uni-stuttgart.de/pub/WordNet/${WN_VERSION}/:wn
 MASTER_SITE_SUBDIR=	pywordnet
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	pywordnet-${PORTVERSION}
+DISTFILES=	pywordnet-${PORTVERSION}.tar.gz:pywn \
+		WordNet-${WN_VERSION}.tar.gz:wn
 
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Python Interface to WordNet
 
-RUN_DEPENDS=	${WORDNETBASE}/lexnames:${PORTSDIR}/textproc/wordnet
-
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-WORDNETBASE?=	${LOCALBASE}/share/WordNet-${WORDNET_VERSION}
-WORDNET_VERSION?=	2.0
+WRKSRC=		${WRKDIR}/py${PORTNAME}-${PORTVERSION}
+PLIST_SUB=	WNDATA=${WORDNETDATA}
+
+WN_WRKSRC=	${WRKDIR}/WordNet-${WN_VERSION}
+WN_VERSION=	2.0
+WORDNETDATA=	share/py-${PORTNAME}
+WN_DICTFILES=	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 lexnames noun.exc sentidx.vrb sents.vrb\
+		verb.exc
 
 post-patch:
-	@${SED} -e 's|/usr/local/wordnet${WORDNET_VERSION}|${WORDNETBASE}|g' \
+	@${SED} -e 's|/usr/local/wordnet2.0|${PREFIX}/${WORDNETDATA}|g' \
 		-e 's|os.path.join(WNHOME.*))|WNHOME)|g' ${WRKSRC}/wordnet.py \
 		> ${WRKSRC}/wordnet.py.tmp && ${CAT} ${WRKSRC}/wordnet.py.tmp \
 		> ${WRKSRC}/wordnet.py
 
+post-install:
+	${MKDIR} -p ${PREFIX}/${WORDNETDATA}
+.for f in ${WN_DICTFILES}
+	${INSTALL_DATA} ${WN_WRKSRC}/dict/${f} ${PREFIX}/${WORDNETDATA}/
+.endfor
+
 .include <bsd.port.mk>
diff --git a/textproc/py-wordnet/distinfo b/textproc/py-wordnet/distinfo
index bd2adbe2f7a0..14204475d144 100644
--- a/textproc/py-wordnet/distinfo
+++ b/textproc/py-wordnet/distinfo
@@ -1,2 +1,6 @@
 MD5 (pywordnet-2.0.1.tar.gz) = 0e6a86f03715a534ed36279d8f797ca5
+SHA256 (pywordnet-2.0.1.tar.gz) = 02fa970e65f4807810d1f81dbec0bd3fbc63cdd68c716e4ddea938c9323893a2
 SIZE (pywordnet-2.0.1.tar.gz) = 38052
+MD5 (WordNet-2.0.tar.gz) = 42faaf63f391bb1e13f59ca83490634d
+SHA256 (WordNet-2.0.tar.gz) = 081ad1b47b9489b25532fe2e546244480a03932792c218596b848d6f8d2c42bb
+SIZE (WordNet-2.0.tar.gz) = 12847598
diff --git a/textproc/py-wordnet/pkg-plist b/textproc/py-wordnet/pkg-plist
index 75c690a10df8..c42a8b766b40 100644
--- a/textproc/py-wordnet/pkg-plist
+++ b/textproc/py-wordnet/pkg-plist
@@ -1,9 +1,29 @@
-lib/%%PYTHON_VERSION%%/site-packages/concordance.py
-lib/%%PYTHON_VERSION%%/site-packages/concordance.pyc
-lib/%%PYTHON_VERSION%%/site-packages/concordance.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wordnet.py
-lib/%%PYTHON_VERSION%%/site-packages/wordnet.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wordnet.pyo
-lib/%%PYTHON_VERSION%%/site-packages/wntools.py
-lib/%%PYTHON_VERSION%%/site-packages/wntools.pyc
-lib/%%PYTHON_VERSION%%/site-packages/wntools.pyo
+%%PYTHON_SITELIBDIR%%/concordance.py
+%%PYTHON_SITELIBDIR%%/concordance.pyc
+%%PYTHON_SITELIBDIR%%/concordance.pyo
+%%PYTHON_SITELIBDIR%%/wordnet.py
+%%PYTHON_SITELIBDIR%%/wordnet.pyc
+%%PYTHON_SITELIBDIR%%/wordnet.pyo
+%%PYTHON_SITELIBDIR%%/wntools.py
+%%PYTHON_SITELIBDIR%%/wntools.pyc
+%%PYTHON_SITELIBDIR%%/wntools.pyo
+%%WNDATA%%/adj.exc
+%%WNDATA%%/adv.exc
+%%WNDATA%%/cntlist
+%%WNDATA%%/cntlist.rev
+%%WNDATA%%/data.adj
+%%WNDATA%%/data.adv
+%%WNDATA%%/data.noun
+%%WNDATA%%/data.verb
+%%WNDATA%%/frames.vrb
+%%WNDATA%%/index.adj
+%%WNDATA%%/index.adv
+%%WNDATA%%/index.noun
+%%WNDATA%%/index.sense
+%%WNDATA%%/index.verb
+%%WNDATA%%/lexnames
+%%WNDATA%%/noun.exc
+%%WNDATA%%/sentidx.vrb
+%%WNDATA%%/sents.vrb
+%%WNDATA%%/verb.exc
+@dirrm %%WNDATA%%