60 files changed, 112 insertions, 318 deletions

diff --git a/astro/gpsprune/Makefile b/astro/gpsprune/Makefile
index cb49bfffb3f0..5f950c2c0e66 100644
--- a/astro/gpsprune/Makefile
+++ b/astro/gpsprune/Makefile
@@ -17,7 +17,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 SUB_FILES=	gpsprune.sh
 SUB_LIST=	JARNAME=${DISTNAME}
diff --git a/audio/musiccontrol/Makefile b/audio/musiccontrol/Makefile
index 33827de66f5b..d2fc33e32f30 100644
--- a/audio/musiccontrol/Makefile
+++ b/audio/musiccontrol/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   musiccontrol
-# Date created:        9 june 2003
-# Whom:                Christian Laursen <xi@borderworlds.dk>
-#
+# Created by: Christian Laursen <xi@borderworlds.dk>
 # $FreeBSD$
-#
 
 PORTNAME=	musiccontrol
 PORTVERSION=	0.3
@@ -22,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 \
 		${LOCALBASE}/bin/simplemod:${PORTSDIR}/audio/simplemod
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 PLIST_FILES=	share/java/classes/MusicControl-${PORTVERSION}.jar bin/musiccontrol
 
diff --git a/benchmarks/scimark2/Makefile b/benchmarks/scimark2/Makefile
index 07242dace6ae..9fd78f581255 100644
--- a/benchmarks/scimark2/Makefile
+++ b/benchmarks/scimark2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	scimark2-java
-# Date created:		Sat Apr 05 2003
-# Whom:			thierry@pompo.net
-#
+# Created by: thierry@pompo.net
 # $FreeBSD$
-#
 
 PORTNAME=	scimark2
 PORTVERSION=	2.0
@@ -20,7 +16,7 @@ WRKSRC=		${WRKDIR}
 USE_ZIP=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NEED_JAVAC=	yes
 JAVAC_OPTS?=	-O
 
diff --git a/biology/artemis/Makefile b/biology/artemis/Makefile
index 37995f38f814..880282b4ae6d 100644
--- a/biology/artemis/Makefile
+++ b/biology/artemis/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A DNA sequence viewer and annotation tool
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
diff --git a/biology/jalview/Makefile b/biology/jalview/Makefile
index 12ac7ec80ff0..cccf2fa026ee 100644
--- a/biology/jalview/Makefile
+++ b/biology/jalview/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A viewer and editor for multiple sequence alignments
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	makejars
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 1a4d357da64c..f9ac9c833c11 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -1,8 +1,4 @@
-# New ports collection makefile for:	electric-ng
-# Date created:		2006-07-14
-# Whom:			Stanislav Sedov <ssedov@mbsd.msk.ru>
-#
-# $MBSDlabs$
+# Created by: Stanislav Sedov <ssedov@mbsd.msk.ru>
 # $FreeBSD$
 #
 
@@ -21,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A sophisticated VLSI design system
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
 		bin/electric-ng
diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile
index 5111d71767e2..2e800182c5aa 100644
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fidocadj
-# Date created:		2012-05-02
-# Whom:			Nicola Vitale <nivit@FreeBSD.org>
-#
+# Created by: Nicola Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fidocadj
 PORTVERSION=	0.24
@@ -25,7 +21,7 @@ NO_BUILD=	yes
 
 SUB_FILES=	${PORTNAME}.sh
 
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_JAVA=	yes
 
 OPTIONS_DEFINE=	DOCS
@@ -43,10 +39,8 @@ do-install:
 	${INSTALL_DATA} ${DISTDIR}/${FDCJ_MANUAL} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${PORTNAME}_manual_en.pdf:docs
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/impact/Makefile b/cad/impact/Makefile
index 457f76279105..40f3025fd4f4 100644
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	impact
-# Date created:			Mar 4, 2005
-# Whom:				ijliao
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	impact
 PORTVERSION=	0.7.5.3
