Index: head/mail/py-spf/Makefile
===================================================================
--- head/mail/py-spf/Makefile	(revision 334388)
+++ head/mail/py-spf/Makefile	(revision 334389)
@@ -1,41 +1,40 @@
 # Created by: Marcus Alves Grando <mnag@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	spf
 PORTVERSION=	2.0.8
 CATEGORIES=	mail python
 MASTER_SITES=	SF/pymilter/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python implementation of the RFC 4408 SPF protocol
 
 LICENSE=	PSFL
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dns>=0:${PORTSDIR}/dns/py-dns
 
 OPTIONS_DEFINE=	DOCS
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	py${PORTNAME}
+USES=		shebangfix
 
 PORTDOCS=	CHANGELOG README
 
-NO_STAGE=	yes
+SHEBANG_FILES=	spf.py
+
 .include <bsd.port.options.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e '1 s|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/spf.py
-
 post-install:
-	${CHMOD} ${BINMODE} ${PYTHONPREFIX_SITELIBDIR}/spf.py
-	${LN} -s ${PYTHONPREFIX_SITELIBDIR}/spf.py ${PREFIX}/bin/
+	${CHMOD} ${BINMODE} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/spf.py
+	${LN} -s ${PYTHONPREFIX_SITELIBDIR}/spf.py ${STAGEDIR}${PREFIX}/bin/
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
Index: head/mail/py-spf/pkg-descr
===================================================================
--- head/mail/py-spf/pkg-descr	(revision 334388)
+++ head/mail/py-spf/pkg-descr	(revision 334389)
@@ -1,8 +1,8 @@
 The pyspf Python module has been released as version 2.0. pyspf 2.0 
 was the first SPF implementation to fully conform to RFC 4408. This 
 release has also added IPv6 support. pyspf is the library behind 
 several of the open SPF project's SPF record testing tools.
 
 Currently part of the pymilter project: http://pymilter.sourceforge.net
 
-WWW: http://pypi.python.org/pypi/pyspf
+WWW: https://pypi.python.org/pypi/pyspf