Index: head/devel/geany/Makefile
===================================================================
--- head/devel/geany/Makefile	(revision 501535)
+++ head/devel/geany/Makefile	(revision 501536)
@@ -1,61 +1,62 @@
 # Created by: Remington Lang <MrL0Lz@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	geany
 PORTVERSION=	1.35
 CATEGORIES=	devel editors
 MASTER_SITES=	http://download.geany.org/ SF
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Fast and lightweight GTK+ IDE
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 FLAVORS=	gtk3 gtk2
 FLAVOR?=	${FLAVORS:[1]}
 
 gtk2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 gtk2_CONFLICTS_INSTALL=	geany
 gtk2_PKGNAMESUFFIX=	-gtk2
 
 gtk3_CONFLICTS_INSTALL=	geany-gtk2
 
 USES=		compiler:c++11-lang desktop-file-utils gettext-tools gmake \
-		gnome libtool localbase pathfix pkgconfig tar:bzip2
+		gnome libtool localbase pathfix pkgconfig shebangfix tar:bzip2
 USE_GNOME=	cairo intltool
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
+SHEBANG_FILES=	scripts/gen-api-gtkdoc.py
 
 OPTIONS_DEFINE=	VTE NLS DOCS
 OPTIONS_DEFAULT=	VTE
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 
 VTE_DESC=	Embedded virtual terminal
 VTE_CONFIGURE_ENABLE=	vte
 VTE_USE=	GNOME=vte
 
 .if ${FLAVOR} == gtk2
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--disable-gtk3
 PLIST_SUB+=	GTK2="" GTK3="@comment "
 .elif ${FLAVOR} == gtk3
 USE_GNOME+=	gtk30
 CONFIGURE_ARGS+=	--enable-gtk3
 PLIST_SUB+=	GTK2="@comment " GTK3=""
 .endif
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|po||' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: head/devel/geany-plugin-geanypy/Makefile
===================================================================
--- head/devel/geany-plugin-geanypy/Makefile	(revision 501535)
+++ head/devel/geany-plugin-geanypy/Makefile	(revision 501536)
@@ -1,21 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	geany-plugin-geanypy
 PORTVERSION=	${GEANY_VER}
+PORTREVISION=	1
 PKGNAMESUFFIX=	-gtk2
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
 LIB_DEPENDS=	libgeany.so:devel/geany@gtk2
 
 FLAVORS=	# intentionally left empty
 
-USES=		python:2.7
+USES=		python:2.7 shebangfix
 USE_GNOME=	pygtk2
+
+SHEBANG_FILES=	geanypy/geany/console.py
 
 OPTIONS_DEFINE=	DOCS
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
Index: head/devel/geany-plugin-lua/Makefile
===================================================================
--- head/devel/geany-plugin-lua/Makefile	(revision 501535)
+++ head/devel/geany-plugin-lua/Makefile	(revision 501536)
@@ -1,13 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	geany-plugin-lua
 PORTVERSION=	${GEANY_VER}
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-USES=		lua:51
+USES=		lua:51 shebangfix
+
+SHEBANG_FILES=	geanylua/util/mkiface.lua \
+		geanylua/util/mk-keytab.lua \
+		geanylua/util/keywords.lua
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>