@@ -18,7 +13,7 @@ COMMENT=	Dynamic Finite Element Program Suite
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/Impact
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 5301fcbde62d..0608a8174bb9 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  opencascade
-# Date created:               29 November 2005
-# Whom:                       Thierry Thomas <thierry@pompo.net>
-#
+# Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
-#
 
 PORTNAME=		opencascade
 PORTVERSION=		6.3
@@ -33,7 +29,7 @@ USE_TCL_RUN=	84+
 USE_TCL_THREADS=yes
 USE_JAVA=	yes
 USE_XORG=	xmu
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 #.if defined(MAINTAINER_MODE)
 # linux-sun-jdk was required for 6.1, but 6.2 is OK with diablo-jdk.
 #JAVA_OS=	linux
diff --git a/comms/java-commapi-freebsd/Makefile b/comms/java-commapi-freebsd/Makefile
index 1d35578d3bf8..aad82ff3facd 100644
--- a/comms/java-commapi-freebsd/Makefile
+++ b/comms/java-commapi-freebsd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	java freebsd-commapi
-# Date created:         2001/07/01
-# Whom:			Ari Suutari <ari.suutari@syncrontech.com>
-#
+# Created by: Ari Suutari <ari.suutari@syncrontech.com>
 # $FreeBSD$
-#
 
 PORTNAME=	java-commapi-freebsd
 PORTVERSION=	0.9
