Index: gcc/Makefile
===================================================================
--- gcc/Makefile
+++ gcc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	5.4.0
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 
@@ -86,6 +87,7 @@
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 .endif
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--libdir=${TARGLIB} \
@@ -139,6 +141,8 @@
 PLIST_SUB+=	JAVA="@comment "
 .endif
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
+JAVA_USES=		python shebangfix
+SHEBANG_FILES=	libjava/contrib/aot-compile.in
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
Index: gcc5-devel/Makefile
===================================================================
--- gcc5-devel/Makefile
+++ gcc5-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	5.4.1.s20170404
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 DISTNAME=	gcc-${DIST_VERSION}
@@ -93,6 +94,7 @@
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 .endif
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--libdir=${TARGLIB} \
@@ -145,6 +147,8 @@
 PLIST_SUB+=	JAVA="@comment "
 .endif
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
+JAVA_USES=	python shebangfix
+SHEBANG_FILES=	libjava/contrib/aot-compile.in
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
Index: gcc5/Makefile
===================================================================
--- gcc5/Makefile
+++ gcc5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}
@@ -87,6 +87,7 @@
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 .endif
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--libdir=${TARGLIB} \
@@ -140,6 +141,8 @@
 PLIST_SUB+=	JAVA="@comment "
 .endif
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
+JAVA_USES=	python shebangfix
+SHEBANG_FILES=	libjava/contrib/aot-compile.in
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
Index: gcc6-devel/Makefile
===================================================================
--- gcc6-devel/Makefile
+++ gcc6-devel/Makefile
@@ -32,7 +32,7 @@
 # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y
 # for these three.
 DIST_VERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
-PORTREVISION=	1
+PORTREVISION=	2
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc powerpc64 sparc64 arm armv6
@@ -94,6 +94,7 @@
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 .endif
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--libdir=${TARGLIB} \
@@ -146,6 +147,8 @@
 PLIST_SUB+=	JAVA="@comment "
 .endif
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
+JAVA_USES=	python shebangfix
+SHEBANG_FILES=	libjava/contrib/aot-compile.in
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
Index: gcc6/Makefile
===================================================================
--- gcc6/Makefile
+++ gcc6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}
@@ -87,6 +87,7 @@
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 .endif
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--libdir=${TARGLIB} \
@@ -140,6 +141,8 @@
 PLIST_SUB+=	JAVA="@comment "
 .endif
 CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
+JAVA_USES=	python shebangfix
+SHEBANG_FILES=	libjava/contrib/aot-compile.in
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
Index: gcc7-devel/Makefile
===================================================================
--- gcc7-devel/Makefile
+++ gcc7-devel/Makefile
@@ -1,4 +1,4 @@
-# Created by: Gerald Pfeifer <gerald@FreeBSD.org>
+# Created by: Ger5ald Pfeifer <gerald@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gcc
@@ -32,7 +32,7 @@
 # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y
 # for these three.
 DIST_VERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
-PORTREVISION=	1
+PORTREVISION=	2
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc powerpc64 sparc64 arm armv6
@@ -87,6 +87,7 @@
 CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
 ALL_TARGET=	bootstrap-lean
 .endif
+INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=--disable-nls \
 		--enable-gnu-indirect-function \
 		--libdir=${TARGLIB} \