aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2012-12-11 00:49:34 +0800
committerbapt <bapt@FreeBSD.org>2012-12-11 00:49:34 +0800
commit02a130be1ed1b0eb95516fe7ce819410e03be46f (patch)
treec72a939e66de58bc5635cae3895ac7b2f1893694
parent870ad7391bc69dd5f93ad590d9675116cb6fe083 (diff)
downloadfreebsd-ports-gnome-02a130be1ed1b0eb95516fe7ce819410e03be46f.tar.gz
freebsd-ports-gnome-02a130be1ed1b0eb95516fe7ce819410e03be46f.tar.zst
freebsd-ports-gnome-02a130be1ed1b0eb95516fe7ce819410e03be46f.zip
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]
-rw-r--r--audio/tuxguitar/Makefile1
-rw-r--r--databases/libgda4/Makefile8
-rw-r--r--deskutils/docear/Makefile8
-rw-r--r--devel/py-jcc/Makefile2
-rw-r--r--editors/openoffice-3-devel/Makefile4
-rw-r--r--editors/openoffice-3/Makefile4
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile10
-rw-r--r--java/icedtea6-stubs/Makefile12
-rw-r--r--java/java3d/Makefile2
-rw-r--r--java/poseidon/Makefile2
-rw-r--r--math/scilab/Makefile2
-rw-r--r--math/vtk5/Makefile2
12 files changed, 21 insertions, 36 deletions
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index a72373888fe8..888bd28f7002 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -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
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index e724b7d9ec59..e703e80efaff 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for: libgda2
-# Date created: 02 June 2002
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@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
diff --git a/deskutils/docear/Makefile b/deskutils/docear/Makefile
index 7df4cd63f91b..1ccd7a4c734b 100644
--- a/deskutils/docear/Makefile
+++ b/deskutils/docear/Makefile
@@ -1,9 +1,5 @@
-# ports collection Makefile for: docear
-# Whom: Matthias Andree <mandree@FreeBSD.org>
-# Date created: 2012-02-17
-#
+# Created by: Matthias Andree <mandree@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= docear
PORTVERSION= 1.0.0.b07
@@ -22,7 +18,7 @@ RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
USE_JAVA= yes
USE_GNOME= desktopfileutils
-JAVA_VENDOR= freebsd openjdk bsdjava
+JAVA_VENDOR= openjdk
JAVA_VERSION= 1.6
NO_BUILD= yes
JDATADIR= ${JAVASHAREDIR}/${PORTNAME}
diff --git a/devel/py-jcc/Makefile b/devel/py-jcc/Makefile
index 1e545c283dea..7cc96f4ef67e 100644
--- a/devel/py-jcc/Makefile
+++ b/devel/py-jcc/Makefile
@@ -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'
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index daf8417a71b9..e9a0316a879a 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -40,8 +40,8 @@ GNOMEVFS_DESC= Enable GNOME Virtual File System
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
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 78fc3839977c..5bd0192a1b36 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -39,8 +39,8 @@ GNOMEVFS_DESC= Enable GNOME Virtual File System
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
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 10c1a8300d3b..678c2f1839e4 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: OpenOffice.org VCLTestTool
-# Date created: 2009/7/11
-# Whom: NAKATA Maho <maho@FreeBSD.org>
-#
+# Created by: NAKATA Maho <maho@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
diff --git a/java/icedtea6-stubs/Makefile b/java/icedtea6-stubs/Makefile
index 5ffb0ea5bac2..bafcc68010bc 100644
--- a/java/icedtea6-stubs/Makefile
+++ b/java/icedtea6-stubs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: icedtea6-stubs
-# Date created: 2009/2/21
-# Whom: Brian Gardner <brian@experts-exchange.com>
-#
+# Created by: Brian Gardner <brian@experts-exchange.com>
# $FreeBSD$
-#
PORTNAME= icedtea6-stubs
PORTVERSION= 1.6b
@@ -14,13 +10,15 @@ DISTNAME= jdk-7-icedtea-plugs-${PORTVERSION}
MAINTAINER= openjdk@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
diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index 64aa8e3998ed..015c8819a71e 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -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}
diff --git a/java/poseidon/Makefile b/java/poseidon/Makefile
index 513d4151f274..63308bb821a7 100644
--- a/java/poseidon/Makefile
+++ b/java/poseidon/Makefile
@@ -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
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 6f06101e9148..5cf781c7c91c 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -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
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index deb983509a53..81d6c66a9e06 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -173,7 +173,7 @@ IGNORE= java wrapping requires shared libraries.\
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 \