@@ -18,7 +14,7 @@ BUILD_DEPENDS=	${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi
 RUN_DEPENDS=	${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_OS=	native
 JAVA_BUILD=	yes
 
diff --git a/comms/java-commapi/Makefile b/comms/java-commapi/Makefile
index 843e5c90f079..6f0df8bf8407 100644
--- a/comms/java-commapi/Makefile
+++ b/comms/java-commapi/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for:    Java Commapi
-# Date created:		2001/07/01
-# Whom:			Ari Suutari <ari.suutari@syncrontech.com>
+# Created by: Ari Suutari <ari.suutari@syncrontech.com>
 #
 # $FreeBSD$
 #
@@ -17,7 +15,7 @@ COMMENT=	Sun's Java Communications API
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 NO_CDROM=	Sun has a funky license for this software
 RESTRICTED=	no commercial use
diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile
index 6af484eaa755..1d184fb69527 100644
--- a/comms/rxtx/Makefile
+++ b/comms/rxtx/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rxtx
-# Whom:					Jean-Baptiste Quenot <jb.quenot@caraldi.com>
-# Date Created:				2004-04-10 00:15:35
-#
+# Created by: Jean-Baptiste Quenot <jb.quenot@caraldi.com>
 # $FreeBSD$
-#
 
 PORTNAME=	rxtx
 PORTVERSION=	2.2p2
@@ -19,7 +15,7 @@ COMMENT=	Native interface to serial ports in Java
 USE_ZIP=	yes
 USE_GMAKE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_OS=	native
 GNU_CONFIGURE=	yes
 
diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile
index 3f7e18bad219..10cde2e5a4a7 100644
--- a/devel/antlr/Makefile
+++ b/devel/antlr/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	antlr
-# Date created:		5 July 2002
-# Whom:			Geoffrey Mainland <mainland@apeiron.net>
-#
+# Created by: Geoffrey Mainland <mainland@apeiron.net>
 # $FreeBSD$
-#
 
 PORTNAME=	antlr
 PORTVERSION=	2.7.7
@@ -19,7 +15,7 @@ CONFLICTS=	pccts-[0-9]*
 
 USE_GMAKE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 OPTIONS_DEFINE=	PYTHON DOCS
 
diff --git a/devel/antlrworks/Makefile b/devel/antlrworks/Makefile
index 44b776a7ac0e..4df3d6c35e5d 100644
--- a/devel/antlrworks/Makefile
+++ b/devel/antlrworks/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:    antlrworks
-# Date created:                         December, 5th 2006
-# Whom:                                 Matthias Sund <m.sund@arcor.de>
-#
+# Created by: Matthias Sund <m.sund@arcor.de>
 # $FreeBSD$
 
 PORTNAME=	antlrworks
@@ -17,7 +14,7 @@ COMMENT=	The ANTLR GUI Development Environment
 NO_BUILD=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 DESKTOP_ENTRIES="ANTLRWorks" \
 	"ANTLR GUI Development Environment" \
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 14355810b9d6..bd63ee3dbcff 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -22,7 +22,7 @@ MANPAGE_DISTFILE=	${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz
 MANPAGE_VERSION=	20030908
 USE_BZIP2=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 NO_BUILD=	YES
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index c4afd3e1a7f6..d9978674b3d5 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 SUB_FILES=	argouml.sh
 SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
diff --git a/devel/avalon-framework/Makefile b/devel/avalon-framework/Makefile
index fffa8db36700..ceeeb6656273 100644
--- a/devel/avalon-framework/Makefile
+++ b/devel/avalon-framework/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	avalon-framework
-# Date created:		2004-03-31
-# Whom:			Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
-#
+# Created by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
 # $FreeBSD$
-#
 
 PORTNAME=	avalon-framework
 PORTVERSION=	4.2.0
@@ -16,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache Avalon core framework for component programming
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index 750c6c40d8c1..5dc784d1ad49 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -1,6 +1,4 @@
-# Ports collection makefile for:	charva
-# Date created:			12 December 2006
-# Whom:				Alex Dupre <ale@FreeBSD.org>
+# Created by: Alex Dupre <ale@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -20,7 +18,7 @@ RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	clean makeDLL dist
 
diff --git a/devel/doctorj/Makefile b/devel/doctorj/Makefile
index c4a80e26b745..fb9b6b5e786a 100644
--- a/devel/doctorj/Makefile
+++ b/devel/doctorj/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  doctorj
-# Date created:                   Wed Apr 16, 2003
-# Whom:                           Michael L. Hostbaek (mich@freebsdcluster.org)
-#
+# Created by: Michael L. Hostbaek <mich@freebsdcluster.org>
 # $FreeBSD$
-#
 
 PORTNAME=	doctorj
 PORTVERSION=	5.1.2
@@ -16,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for analyzing Java code and documentation
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 ALL_TARGET=	jarfile
diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile
index 71793ad309c8..1f3f407c5c22 100644
--- a/devel/flex-sdk/Makefile
+++ b/devel/flex-sdk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Adobe Flex SDK
-# Date created:		18 Oct 2007
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	flex-sdk
 PORTVERSION=	4.6.0.23201
@@ -19,7 +15,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 CONFLICTS=	ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-3.*
 USE_ZIP=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}
 SUB_FILES=	${SCRIPTS:C/\$/.sh/g}
 NO_BUILD=	YES
diff --git a/devel/flex-sdk2/Makefile b/devel/flex-sdk2/Makefile
index 19b4c0a76ae2..1303cc629188 100644
--- a/devel/flex-sdk2/Makefile
+++ b/devel/flex-sdk2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Adobe Flex SDK
-# Date created:		18 Oct 2007
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	flex-sdk
 PORTVERSION=	2.0.1.194515
@@ -23,7 +19,7 @@ CONFLICTS=	ja-flex-sdk-2.* flex-sdk-3.* flex-sdk-4.*
 NO_LATEST_LINK=	YES
 USE_ZIP=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}
 DOWNLOAD_URL=	http://labs.adobe.com/technologies/flex/sdk/flex2sdk.html
 SUB_FILES=	asdoc.sh compc.sh fdb.sh mxmlc.sh
diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile
index 639682cb9670..1d72d66eb581 100644
--- a/devel/flex-sdk35/Makefile
+++ b/devel/flex-sdk35/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Adobe Flex SDK
-# Date created:		18 Oct 2007
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	flex-sdk
 PORTVERSION=	3.5.0.12683
@@ -21,7 +17,7 @@ CONFLICTS=	ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-4.*
 NO_LATEST_LINK=	YES
 USE_ZIP=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}
 SUB_FILES=	${SCRIPTS:C/\$/.sh/g}
 NO_BUILD=	YES
