4 files changed, 56 insertions, 15 deletions

diff --git a/devel/py-instant/Makefile b/devel/py-instant/Makefile
index bffbaa1137af..85eb1ec3826a 100644
--- a/devel/py-instant/Makefile
+++ b/devel/py-instant/Makefile
@@ -6,25 +6,31 @@
 #
 
 PORTNAME=	instant
-PORTVERSION=	0.9
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	devel python
-MASTER_SITES=	SF/py${PORTNAME}/Instant-${PORTVERSION}/${PORTVERSION}
+MASTER_SITES=	https://launchpad.net/${PORTNAME}/1.0.x/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Instant-${PORTVERSION}
 
-MAINTAINER=	lwhsu@FreeBSD.org
+MAINTAINER=	jwbacon@tds.net
 COMMENT=	Python module for instant inlining of C and C++ code in Python
 
-RUN_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
+LICENSE=	LGPL3
 
-USE_PYTHON=	2.5+
+RUN_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	Instant
-PYDISTUTILS_PKGVERSION=	0.8
+PYDISTUTILS_PKGNAME=	instant
+
+FETCH_ARGS=	-F
+
+MAN1=		instant-clean.1 \
+		instant-showcache.1
+MANCOMPRESSED=	yes
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/Instant.py \
-		%%PYTHON_SITELIBDIR%%/Instant.pyc \
-		%%PYTHON_SITELIBDIR%%/Instant.pyo
+post-patch:
+	@${REINPLACE_CMD} -e \
+	's|\[(join("share", "man", "man1"),|\[(join("man", "man1"),|' \
+	${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/devel/py-instant/distinfo b/devel/py-instant/distinfo
index 625e7323e416..93fa3456716b 100644
--- a/devel/py-instant/distinfo
+++ b/devel/py-instant/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Instant-0.9.tar.gz) = bd6d305f15c7dee34f2f14a001037bdcc25516738757d2201dd8efbf97bb5b6e
-SIZE (Instant-0.9.tar.gz) = 34131
+SHA256 (instant-1.0.0.tar.gz) = 0477ad61482bc1a3303f04031489dd4039747e2e7dbfde291747be5cf8c2bff3
+SIZE (instant-1.0.0.tar.gz) = 124652
diff --git a/devel/py-instant/pkg-descr b/devel/py-instant/pkg-descr
index faea6ddfce82..94c89ec77321 100644
--- a/devel/py-instant/pkg-descr
+++ b/devel/py-instant/pkg-descr
@@ -5,4 +5,4 @@ import the module manually.
 The code can be either C or C++, but like when programming C or C++, it has to
 be inside a function or a similar C/C++ construct.
 
-WWW:	http://pyinstant.sourceforge.net/
+WWW:	https://launchpad.net/instant
diff --git a/devel/py-instant/pkg-plist b/devel/py-instant/pkg-plist
new file mode 100644
index 000000000000..ac8a5f168d85
--- /dev/null
+++ b/devel/py-instant/pkg-plist
@@ -0,0 +1,35 @@
+bin/instant-clean
+bin/instant-showcache
+%%PYTHON_SITELIBDIR%%/instant/__init__.py
+%%PYTHON_SITELIBDIR%%/instant/__init__.pyc
+%%PYTHON_SITELIBDIR%%/instant/__init__.pyo
+%%PYTHON_SITELIBDIR%%/instant/build.py
+%%PYTHON_SITELIBDIR%%/instant/build.pyc
+%%PYTHON_SITELIBDIR%%/instant/build.pyo
+%%PYTHON_SITELIBDIR%%/instant/cache.py
+%%PYTHON_SITELIBDIR%%/instant/cache.pyc
+%%PYTHON_SITELIBDIR%%/instant/cache.pyo
+%%PYTHON_SITELIBDIR%%/instant/codegeneration.py
+%%PYTHON_SITELIBDIR%%/instant/codegeneration.pyc
+%%PYTHON_SITELIBDIR%%/instant/codegeneration.pyo
+%%PYTHON_SITELIBDIR%%/instant/config.py
+%%PYTHON_SITELIBDIR%%/instant/config.pyc
+%%PYTHON_SITELIBDIR%%/instant/config.pyo
+%%PYTHON_SITELIBDIR%%/instant/inlining.py
+%%PYTHON_SITELIBDIR%%/instant/inlining.pyc
+%%PYTHON_SITELIBDIR%%/instant/inlining.pyo
+%%PYTHON_SITELIBDIR%%/instant/locking.py
+%%PYTHON_SITELIBDIR%%/instant/locking.pyc
+%%PYTHON_SITELIBDIR%%/instant/locking.pyo
+%%PYTHON_SITELIBDIR%%/instant/output.py
+%%PYTHON_SITELIBDIR%%/instant/output.pyc
+%%PYTHON_SITELIBDIR%%/instant/output.pyo
+%%PYTHON_SITELIBDIR%%/instant/paths.py
+%%PYTHON_SITELIBDIR%%/instant/paths.pyc
+%%PYTHON_SITELIBDIR%%/instant/paths.pyo
+%%PYTHON_SITELIBDIR%%/instant/signatures.py
+%%PYTHON_SITELIBDIR%%/instant/signatures.pyc
+%%PYTHON_SITELIBDIR%%/instant/signatures.pyo
+%%PYTHON_SITELIBDIR%%/instant/swig/numpy.i
+@dirrm %%PYTHON_SITELIBDIR%%/instant/swig
+@dirrm %%PYTHON_SITELIBDIR%%/instant