svn commit: r308615 - in head: audio/tuxguitar databases/libgda4 deskutils/docear devel/py-jcc editors/openoffice-3 editors/openoffice-3-devel editors/openoffice.org-vcltesttool java/icedtea6-stubs...

Baptiste Daroussin bapt at FreeBSD.org
Mon Dec 10 16:49:37 UTC 2012 

Author: bapt
Date: Mon Dec 10 16:49:34 2012
New Revision: 308615
URL: http://svnweb.freebsd.org/changeset/ports/308615

Log:
  Decommissioning java 1.5 (EOLed since October 2009) + removing outdated jdk16
  vendors:
  Remove any reference to bsdjava and freebsd Java Vendors, as the both are
  outdated, have security issues and expired.
  
  Mark icedtea6-stubs as broken as it doesn't build with any of the left supported
  vendors.
  Switch tuxguitar to be able to use openjdk16 [1]
  
  Approved by:	gahr [1]

Modified:
  head/audio/tuxguitar/Makefile
  head/databases/libgda4/Makefile
  head/deskutils/docear/Makefile
  head/devel/py-jcc/Makefile
  head/editors/openoffice-3-devel/Makefile
  head/editors/openoffice-3/Makefile
  head/editors/openoffice.org-vcltesttool/Makefile
  head/java/icedtea6-stubs/Makefile
  head/java/java3d/Makefile
  head/java/poseidon/Makefile
  head/math/scilab/Makefile
  head/math/vtk5/Makefile

Modified: head/audio/tuxguitar/Makefile
==============================================================================
--- head/audio/tuxguitar/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/audio/tuxguitar/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -33,7 +33,6 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PKGCONFIG=	build
 JAVA_VERSION=	1.6+
-JAVA_VENDOR=	freebsd bsdjava sun
 NOCCACHE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/TuxGuitar

Modified: head/databases/libgda4/Makefile
==============================================================================
--- head/databases/libgda4/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/databases/libgda4/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libgda2
-# Date created:				02 June 2002
-# Whom:					Joe Marcus Clarke <marcus at FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/databases/libgda4/Makefile,v 1.14 2010/11/14 20:57:58 kwm Exp $
-#
 
 PORTNAME=	libgda4
 PORTVERSION?=	4.2.5
@@ -111,7 +107,7 @@ CONFIGURE_ARGS+=	--without-mdb
 
 .if ${LIBGDA4_SLAVE}=="jdbc"
 USE_JAVA=		yes
-JAVA_VENDOR=		bsdjava openjdk
+JAVA_VENDOR=		openjdk
 .else
 CONFIGURE_ARGS+=	--without-java
 .endif

Modified: head/deskutils/docear/Makefile
==============================================================================
--- head/deskutils/docear/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/deskutils/docear/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -1,9 +1,5 @@
-# ports collection Makefile for: docear
-# Whom:			Matthias Andree <mandree at FreeBSD.org>
-# Date created:		2012-02-17
-#
+# Created by: Matthias Andree <mandree at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	docear
 PORTVERSION=	1.0.0.b07