diff --git a/devel/flex_compiler_shell/Makefile b/devel/flex_compiler_shell/Makefile
index 42dd4e25cfc3..dd5af3fc1221 100644
--- a/devel/flex_compiler_shell/Makefile
+++ b/devel/flex_compiler_shell/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Flex Compiler Shell
-# Date created:		1 Dec 2007
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	flex_compiler_shell
 PORTVERSION=	0.20070123
@@ -23,7 +19,7 @@ CONFLICTS=	flex-sdk-3.*
 
 USE_ZIP=	YES
 USE_JAVA=	YES
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
 SUB_FILES=	fcsh
diff --git a/devel/flexjson/Makefile b/devel/flexjson/Makefile
index c8abf27ac32d..f4b69309cb11 100644
--- a/devel/flexjson/Makefile
+++ b/devel/flexjson/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	FlexJson
-# Date created:			20 Apr 2006
-# Whom:				Nemo Liu <nemoliu@FreeBSD.org>
-#
+# Created by: Nemo Liu <nemoliu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	flexjson
 PORTVERSION=	1.6
@@ -16,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight Java library to write JSON
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 USE_ZIP=	yes
 
diff --git a/devel/fujaba/Makefile b/devel/fujaba/Makefile
index 6658dc6c7e20..fd5836d75c6e 100644
--- a/devel/fujaba/Makefile
+++ b/devel/fujaba/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	Fujaba
-# Date created:			July 14, 2005
-# Whom:				Gerrit Beine (<tux@pinguru.net>)
-#
+# Created by: Gerrit Beine <tux@pinguru.net>
 # $FreeBSD$
-#
 
 PORTNAME=	fujaba
 PORTVERSION=	4.3.2
@@ -19,7 +15,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/Fujaba\ Tool\ Suite\ ${PORTVERSION}
 
diff --git a/devel/geoip-java/Makefile b/devel/geoip-java/Makefile
index ca925d98d601..cc21d95004bc 100644
--- a/devel/geoip-java/Makefile
+++ b/devel/geoip-java/Makefile
@@ -17,7 +17,7 @@ PKGNAMESUFFIX:=	-java
 USE_ZIP=	YES
 
 USE_JAVA=	YES
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	YES
 ALL_TARGET=	jar
 
diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile
index 467d90c7a016..2a3cdd4e4322 100644
--- a/devel/glib-java/Makefile
+++ b/devel/glib-java/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   glib-java
-# Date created:        26 Oct 2005
-# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/glib-java/Makefile,v 1.4 2006/09/14 12:37:40 ahze Exp $
-#
 
 PORTNAME=	glib-java
 PORTVERSION=	0.4.2
@@ -21,7 +17,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_OS=	native
 USE_GNOME=	gnomehack glib20
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 1b2a137c2929..d322ecc58fd1 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ireport
-# Date created:		21 May 2005
-# Whom:			Thierry Thomas <thierry@pompo.net>
-#
+# Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ireport
 PORTVERSION=	3.7.6
@@ -17,7 +13,7 @@ COMMENT=	A visual report builder/designer for JasperReports
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_DOS2UNIX=	*.txt
 NO_BUILD=	yes
 
diff --git a/devel/itext/Makefile b/devel/itext/Makefile
index 5a6e3db81fe1..668de01da9e9 100644
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	itext
-# Date created:			Apr 2, 2004
-# Whom:				ijliao
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	itext
 PORTVERSION=	4.2.0
