From nobody Sun Sep 25 23:18:43 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MbMJh1n73z4dCXr; Sun, 25 Sep 2022 23:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MbMJh16k5z3sqG; Sun, 25 Sep 2022 23:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664147924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/wuoJJkgdv+aPYVlC2KSJhLbReXMDhVRDof9e90VP+U=; b=bylHMgjgVqywMDN2RPM47fisattKRKWSl1n5so/1JU5qKBjrhAXOSEvMedDewYR9eghFP6 SzfGBD6jZ95EmFT968oWpFVTMDz/SXpT33Oen+uudZupLrS2jtqRFVxgiAZR6AdPgEh/wX wkTSlUhWzmiOhhtQN1kZaIJa+sq/CDRLs6GhiqKqs6d4iWsxw5AtO9pu9UXX6vI8cMC0Ml gQSOpBJLcAemjqBlIkq7y+mUMKMXTCzvUiyINMRXPEs/gZLOA8TkY0w5dYRiq4ZddJ1e2U TTckfBsxqAZ5sH20iInsEwSMwz9jPn3ty3gguCidm7MQPqD2WLqQw5nyXhrB4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MbMJh082Xzb3Q; Sun, 25 Sep 2022 23:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28PNIhQt029819; Sun, 25 Sep 2022 23:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PNIhc7029818; Sun, 25 Sep 2022 23:18:43 GMT (envelope-from git) Date: Sun, 25 Sep 2022 23:18:43 GMT Message-Id: <202209252318.28PNIhc7029818@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 9402cd04e3d8 - main - cleanup: Remove expired java/bootstrap-openjdk6 port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9402cd04e3d8eb284eeaecf55116e89ef5837332 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664147924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/wuoJJkgdv+aPYVlC2KSJhLbReXMDhVRDof9e90VP+U=; b=FV3i3SZp3mvMtU08tf7FJJTS9R8yuikoln/GdmGAYdFJ3+QwoGDaVb3hujiNRpUpWOdpck xeJLE3MC/h6hYWEAyzl9rcu5mlX8Z/o/7Pp+rWiVMIlv5HM6fLWJY/wchccJVVPQy8JWAa R/loN5RKLao+jpr88CTpHHOblyo2pOb81uuexxLd6OKH6cped7j6jWLiOs8HZ/++o3G+5r wdvbtICMlPv0LrWtbLbVsgFR9QKaD0O8b/iOKrnbZZBSN7Es/ZDN88Aoub8d27UikLuevI q/Svg1zc6hHVITmiFTvLcoBUoh9YN6PSzbVXpGU7APUs+s2D5GuuugOPXt9CHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664147924; a=rsa-sha256; cv=none; b=sKv2lhMa6U2O5TyDDDJWSJmER7lqkUdh/5A9eD/otn1t7OFP739bXt5/gHktohKzgOgCUF Rryr9w4FngtNsFugM2BJHXkdmwCR5XsedqzSNGmAA0tH7N31PoJ+qDaiWU7wBkgCJphViq FRZsnevE3Ykr2CLD7OBf3gQUIDgpXIXiZYttJ/d8kPTBEqV0lcxA9Wp8iIgLLBII39cIgI x4QCqNZHBEiMNbOXgxojX0NeWV8YCebJHeSY1X45Kf35larNXrsKz63WK+wJjG1gJBzUDN t6gfGEn0x9DJozLu4B0rk74Hno0tBtQSqxt6nhkKHife/7iRLl+TX3Hli812CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=9402cd04e3d8eb284eeaecf55116e89ef5837332 commit 9402cd04e3d8eb284eeaecf55116e89ef5837332 Author: Greg Lewis AuthorDate: 2022-09-25 23:17:56 +0000 Commit: Greg Lewis 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 - -.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 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: <