@@ -22,7 +18,7 @@ RUN_DEPENDS=	update-mime-database:${PORT
 
 USE_JAVA=	yes
 USE_GNOME=	desktopfileutils
-JAVA_VENDOR=	freebsd openjdk bsdjava
+JAVA_VENDOR=	openjdk
 JAVA_VERSION=	1.6
 NO_BUILD=	yes
 JDATADIR=	${JAVASHAREDIR}/${PORTNAME}

Modified: head/devel/py-jcc/Makefile
==============================================================================
--- head/devel/py-jcc/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/devel/py-jcc/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -17,7 +17,7 @@ USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	JCC
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-JAVA_VENDOR=	freebsd
+JAVA_VENDOR=	openjdk
 USE_GCC=	4.2+
 
 JCC_INCLUDES=	'${JAVA_HOME}/include;${JAVA_HOME}/include/freebsd'

Modified: head/editors/openoffice-3-devel/Makefile
==============================================================================
--- head/editors/openoffice-3-devel/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/editors/openoffice-3-devel/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -40,8 +40,8 @@ GNOMEVFS_DESC=	Enable GNOME Virtual File
 
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava openjdk
-JAVA_VERSION=	1.5 1.6 1.7 
+JAVA_VENDOR=	openjdk
+JAVA_VERSION=	1.6+
 
 .if !defined(WITHOUT_GCONF)
 USE_GNOME+=	gconf2

Modified: head/editors/openoffice-3/Makefile
==============================================================================
--- head/editors/openoffice-3/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/editors/openoffice-3/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -39,8 +39,8 @@ GNOMEVFS_DESC=	Enable GNOME Virtual File
 
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava openjdk
-JAVA_VERSION=	1.5 1.6 1.7 
+JAVA_VENDOR=	openjdk
+JAVA_VERSION=	1.6+
 
 .if !defined(WITHOUT_GCONF)
 USE_GNOME+=	gconf2

Modified: head/editors/openoffice.org-vcltesttool/Makefile
==============================================================================
--- head/editors/openoffice.org-vcltesttool/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/editors/openoffice.org-vcltesttool/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: OpenOffice.org VCLTestTool
-# Date created:		2009/7/11
-# Whom:                 NAKATA Maho <maho at FreeBSD.org>
-#
+# Created by: NAKATA Maho <maho at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	openoffice.org-vcltesttool
 PORTVERSION=	2.4.${SNAPDATE}
@@ -34,8 +30,8 @@ MAKE_JOBS_SAFE=	yes
 
 USE_JAVA=	yes
 JAVA_BUILD=	jdk
-JAVA_VENDOR=	freebsd bsdjava openjdk
-JAVA_VERSION=	1.5 1.6
+JAVA_VENDOR=	openjdk
+JAVA_VERSION=	1.6
 
 ONLY_FOR_ARCHS=	i386 amd64
 

Modified: head/java/icedtea6-stubs/Makefile
==============================================================================
--- head/java/icedtea6-stubs/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/java/icedtea6-stubs/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    icedtea6-stubs
-# Date created:         2009/2/21
-# Whom:                 Brian Gardner <brian at experts-exchange.com>
-#
+# Created by: Brian Gardner <brian at experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	icedtea6-stubs
 PORTVERSION=	1.6b
@@ -14,13 +10,15 @@ DISTNAME=	jdk-7-icedtea-plugs-${PORTVERS
 MAINTAINER=	openjdk at getsnappy.com
 COMMENT=	IcedTea6 binary plugs for openjdk
 
-BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS+=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 
+BROKEN=		Does not build with any of the supported Java vendors
+
 WRKSRC=		${WRKDIR}/jdk-7-icedtea-plugs
 
 USE_JAVA=	yes
-JAVA_VENDOR=	freebsd bsdjava
+JAVA_VENDOR=	openjdk
 JAVA_VERSION=	1.6
 USE_ANT=	yes
 

Modified: head/java/java3d/Makefile
==============================================================================
--- head/java/java3d/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/java/java3d/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -18,7 +18,7 @@ USE_JAVA=	yes
 USE_GL=		gl
 USE_XORG=	xt
 JAVA_VERSION=	1.6+
-JAVA_VENDOR=	freebsd bsdjava openjdk
+JAVA_VENDOR=	openjdk
 USE_ANT=	yes
 
 PLIST_SUB+=	JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH}

Modified: head/java/poseidon/Makefile
==============================================================================
--- head/java/poseidon/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/java/poseidon/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -14,7 +14,7 @@ COMMENT=	A popular UML CASE tool
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-JAVA_VENDOR=	${_JAVA_VENDOR_LIST:Nsun}	# the port is broken with Sun JDKs
+JAVA_VENDOR=	openjdk	# the port is broken with Sun JDKs
 NO_BUILD=	yes
 RESTRICTED=	Redistribution is not permitted
 

Modified: head/math/scilab/Makefile
==============================================================================
--- head/math/scilab/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/math/scilab/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -130,7 +130,7 @@ JAVA_VERSION=	1.6+
 # bsdjava (ie java/jdk16) doesn't have some "extra" classes that aren't in
 # the standard java. namespace, but are required by scilab, such as
 # javax.xml.bind.annotation.XmlSeeAlso
-JAVA_VENDOR=	freebsd openjdk
+JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 USE_XORG=	x11

Modified: head/math/vtk5/Makefile
==============================================================================
--- head/math/vtk5/Makefile	Mon Dec 10 16:44:09 2012	(r308614)
+++ head/math/vtk5/Makefile	Mon Dec 10 16:49:34 2012	(r308615)
@@ -173,7 +173,7 @@ IGNORE=		java wrapping requires shared l
 CXXFLAGS+=	-fPIC
 .endif
 USE_JAVA=	yes
-JAVA_VENDOR=	freebsd openjdk
+JAVA_VENDOR=	openjdk
 JAVA_VERSION=	1.6+
 CMAKE_ARGS+=	-DVTK_WRAP_JAVA:BOOL=ON \
     		-DJAVA_AWT_INCLUDE_PATH:FILEPATH=${JAVA_HOME}/include \

More information about the svn-ports-head mailing list