git: 9402cd04e3d8 - main - cleanup: Remove expired java/bootstrap-openjdk6 port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Greg Lewis <glewis_at_FreeBSD.org>
Date: Sun, 25 Sep 2022 23:18:43 UTC
The branch main has been updated by glewis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9402cd04e3d8eb284eeaecf55116e89ef5837332

commit 9402cd04e3d8eb284eeaecf55116e89ef5837332
Author:     Greg Lewis <glewis@FreeBSD.org>
AuthorDate: 2022-09-25 23:17:56 +0000
Commit:     Greg Lewis <glewis@FreeBSD.org>
CommitDate: 2022-09-25 23:17:56 +0000

    cleanup: Remove expired java/bootstrap-openjdk6 port
---
 MOVED                                   |  1 +
 java/Makefile                           |  1 -
 java/bootstrap-openjdk6/Makefile        | 48 ------------------
 java/bootstrap-openjdk6/Makefile.update | 90 ---------------------------------
 java/bootstrap-openjdk6/distinfo.amd64  |  3 --
 java/bootstrap-openjdk6/distinfo.i386   |  3 --
 java/bootstrap-openjdk6/pkg-descr       |  5 --
 java/bootstrap-openjdk6/pkg-message     | 21 --------
 java/bootstrap-openjdk6/pkg-plist       | 53 -------------------
 9 files changed, 1 insertion(+), 224 deletions(-)

diff --git a/MOVED b/MOVED
index 41e25605ad2f..697b4083d0ce 100644
--- a/MOVED
+++ b/MOVED
@@ -17560,3 +17560,4 @@ audio/kid3-kf5|audio/kid3@kf5|2022-09-13|Merged into flavorized version
 audio/kid3-qt5|audio/kid3@qt5|2022-09-13|Merged into flavorized version
 audio/phaserotate-lv2|audio/x42-plugins-lv2|2022-09-13|phaserotate-lv2 LV2 plugin is included in the x42-plugins-lv2 plugin collection
 graphics/darktable40|graphics/darktable|2022-09-22|Obsolete. Use graphics/darktable, which is the same version
+java/bootstrap-openjdk6|java/bootstrap-openjdk8|2022-09-25|Was only used to bootstrap the now deleted java/openjdk7 port
diff --git a/java/Makefile b/java/Makefile
index 9e00f56e5a20..4a656e1aa0e3 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -18,7 +18,6 @@
     SUBDIR += bluej
     SUBDIR += bootstrap-openjdk11
     SUBDIR += bootstrap-openjdk17
-    SUBDIR += bootstrap-openjdk6
     SUBDIR += bootstrap-openjdk8
     SUBDIR += bouncycastle
     SUBDIR += bouncycastle15
