Index: head/devel/pythontidy/Makefile
===================================================================
--- head/devel/pythontidy/Makefile	(revision 438893)
+++ head/devel/pythontidy/Makefile	(revision 438894)
@@ -1,35 +1,36 @@
 # Created by: Li-Wen Hsu <lwhsu@lwhsu.org>
 # $FreeBSD$
 
 PORTNAME=	pythontidy
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.lacusveris.com/PythonTidy/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PythonTidy-${PORTVERSION}.python
 EXTRACT_SUFX=	#
 DIST_SUBDIR=	python
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Cleans up, regularizes, and reformats the text of Python scripts
 
 LICENSE=	GPLv2
 
 USES=		python
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/pythontidy
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${WRKDIR}
 
 do-patch:
-	${REINPLACE_CMD} -e 's,#!/usr/bin/python,#!/usr/bin/env python,' \
+	${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' \
 		${WRKDIR}/${DISTFILES}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${DISTFILES} \
 		${STAGEDIR}${PREFIX}/bin/pythontidy
 
 .include <bsd.port.mk>
Index: head/mail/archivemail/Makefile
===================================================================
--- head/mail/archivemail/Makefile	(revision 438893)
+++ head/mail/archivemail/Makefile	(revision 438894)
@@ -1,37 +1,39 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	archivemail
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Archive or delete mail older than N days
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python
+USES=		python shebangfix
 NO_BUILD=	yes
 NO_ARCH=	yes
+SHEBANG_FILES=	mail  \
+		test_archivemail
 
 DOCS=		CHANGELOG FAQ NEWS README TODO
 EXAMPLES=	test_archivemail examples/archivemail_all
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/archivemail ${STAGEDIR}${PREFIX}/bin/archivemail
 	${INSTALL_MAN} ${WRKSRC}/archivemail.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/misc/wotsap/Makefile
===================================================================
--- head/misc/wotsap/Makefile	(revision 438893)
+++ head/misc/wotsap/Makefile	(revision 438894)
@@ -1,26 +1,27 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	wotsap
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.lysator.liu.se/~jc/wotsap/download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Web of trust statistics and pathfinder
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
-USES=		python:2,run
+USES=		python:2,run shebangfix
 NO_BUILD=	yes
+SHEBANG_FILES=	wotsap pks2wot
 
 PLIST_FILES=	bin/pks2wot bin/wotsap
 PORTSCOUT=	ignore:1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pks2wot ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/wotsap ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>