15 files changed, 29 insertions, 86 deletions

diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile
index 706f887c386e..0bb49faf14fe 100644
--- a/lang/abcl/Makefile
+++ b/lang/abcl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	abcl
-# Date created:				22 April 2006
-# Whom:					Frank Fischer
-#
+# Created by: Frank Fischer
 # $FreeBSD$
-#
 
 PORTNAME=	abcl
 PORTVERSION=	1.0.1
@@ -21,7 +17,7 @@ SUB_LIST+=	JAVAJARDIR="${JAVAJARDIR}"
 SUB_FILES=	abcl
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 do-install:
diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile
index 5eba29da4093..fb159a1810a2 100644
--- a/lang/bsh/Makefile
+++ b/lang/bsh/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   bsh
-# Date created:                25 January 2002
-# Whom:                        Kimura Fuyuki <fuyuki@mj.0038.net>
-#
+# Created by: Kimura Fuyuki <fuyuki@mj.0038.net>
 # $FreeBSD$
-#
 
 PORTNAME=	bsh
 PORTVERSION=	2.0.b4
@@ -18,7 +14,7 @@ MAINTAINER=	simon@olofsson.de
 COMMENT=	A Java scripting language
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 SUB_FILES=	${PORTNAME}.sh
diff --git a/lang/clojure-contrib/Makefile b/lang/clojure-contrib/Makefile
index ea8f4dd5b8e7..963b4e2df165 100644
--- a/lang/clojure-contrib/Makefile
+++ b/lang/clojure-contrib/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	clojure-contrib
-# Date created:		Jun 12 2010
-# Whom:			olgeni
-#
+# Created by: olgeni
 # $FreeBSD$
-#
 
 PORTNAME=	clojure-contrib
 PORTVERSION=	1.2.0
@@ -19,7 +14,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/clojure:${PORTSDIR}/lang/clojure
 USE_ZIP=	yes
 USE_JAVA=	yes
 NO_BUILD=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 PLIST_FILES=	%%JAVAJARDIR%%/clojure-contrib-1.2.0.jar
 
diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile
index 70d05f27e6cb..2038bd9744b3 100644
--- a/lang/clojure/Makefile
+++ b/lang/clojure/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	clojure
-# Date created:			Oct 21. 2007
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	clojure
 PORTVERSION=	1.4.0
@@ -17,7 +12,7 @@ COMMENT=	A dynamic programming language for the JVM
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 SUB_FILES=	clojure-bin
 OPTIONS=	JLINE "Enable jline support for the REPL" on
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index db91977d07ca..353b3a0febdb 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	erlang
-# Date created:		11 Dec 1998
-# Whom:			ruslan@shevchenko.kiev.ua
-#
+# Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
-#
 
 PORTNAME=	erlang
 PORTVERSION=	14.b.04
@@ -81,7 +77,7 @@ CONFIGURE_ARGS+=--disable-ssl
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 # Make sure ${JAVA_HOME}/bin is in the path
 CONFIGURE_ENV+=	PATH=${PATH}:${JAVA_HOME}/bin
 MAKE_ENV+=	PATH=${PATH}:${JAVA_HOME}/bin
diff --git a/lang/jakarta-commons-jelly/Makefile b/lang/jakarta-commons-jelly/Makefile
index 58e704812868..ccc1124108ee 100644
--- a/lang/jakarta-commons-jelly/Makefile
+++ b/lang/jakarta-commons-jelly/Makefile
@@ -1,7 +1,4 @@
-# Ports collection makefile for:	Jakarta Commons Jelly
-# Date created:				29 July 2005
-# Whom:					Herve Quiroz <hq@FreeBSD.org>
-#
+# Created by: Herve Quiroz <hq@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	commons-jelly
@@ -18,7 +15,7 @@ COMMENT=	XML based scripting engine
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index df3ab5661eae..fd98473bef96 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	JRuby
-# Date created:			20 September 2001
-# Whom:				Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#
 
 PORTNAME=	jruby
 PORTVERSION=	1.6.6
@@ -18,7 +14,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 JRUBY_HOME?=	${PREFIX}/share/${PORTNAME}
diff --git a/lang/jython/Makefile b/lang/jython/Makefile
index ee36db3600d1..209fa9e34283 100644
--- a/lang/jython/Makefile
+++ b/lang/jython/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	jython
-# Date created:				3 April 2001
-# Whom:					Hye-Shik Chang <perky@python.or.kr>
-#
+# Created by: Hye-Shik Chang <perky@python.or.kr>
 # $FreeBSD$