diff --git a/java/bootstrap-openjdk6/Makefile b/java/bootstrap-openjdk6/Makefile
deleted file mode 100644
index 1d8ea4eebd9f..000000000000
--- a/java/bootstrap-openjdk6/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-PORTNAME=	openjdk6
-PORTVERSION=	${DISTVERSION_${ARCH}}
-CATEGORIES=	java devel
-MASTER_SITES=	LOCAL/jkim
-PKGNAMEPREFIX=	bootstrap-
-DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
-
-MAINTAINER=	jkim@FreeBSD.org
-COMMENT=	Java Development Kit 6
-WWW=		https://openjdk.java.net/
-
-LICENSE=	GPLv2
-
-ONLY_FOR_ARCHS=	amd64 i386
-
-RUN_DEPENDS=	java-zoneinfo>0:java/java-zoneinfo \
-		${LOCALBASE}/lib/libfreetype.so.6:print/freetype2
-
-DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
-DISTVERSION_amd64=	r450701
-DISTVERSION_i386=	r450701
-
-JDK_ROOT=	bootstrap-${PORTNAME}
-
-NO_BUILD=	yes
-PLIST_SUB=	ARCH=${ARCH} JDK_ROOT=${JDK_ROOT}
-USES=		tar:xz
-WRKSRC=		${WRKDIR}/${JDK_ROOT}
-
-INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-PLIST_SUB+=	CLIENTVM=""
-.else
-PLIST_SUB+=	CLIENTVM="@comment "
-.endif
-
-do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
-	@cd ${WRKSRC} && ${COPYTREE_BIN} "bin jre/bin" ${INSTALLDIR}
-
-update:
-	@${MAKE} -f ${.CURDIR}/Makefile.update \
-	    JDK_PORT=${PORTNAME} JDK_ROOT=${JDK_ROOT}
-
-.include <bsd.port.post.mk>
diff --git a/java/bootstrap-openjdk6/Makefile.update b/java/bootstrap-openjdk6/Makefile.update
deleted file mode 100644
index 2e5ef428519c..000000000000
--- a/java/bootstrap-openjdk6/Makefile.update
+++ /dev/null
@@ -1,90 +0,0 @@
-JDK_PORT?=	openjdk6
-JDK_ROOT?=	bootstrap-${JDK_PORT}
-TARGET_OS?=	10
-
-.if !defined(PORTSDIR)
-.if exists(${.CURDIR}/../${JDK_PORT}/Makefile)
-PORTSDIR=	${.CURDIR}/../..
-.else
-PORTSDIR=	/usr/ports
-.endif
-.endif
-
-LOCALBASE?=	/usr/local
-
-.include "${PORTSDIR}/Mk/bsd.commands.mk"
-
-JDK_PORTDIR!=	${REALPATH} ${PORTSDIR}/java/${JDK_PORT}
-JDK_IMAGEDIR?=	${JDK_PORTDIR}/work/stage/usr/local/${JDK_PORT}
-
-GET_REVISION=	${LOCALBASE}/bin/svnversion ${JDK_PORTDIR}
-TAR?=		/usr/bin/tar
-
-.if !defined(ARCH)
-ARCH!=		${UNAME} -p
-.endif
-BUILD_OS!=	${UNAME} -r | ${SED} -e 's/\..*//'
-PORTREVISION!=	${GET_REVISION} 2>/dev/null || ${TRUE}
-
-DISTDIR?=	${.CURDIR}
-DISTFILE=	${JDK_PORT}-${ARCH}-r${PORTREVISION}.tar.xz
-DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
-MAKEFILE=	${.CURDIR}/Makefile
-PLIST?=		${.CURDIR}/pkg-plist
-PLIST_SUB=	ARCH="${ARCH}" JDK_ROOT="."
-
-BUILD_ARGS=	BATCH=yes PORT_DBDIR=/var/empty
-BUILD_ENV=	__MAKE_CONF=/dev/null PATH="${PATH}"
-BUILD_ENV+=	java_openjdk6_UNSET_FORCE=ICEDTEA
-JDK_BUILD_ARGS=	${BUILD_ARGS}
-
-.if ${ARCH} == "i386"
-PLIST_SUB+=	CLIENTVM=""
-.else
-PLIST_SUB+=	CLIENTVM="@comment "
-.endif
-
-all:
-	@${ECHO} ""
-	@${ECHO} "=============================================================="
-	@${ECHO} ""
-.if ${BUILD_OS} > ${TARGET_OS}
-	@${ECHO} "We need FreeBSD ${TARGET_OS} but you seem to have ${BUILD_OS}."
-	@${ECHO} ""
-	@${ECHO} "=============================================================="
-	@${ECHO} ""
-	@${FALSE}
-.endif
-	@${ECHO} "Building ${DISTFILE}...."
-	@${ECHO} ""
-	@${ECHO} "Started at "`date -u`"."
-	@${ECHO} ""
-	@${ECHO} "=============================================================="
-	@${ECHO} ""
-.if !defined(NO_BUILD)
-	@${SETENV} -i ${BUILD_ENV} \
-	    ${MAKE} -C "${JDK_PORTDIR}" ${JDK_BUILD_ARGS} stage
-	@${FIND} "${JDK_IMAGEDIR}" -type f \
-	    -exec ${STRIP_CMD} -s {} \; 2> /dev/null
-.endif
-	@cd "${JDK_IMAGEDIR}" && \
-	${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | \
-	${GREP} -v ^@ | ${TAR} -c -f - -T - -s '|^\./|${JDK_ROOT}/|' | \
-	${XZ_CMD} -9 -c > "${DISTDIR}/${DISTFILE}"
-	@${SED} -i.bak \
-	    's/^DISTVERSION_${ARCH}=.*/DISTVERSION_${ARCH}=	r${PORTREVISION}/' \
-	    "${MAKEFILE}"
-	@${MAKE} -f "${MAKEFILE}" makesum DISTDIR="${DISTDIR}" \
-	    DISTINFO_FILE="${DISTINFO_FILE}"
-	@${ECHO} ""
-	@${ECHO} "=============================================================="
-	@${ECHO} ""
-	@${ECHO} "${DISTFILE} was built successfully!"
-	@${ECHO} ""
-	@${ECHO} "Finished at "`date -u`"."
-	@${ECHO} ""
-	@${ECHO} "You may clean up the build directory if everything looks okay,"
-	@${ECHO} "e.g., 'rm -fr ${JDK_PORTDIR}/work'."
-	@${ECHO} ""
-	@${ECHO} "=============================================================="
-	@${ECHO} ""
diff --git a/java/bootstrap-openjdk6/distinfo.amd64 b/java/bootstrap-openjdk6/distinfo.amd64
deleted file mode 100644
index 3d6e707ff496..000000000000
--- a/java/bootstrap-openjdk6/distinfo.amd64
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506476350
-SHA256 (openjdk6-amd64-r450701.tar.xz) = efeae4b3d09d92d06182fe79b9a0348fddf4229909db33cbb0aef6d25a2fabf0
-SIZE (openjdk6-amd64-r450701.tar.xz) = 22084332
diff --git a/java/bootstrap-openjdk6/distinfo.i386 b/java/bootstrap-openjdk6/distinfo.i386
deleted file mode 100644
index 4627bf8cb8cc..000000000000
--- a/java/bootstrap-openjdk6/distinfo.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506476351
-SHA256 (openjdk6-i386-r450701.tar.xz) = ec38b1473e1a7c4118080043cc6458771f3ac8a9b56dc344e10badd6e4abeece
-SIZE (openjdk6-i386-r450701.tar.xz) = 22155724
diff --git a/java/bootstrap-openjdk6/pkg-descr b/java/bootstrap-openjdk6/pkg-descr
deleted file mode 100644
index 18faa44dafc1..000000000000
--- a/java/bootstrap-openjdk6/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-OpenJDK is an open-source implementation of the Java Platform, Standard Edition.
-
-Much of the OpenJDK code is licensed under the GPL version 2 with the
-Classpath exception. The Java Hotspot virtual machine source code is
-licensed under the GPL version 2 only.
diff --git a/java/bootstrap-openjdk6/pkg-message b/java/bootstrap-openjdk6/pkg-message
deleted file mode 100644
index 23d70d8d4e60..000000000000
--- a/java/bootstrap-openjdk6/pkg-message
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-WARNING: This port only exists for bootstrapping java/openjdk[67].
-You are advised to remove this port as soon as a stable JDK is built.
-
-This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
-procfs(5) mounted on /proc.
-
-If you have not done it yet, please do the following:
-
-	mount -t fdescfs fdesc /dev/fd
-	mount -t procfs proc /proc
-
-To make it permanent, you need the following lines in /etc/fstab:
-
-	fdesc	/dev/fd		fdescfs		rw	0	0
-	proc	/proc		procfs		rw	0	0
-EOM
-}
-]
diff --git a/java/bootstrap-openjdk6/pkg-plist b/java/bootstrap-openjdk6/pkg-plist
deleted file mode 100644
index 4680987f70f9..000000000000
--- a/java/bootstrap-openjdk6/pkg-plist
+++ /dev/null
@@ -1,53 +0,0 @@
-%%JDK_ROOT%%/ASSEMBLY_EXCEPTION
-%%JDK_ROOT%%/LICENSE
-%%JDK_ROOT%%/THIRD_PARTY_README
-%%JDK_ROOT%%/bin/idlj
-%%JDK_ROOT%%/bin/jar
-%%JDK_ROOT%%/bin/java
-%%JDK_ROOT%%/bin/javac
-%%JDK_ROOT%%/bin/javah
-%%JDK_ROOT%%/bin/javap
-%%JDK_ROOT%%/bin/native2ascii
-%%JDK_ROOT%%/bin/rmic
-%%JDK_ROOT%%/include/jni.h
-%%JDK_ROOT%%/include/freebsd/jni_md.h
-%%JDK_ROOT%%/jre/ASSEMBLY_EXCEPTION
-%%JDK_ROOT%%/jre/LICENSE
-%%JDK_ROOT%%/jre/THIRD_PARTY_README
-%%JDK_ROOT%%/jre/bin/java
-%%JDK_ROOT%%/jre/lib/charsets.jar
-%%JDK_ROOT%%/jre/lib/currency.data
-%%JDK_ROOT%%/jre/lib/fontconfig.bfc
-%%JDK_ROOT%%/jre/lib/jce.jar
-%%JDK_ROOT%%/jre/lib/jsse.jar
-%%JDK_ROOT%%/jre/lib/logging.properties
-%%JDK_ROOT%%/jre/lib/meta-index
-%%JDK_ROOT%%/jre/lib/net.properties
-%%JDK_ROOT%%/jre/lib/resources.jar
-%%JDK_ROOT%%/jre/lib/rt.jar
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/jvm.cfg
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libawt.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libfontmanager.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjava.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjpeg.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/liblcms.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libnet.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libnio.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libverify.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libzip.so
-%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/libjvm.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/headless/libmawt.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/server/libjvm.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/xawt/libmawt.so
-%%JDK_ROOT%%/jre/lib/cmm/GRAY.pf
-%%JDK_ROOT%%/jre/lib/cmm/PYCC.pf
-%%JDK_ROOT%%/jre/lib/cmm/sRGB.pf
-%%JDK_ROOT%%/jre/lib/ext/dnsns.jar
-%%JDK_ROOT%%/jre/lib/ext/localedata.jar
-%%JDK_ROOT%%/jre/lib/ext/meta-index
-%%JDK_ROOT%%/jre/lib/ext/sunjce_provider.jar
-%%JDK_ROOT%%/jre/lib/ext/sunpkcs11.jar
-%%JDK_ROOT%%/jre/lib/security/java.security
-%%JDK_ROOT%%/jre/lib/zi
-%%JDK_ROOT%%/lib/ct.sym
-%%JDK_ROOT%%/lib/tools.jar