@@ -26,7 +21,7 @@ RUN_DEPENDS=	${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle \
 
 USE_BZIP2=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	jar jar.rtf jar.rups
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
diff --git a/devel/jakarta-commons-configuration/Makefile b/devel/jakarta-commons-configuration/Makefile
index d9c761d25c66..f63495069ac5 100644
--- a/devel/jakarta-commons-configuration/Makefile
+++ b/devel/jakarta-commons-configuration/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Jakarta Commons Configuration
-# Date created:				November 22nd, 2005
-# Whom:					Herve Quiroz <hq@FreeBSD.org>
-#
+# Created by: Herve Quiroz <hq@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	commons-configuration
 PORTVERSION=	1.3
@@ -21,7 +17,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-common
 		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 .if !defined(NOPORTDOCS)
diff --git a/devel/jakarta-commons-daemon/Makefile b/devel/jakarta-commons-daemon/Makefile
index d1f9703e3d8b..5d533064e3b0 100644
--- a/devel/jakarta-commons-daemon/Makefile
+++ b/devel/jakarta-commons-daemon/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   commons-daemon
-# Date created:        9 July 2007
-# Whom:                Ronald Klop <ronald@echteman.nl>
-#
+# Created by: Ronald Klop <ronald@echteman.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	commons-daemon
 PORTVERSION=	1.0.10
@@ -22,7 +18,7 @@ COMMENT=	Wrapper code to start/stop a Java application as a daemon
 LICENSE=	AL2
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_OS=	native
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-java=${JAVA_HOME}
diff --git a/devel/jakarta-commons-jxpath/Makefile b/devel/jakarta-commons-jxpath/Makefile
index a00d8381de80..059d968fcfeb 100644
--- a/devel/jakarta-commons-jxpath/Makefile
+++ b/devel/jakarta-commons-jxpath/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	Jakarta Commons JXPATH
-# Date created:                         February 08, 2007
-# Whom:                                 Nemo Liu <nemoliu@FreeBSD.org>
-#
+# Created by: Nemo Liu <nemoliu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	commons-jxpath
 PORTVERSION=	1.3
@@ -17,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for manipulating Java Beans using the XPath syntax
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/devel/jakarta-commons-modeler/Makefile b/devel/jakarta-commons-modeler/Makefile
index 25779bd3764a..5123270a402f 100644
--- a/devel/jakarta-commons-modeler/Makefile
+++ b/devel/jakarta-commons-modeler/Makefile
@@ -1,9 +1,5 @@
-# ports collection makefile for:    Jakarta Commons Modeler
-# Date created:                         February 08, 2007
-# Whom:                                 Nemo Liu <nemoliu@FreeBSD.org>
-#
+# Created by: Nemo Liu <nemoliu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	commons-modeler
 PORTVERSION=	2.0.1
@@ -17,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mechanisms to create Model MBeans compatible with JMX specification
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/devel/java-util-concurrent/Makefile b/devel/java-util-concurrent/Makefile
index b5fc2c636eb8..df76c2bd9c12 100644
--- a/devel/java-util-concurrent/Makefile
+++ b/devel/java-util-concurrent/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	java-util-concurrent
-# Date created:				2004-11-19
-# Whom:					Herve Quiroz <hq@FreeBSD.org>
-#
+# Created by: Herve Quiroz <hq@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	util-concurrent
 PORTVERSION=	1.3.4
@@ -17,7 +13,7 @@ MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Utility classes for concurrent Java programming
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 USE_ANT=	yes
 ALL_TARGET=	dist
diff --git a/devel/javolution/Makefile b/devel/javolution/Makefile
index d83d7526b1f7..b4ee022d48b4 100644
--- a/devel/javolution/Makefile
+++ b/devel/javolution/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	javolution
-# Date created:			22 September 2007
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	javolution
 PORTVERSION=	5.5.1
@@ -18,7 +14,7 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JDKMVERSION=	${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/}
 USE_ANT=	yes
 ALL_TARGET=	${JDKMVERSION}
diff --git a/devel/jcmdline/Makefile b/devel/jcmdline/Makefile
index f0b9b48284e1..9b66b02bc44f 100644
--- a/devel/jcmdline/Makefile
+++ b/devel/jcmdline/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	jcmdline
-# Date created:		22 May 2005
-# Whom:			Thierry Thomas <thierry@pompo.net>
-#
+# Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
-#
 
 PORTNAME=	jcmdline
 PORTVERSION=	2.0.0
@@ -14,7 +10,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Java command line processor
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 LICENSE=	MPL
diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index 98be815a6620..f660abe30d1d 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Open-source continuous integration server
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 FETCH_ARGS=	-Fpr
 NO_BUILD=	yes
diff --git a/devel/jep/Makefile b/devel/jep/Makefile
index 39207269d548..cda4aec71e6e 100644
--- a/devel/jep/Makefile
+++ b/devel/jep/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	jep
-# Date created:		2005-03-04
-# Whom:			Choe, Cheng-Dae
-#
+# Created by: Choe, Cheng-Dae
 # $FreeBSD$
-#
 
 PORTNAME=	jep
 PORTVERSION=	2.4
@@ -18,7 +14,7 @@ CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME}
 CONFIGURE_ARGS=	--prefix=${PREFIX} --exec-prefix=${PREFIX}
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_PYTHON=	2.2+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/jiic/Makefile b/devel/jiic/Makefile
index fe3f83a514b3..269377f8fe02 100644
--- a/devel/jiic/Makefile
+++ b/devel/jiic/Makefile
@@ -21,7 +21,7 @@ LICENSE=	LGPL21
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 ALL_TARGET=	jar
diff --git a/devel/jsap/Makefile b/devel/jsap/Makefile
index 231d7ef65a32..f1cf73010ae4 100644
--- a/devel/jsap/Makefile
+++ b/devel/jsap/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Java package to parse command-line arguments
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 .if !defined(NOPORTDOCS)
diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile
index 828bf22804bf..b21818325955 100644
--- a/devel/libgconf-java/Makefile
+++ b/devel/libgconf-java/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   libgconf-java
-# Date created:        09 January 2004
-# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/libgconf-java/Makefile,v 1.9 2005/10/29 22:06:05 marcus Exp $
-#
 
 PORTNAME=	libgconf-java
 PORTVERSION=	2.12.6