-#
 
 PORTNAME=	jython
 PORTVERSION=	2.5.2
@@ -20,7 +16,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
 
diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile
index 8f09119014a1..a30951c1c556 100644
--- a/lang/linux-j/Makefile
+++ b/lang/linux-j/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   linux-j
-# Date created:        29 September 2001
-# Whom:                js@jeannot.org
-#
+# Created by: js@jeannot.org
 # $FreeBSD$
-#
 
 PORTNAME=	j
 PORTVERSION=	504b
@@ -21,7 +17,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 USE_LINUX=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index 1600c2d1ad89..cfde1455f8ca 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -117,7 +117,7 @@ BROKEN=		CLI backend broken, unsupported upstream
 
 .if defined(WITH_JVM)
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 ONLY_FOR_ARCHS=	i386 powerpc
 ONLY_FOR_ARCHS_REASON=	only translates on 32bit systems
 BROKEN=		JVM backend broken, partially supported upstream
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile
index 125c28ddb9f5..bedd96d35e77 100644
--- a/lang/rhino/Makefile
+++ b/lang/rhino/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rhino
-# Date created:		2008-01-26
-# Whom:			Nicola Vitale	<nivit@FreeBSD.org>
-#
+# Created by: Nicola Vitale	<nivit@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	rhino
 DISTVERSION=	1_7R4
@@ -27,7 +23,7 @@ ALL_TARGET=	jar
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 MAKE_ARGS=	-Dxmlbeans.url=file://${DISTDIR}/${DIST_SUBDIR}/xmlbeans-2.5.0.zip \
 		-Dswing-ex-url=file://${DISTDIR}/${DIST_SUBDIR}/src.zip
diff --git a/lang/scala/Makefile b/lang/scala/Makefile
index 1332c1395dba..8037eb8e70bb 100644
--- a/lang/scala/Makefile
+++ b/lang/scala/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Scala
-# Date created:			21 April 2009
-# Whom:				Mitsuru YOSHIDA <mitsuru@riken.jp>
-#
+# Created by: Mitsuru YOSHIDA <mitsuru@riken.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	scala
 PORTVERSION=	2.9.1
@@ -20,7 +16,7 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 MAN1=		fsc.1 sbaz.1 scala.1 scalac.1 scaladoc.1 scalap.1
 
diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile
index 5f7e1f867650..33b2f8f4db67 100644
--- a/lang/sisc/Makefile
+++ b/lang/sisc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	SISC
-# Date created:				18 March 2003
-# Whom:					Kimura Fuyuki <fuyuki@hadaly.org>
-#
+# Created by: Kimura Fuyuki <fuyuki@hadaly.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sisc
 PORTVERSION=	1.16.6
@@ -15,7 +11,7 @@ MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An extensible Java-based Scheme interpreter
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 PORTDOCS=	COPYING README
diff --git a/lang/starlogo/Makefile b/lang/starlogo/Makefile
index 8950c82582cb..f8a7cebb056b 100644
--- a/lang/starlogo/Makefile
+++ b/lang/starlogo/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    StarLogo
-# Date created:		14th November 1999
-# Whom:			Jose Marques
-#
+# Created by: Jose Marques
 # $FreeBSD$
-#
 
 PORTNAME=	starlogo
 PORTVERSION=	2.0.2
@@ -16,7 +12,7 @@ MAINTAINER=	java@FreeBSD.org
 COMMENT=	Specialized version of the Logo programming language written in Java
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/lang/x10/Makefile b/lang/x10/Makefile
index 67f2cbaeeb7d..0d9e6b6d4950 100644
--- a/lang/x10/Makefile
+++ b/lang/x10/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	x10
-# Date created:		2011-10-12
-# Whom:			Jason Bacon <jwbacon@tds.net>
-#
+# Created by: Jason Bacon <jwbacon@tds.net>
 # $FreeBSD$
-#
 
 PORTNAME=	x10
 PORTVERSION=	2.2.1
@@ -28,7 +24,7 @@ COMMENT=	Object-oriented parallel programming language
 
 USE_BZIP2=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 USE_LDCONFIG=	${PREFIX}/stdlib/lib