From 5a52a082347653e46a7330eb60d51230c01183ef Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 26 Nov 2019 21:46:12 +0000
Subject: Clean up after java/openjdk6 and java/openjdk6-jre removal

java/openjdk6 support was removed from Mk/bsd.java.mk (r512662) and
java/openjdk6 and java/openjdk6-jre were removed from the ports tree
(r512663).  Now this patch completely removes remaining stuff from the
ports tree.

PR:			241953 (exp-run)
Reviewed by:		glewis
Approved by:		portmgr (antoine)
Differential Revision:	https://reviews.freebsd.org/D22342
---
 misc/freeguide/Makefile               | 1 -
 misc/jbidwatcher/Makefile             | 2 +-
 misc/jbidwatcher/files/jbidwatcher.in | 2 +-
 misc/pauker/Makefile                  | 1 -
 misc/pipe/Makefile                    | 3 +--
 misc/pipe/files/pipe.sh.in            | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'misc')

diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index 45a5ab24932d..1d101534f6df 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/doc/COPYING
 RUN_DEPENDS=	tv_cat:textproc/p5-xmltv
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 USE_ANT=	yes
 NO_ARCH=	yes
 
diff --git a/misc/jbidwatcher/Makefile b/misc/jbidwatcher/Makefile
index 1d75744c1f6e..feb6a6a76c2b 100644
--- a/misc/jbidwatcher/Makefile
+++ b/misc/jbidwatcher/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jbidwatcher
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	misc java
 MASTER_SITES=	http://www.jbidwatcher.com/download/
 
@@ -13,7 +14,6 @@ USES=	tar:bzip2
 USE_JAVA=	yes
 USE_ANT=	yes
 ALL_TARGET=	jar
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	jbidwatcher
 SUB_LIST+=	PORTVERSION=${PORTVERSION}
diff --git a/misc/jbidwatcher/files/jbidwatcher.in b/misc/jbidwatcher/files/jbidwatcher.in
index 62e03be5efc6..ef4d47abd89f 100644
--- a/misc/jbidwatcher/files/jbidwatcher.in
+++ b/misc/jbidwatcher/files/jbidwatcher.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@"
+"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@"
diff --git a/misc/pauker/Makefile b/misc/pauker/Makefile
index 02ebd6a23a77..bcb4328b9553 100644
--- a/misc/pauker/Makefile
+++ b/misc/pauker/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	alex@stangl.us
 COMMENT=	Java-based flashcard learning using the Leitner system
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 do-install:
diff --git a/misc/pipe/Makefile b/misc/pipe/Makefile
index 3b1b281e63f1..317a4e8d5098 100644
--- a/misc/pipe/Makefile
+++ b/misc/pipe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pipe
 PORTVERSION=	2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc java
 MASTER_SITES=	SF/${PORTNAME}2/Pipe%202/PIPE2%20V${PORTVERSION}
 DISTNAME=	pipe25_rc5
@@ -15,7 +15,6 @@ USES=		zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 
 SUB_FILES=	pipe.sh
 
diff --git a/misc/pipe/files/pipe.sh.in b/misc/pipe/files/pipe.sh.in
index abd5404c0569..e21fd111e13f 100644
--- a/misc/pipe/files/pipe.sh.in
+++ b/misc/pipe/files/pipe.sh.in
@@ -3,4 +3,4 @@
 # $FreeBSD$
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%" RunGui
+"%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%" RunGui
-- 
cgit v1.2.3