@@ -24,7 +20,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_OS=	native
 USE_GNOME=	gnomehack gconf2
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile
index f4a38f281bf9..d721badfa937 100644
--- a/devel/libglade-java/Makefile
+++ b/devel/libglade-java/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   libglade-java
-# Date created:        28 February 2004
-# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/libglade-java/Makefile,v 1.8 2005/10/29 22:06:06 marcus Exp $
-#
 
 PORTNAME=	libglade-java
 PORTVERSION=	2.12.8
@@ -26,7 +22,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_OS=	native
 USE_GNOME=	gnomehack libglade2
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
diff --git a/devel/looks/Makefile b/devel/looks/Makefile
index ef6c27bb3fa5..41e8c3429e1d 100644
--- a/devel/looks/Makefile
+++ b/devel/looks/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	looks
-# Date created:		22 May 2005
-# Whom:			Thierry Thomas <thierry@pompo.net>
-#
+# Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
-#
 
 PORTNAME=	looks
 PORTVERSION=	2.0.4
@@ -20,7 +16,7 @@ EXPIRATION_DATE=	2012-10-20
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/maven2/Makefile b/devel/maven2/Makefile
index 8202fcb9b66f..c8890061db65 100644
--- a/devel/maven2/Makefile
+++ b/devel/maven2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	maven2
-# Date created:				18 August 2005
-# Whom:					Herve Quiroz <hq@FreeBSD.org>
-#
+# Created by: Herve Quiroz <hq@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	maven2
 DISTVERSION=	2.2.1
@@ -19,7 +15,7 @@ COMMENT=	Java project management tool, 2.0 branch
 RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 SUB_FILES=	m2.sh
diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile
index 0e841afcc735..1b6c9af17e2f 100644
--- a/devel/maven3/Makefile
+++ b/devel/maven3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	maven3
-# Date created:		2011-08-24
-# Whom:			Herve Quiroz <hq@FreeBSD.org>
-#
+# Created by: Herve Quiroz <hq@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	maven3
 DISTVERSION=	3.0.4
@@ -20,7 +16,7 @@ LICENSE=	AL2
 RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
diff --git a/devel/netscape-java40/Makefile b/devel/netscape-java40/Makefile
index 059da7c8b051..4c6ca271b3d8 100644
--- a/devel/netscape-java40/Makefile
+++ b/devel/netscape-java40/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	netscape-java40
-# Date created:		25 January 2006
-# Whom:			Thierry Thomas <thierry@pompo.net>
-#
+# Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
-#
 
 PORTNAME=	netscape-java40
 PORTVERSION=	1999.11.15
@@ -17,7 +13,7 @@ MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Classes to allow a Java applet access to JavaScript objects
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 JARFILES=	java40.jar LICENSE.java40.txt
diff --git a/devel/obfuscatejs/Makefile b/devel/obfuscatejs/Makefile
index 0577e9754b66..ddba788adb26 100644
--- a/devel/obfuscatejs/Makefile
+++ b/devel/obfuscatejs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	obfuscatejs
-# Date created:		2006-04-21
-# Whom:			Nicola Vitale	<nivit@email.it>
-#
+# Created by: Nicola Vitale	<nivit@email.it>
 # $FreeBSD$
-#
 
 PORTNAME=	obfuscatejs
 PORTVERSION=	0.3.6
@@ -24,7 +20,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	OBFUSCATEJSJAR=${DATADIR}/${OBFUSCATEJSJAR}
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index cbd695a02240..b31e8b5e1cd4 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	Inline::Java
-# Date created:			Aug 15, 2002
-# Whom:				ijliao
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Inline-Java
 PORTVERSION=	0.53
@@ -20,7 +15,7 @@ BUILD_DEPENDS=	p5-Inline>=0.44:${PORTSDIR}/devel/p5-Inline \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_JAVA=       yes
-JAVA_VERSION=   1.5+
+JAVA_VERSION=   1.6+
 JAVA_OS=        native
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile
index f4322c50adf1..e85cad3a6a0c 100644
--- a/devel/p5-Java/Makefile
+++ b/devel/p5-Java/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Java
-# Date Created:				27 January 2006
-# Whom:					Simun Mikecin <numisemis@yahoo.com>
-#
+# Created by: Simun Mikecin <numisemis@yahoo.com>
 # $FreeBSD$
-#
 
 PORTNAME=	Java
 PORTVERSION=	4.7
@@ -18,7 +14,7 @@ COMMENT=	Perl extension for accessing a JVM remotely or locally
 USE_RC_SUBR=	javaserver
 PERL_CONFIGURE=	YES
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 MAN3=		Java.3 JavaArray.3
 
diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index c15db6bd2034..aaf1b5779e0a 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pmd
-# Date created:				2006-06-07
-# Whom:	      				Alex Varju <freebsd-ports@varju.ca>
-#
+# Created by: Alex Varju <freebsd-ports@varju.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	pmd
 PORTVERSION=	3.7
@@ -19,7 +15,7 @@ BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 MAKE_ARGS=	-cp ${JAVALIBDIR}/junit.jar
diff --git a/devel/py-jcc/Makefile b/devel/py-jcc/Makefile
index db37f918266a..1e545c283dea 100644
--- a/devel/py-jcc/Makefile
+++ b/devel/py-jcc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	jcc
-# Date created:		16 May 2008
-# Whom:			clsung@FreeBSD.org
-#
+# Created by: clsung@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	jcc
 PORTVERSION=	2.13
@@ -20,7 +16,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	JCC
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 JAVA_VENDOR=	freebsd
 USE_GCC=	4.2+
 
diff --git a/devel/sabre/Makefile b/devel/sabre/Makefile
index d2e4eea71e88..40560a683429 100644
--- a/devel/sabre/Makefile
+++ b/devel/sabre/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	sabre
-# Date created:			28 Jun 2010
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sabre
 PORTVERSION=	20100501
@@ -20,7 +16,7 @@ LICENSE=	LGPL21
 WRKSRC=		${WRKDIR}/Simple\ API\ for\ Binary\ REpresentations\ \(SABRE\)
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	dist
 
diff --git a/devel/simian/Makefile b/devel/simian/Makefile
index 1ad59e995c85..358667dabc06 100644
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	simian
-# Date created:				July 8, 2005
-# Whom:					andreas@syndrom23.de
-#
+# Created by: andreas@syndrom23.de
 # $FreeBSD$
-#
 
 PORTNAME=	simian
 PORTVERSION=	2.3.33
@@ -28,7 +24,7 @@ NO_WRKSUBDIR=	yes
 
 .if !defined(WITHOUT_JAVA)
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 PLIST_SUB+=	JAVA=""
 SUB_LIST+=	JAVA=""
 .else
diff --git a/devel/smc/Makefile b/devel/smc/Makefile
index e371275092c5..92fa441b9dc8 100644
--- a/devel/smc/Makefile
+++ b/devel/smc/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	smc
-# Date created:			Jun 3, 2004
-# Whom:				ijliao
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	smc
 PORTVERSION=	4.3.0
@@ -18,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The State Machine Compiler
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 do-install:
diff --git a/devel/statcvs/Makefile b/devel/statcvs/Makefile
index 9638eb4ed77e..0a2720461585 100644
--- a/devel/statcvs/Makefile
+++ b/devel/statcvs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	statcvs
-# Date created:				25 Mar 2009
-# Whom:					glarkin
-#
+# Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	statcvs
 PORTVERSION=	0.7.0
@@ -22,7 +18,7 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 USE_ZIP=	yes
 USE_JAVA=	yes
 USE_ANT=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 .if !defined(NOPORTDOCS)
 ALL_TARGET=	jar javadoc
diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile
index 135cc136cfaa..c33bcae22d64 100644
--- a/devel/statsvn/Makefile
+++ b/devel/statsvn/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	statsvn
-# Date created:				25 Mar 2009
-# Whom:					glarkin
-#
+# Created by: glarkin
 # $FreeBSD$
-#
 
 PORTNAME=	statsvn
 PORTVERSION=	0.7.0
@@ -24,7 +20,7 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 USE_ZIP=	yes
 USE_JAVA=	yes
 USE_ANT=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 .if !defined(NOPORTDOCS)
 ALL_TARGET=	dist javadoc
diff --git a/devel/svnkit/Makefile b/devel/svnkit/Makefile
index 5f55e0176e75..b98f5adb4a29 100644
--- a/devel/svnkit/Makefile
+++ b/devel/svnkit/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	JavaSVN
-# Date created:				6 Aug 2005
-# Whom:					tux@pinguru.net
-#
+# Created by: tux@pinguru.net
 # $FreeBSD$
-#
 
 PORTNAME=	svnkit
 PORTVERSION=	1.3.0
@@ -19,7 +15,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 NO_BUILD=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.5847
 
diff --git a/devel/swank-clojure/Makefile b/devel/swank-clojure/Makefile
index f3fc497efdc2..a03a430109c9 100644
--- a/devel/swank-clojure/Makefile
+++ b/devel/swank-clojure/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	swank-clojure
-# Date created:		Jun 17 2010
-# Whom:			olgeni
-#
+# Created by: olgeni
 # $FreeBSD$
-#
 
 PORTNAME=	swank-clojure
 PORTVERSION=	1.2.1
@@ -17,7 +13,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Swank/SLIME support for Clojure
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 WRKSRC=		${WRKDIR}/technomancy-swank-clojure-0af258a
 
diff --git a/devel/tinylaf/Makefile b/devel/tinylaf/Makefile
index 7a97dcd90eb0..28f76aef1a92 100644
--- a/devel/tinylaf/Makefile
+++ b/devel/tinylaf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tinylaf
-# Date created:		22 May 2005
-# Whom:			Thierry Thomas <thierry@pompo.net>
-#
+# Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
-#
 
 PORTNAME=	tinylaf
 PORTVERSION=	1.4.0
@@ -16,7 +12,7 @@ COMMENT=	A pluggable Look and Feel for Java
 
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 JARFILE=	${PORTNAME}.jar tinycp.jar
diff --git a/devel/umlgraph/Makefile b/devel/umlgraph/Makefile
index a18313b499eb..fb28681fdfde 100644
--- a/devel/umlgraph/Makefile
+++ b/devel/umlgraph/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	umlgraph
-# Date created:			15 February, 2010
-# Whom:				Kevin Lo <kevlo@FreeBSD.org>
-#
+# Created by: Kevin Lo <kevlo@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	umlgraph
 PORTVERSION=	5.6
@@ -20,7 +16,7 @@ LICENSE=	BSD
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.6+
 
 BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
 		pic2plot:${PORTSDIR}/graphics/plotutils