Commit b6454920 authored by Rene Ladan's avatar Rene Ladan
Browse files

java/openjdk24: remove expired port and unregister it.

parent c799e018
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -5342,3 +5342,4 @@ dns/dnsmasq-devel|dns/dnsmasq|2026-06-05|Discontinued -devel port, use dns/dnsma
www/surge|ftp/surge|2026-06-05|Switch to a more updated ftp/surge port, which was accidentally added despite www/surge being available (but outdated)
sysutils/mixer||2026-06-13|Discontinued, use /etc/rc.d/mixer
audio/freebsd-13-mixer||2026-06-13|Discontinued
java/openjdk24||2026-06-14|Has expired: No longer supported by upstream
+4 −7
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
# JAVA_VERSION		List of space-separated suitable java versions for the
#			port. An optional "+" allows you to specify a range of
#			versions. (allowed values: 8[+] 11[+] 17[+]
#			21[+] 24[+] 25[+] 26[+])
#			21[+] 25[+] 26[+])
#			JAVA_DEFAULT (Mk/bsd.default-versions.mk) is used if this
#			variable is omitted or if JAVA_DEFAULT is part of the range.
#			Otherwise the latest LTS from the range is preferred over
@@ -205,7 +205,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}"
.  endif

# The complete list of Java versions, os and vendors supported.
__JAVA_VERSION_LIST=	8 11 17 21 24 25 26
__JAVA_VERSION_LIST=	8 11 17 21 25 26
_JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST=			native linux
_JAVA_VENDOR_LIST=		openjdk oracle
@@ -220,8 +220,6 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/
											VERSION=17	OS=native	VENDOR=openjdk
_JAVA_PORT_NATIVE_OPENJDK_JDK_21_INFO=		PORT=java/openjdk21			HOME=${LOCALBASE}/openjdk21 \
											VERSION=21	OS=native	VENDOR=openjdk
_JAVA_PORT_NATIVE_OPENJDK_JDK_24_INFO=		PORT=java/openjdk24			HOME=${LOCALBASE}/openjdk24 \
											VERSION=24	OS=native	VENDOR=openjdk
_JAVA_PORT_NATIVE_OPENJDK_JDK_25_INFO=		PORT=java/openjdk25			HOME=${LOCALBASE}/openjdk25 \
											VERSION=25	OS=native	VENDOR=openjdk
_JAVA_PORT_NATIVE_OPENJDK_JDK_26_INFO=		PORT=java/openjdk26			HOME=${LOCALBASE}/openjdk26 \
@@ -245,8 +243,7 @@ __JAVA_PORTS_NATIVE_LTS= \
					JAVA_PORT_NATIVE_OPENJDK_JDK_11 \
					JAVA_PORT_NATIVE_OPENJDK_JDK_8
__JAVA_PORTS_NATIVE_NON_LTS=	\
					JAVA_PORT_NATIVE_OPENJDK_JDK_26 \
					JAVA_PORT_NATIVE_OPENJDK_JDK_24
					JAVA_PORT_NATIVE_OPENJDK_JDK_26
__JAVA_PORTS_ALL=	\
					${__JAVA_PORTS_NATIVE_LTS} \
					${__JAVA_PORTS_NATIVE_NON_LTS} \
@@ -313,7 +310,7 @@ check-makevars::
.		undef _JAVA_PORTS_INSTALLED
.		undef _JAVA_PORTS_POSSIBLE
.  if defined(JAVA_VERSION)
_JAVA_VERSION=	${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 21+/:S/^21+/21 24+/:S/^24+/24 25+/:S/^25+/25 26+/:S/^26+/26/}
_JAVA_VERSION=	${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 21+/:S/^21+/21 25+/:S/^25+/25 26+/:S/^26+/26/}
.  else
_JAVA_VERSION=	${__JAVA_VERSION_LIST}
.  endif
+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ GUILE_DEFAULT?= 2.2
# Format:	     version[-flavor]
# Examples:	     6-nox11, 7
IMAGEMAGICK_DEFAULT?=	7
# Possible values: 8, 11, 17, 21, 24, 25
# Possible values: 8, 11, 17, 21, 25
.  if ${ARCH:Marmv*} || ${ARCH} == powerpc
JAVA_DEFAULT?=		11
.  elif ${ARCH:Mi386}
+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@
    SUBDIR += openjdk17-jre
    SUBDIR += openjdk21
    SUBDIR += openjdk21-jre
    SUBDIR += openjdk24
    SUBDIR += openjdk25
    SUBDIR += openjdk26
    SUBDIR += openjdk8

java/openjdk24/Makefile

deleted100644 → 0
+0 −183
Original line number Diff line number Diff line
PORTNAME=	openjdk
DISTVERSIONPREFIX=	jdk-
DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
PORTREVISION=	3
CATEGORIES=	java devel
PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
MASTER_SITES=	LOCAL/openjdk:boot
DISTFILES+=	${BOOTSTRAPJDKFILE}:boot

MAINTAINER=	java@FreeBSD.org
COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
WWW=		https://openjdk.java.net/projects/jdk/24/

LICENSE=	GPLv2

DEPRECATED=	No longer supported by upstream
EXPIRATION_DATE=	2026-06-12

# i386 is deprecated, and will be removed in the next JDK
ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le

BUILD_DEPENDS=	${LOCALBASE}/include/cups/cups.h:print/cups \
		bash:shells/bash \
		gsed:textproc/gsed \
		zip:archivers/zip

LIB_DEPENDS=	libasound.so:audio/alsa-lib \
		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libgif.so:graphics/giflib \
		libharfbuzz.so:print/harfbuzz \
		liblcms2.so:graphics/lcms2 \
		libpng.so:graphics/png
RUN_DEPENDS=	javavm:java/javavmwrapper \
		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype

USES=	autoreconf:build compiler:features cpe gmake iconv jpeg pkgconfig xorg
USE_XORG=	x11 xext xi xrandr xrender xt xtst

CPE_VENDOR=	oracle

USE_GITHUB=	yes
GH_ACCOUNT=	freebsd
GH_PROJECT=	openjdk
GH_TAGNAME=	jdk-24.0.2-ga-freebsd-2

NO_CCACHE=	yes

# Suppress passing -j to do-build target via Mk/bsd.port.mk
# In the JDK build the number of parallel jobs is passed in via configure --with-num-cores=N
_MAKE_JOBS=	#
MAKE_ENV=	CLASSPATH="" \
		JAVA_HOME="" \
		LD_LIBRARY_PATH="" \
		LOG=cmdlines \
		MAKEFLAGS="CONF_CHECK=ignore"

JDK_ARCH=	${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
BOOTSTRAPJDKFILE=	openjdk24-24.0.2+12.2_2.${JDK_ARCH}.tar.xz
JDK_OSARCH=	bsd-${JDK_ARCH}
JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
.if defined(BUILD_JRE)
JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jre
.else
JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
.endif
INSTALLDIR=	${PREFIX}/${PKGBASE}
BOOTSTRAPJDKDIR=	${WRKDIR}/boot-jdk

NOPRECIOUSMAKEVARS=	yes

JDK_MAJOR_VERSION=	24
JDK_MINOR_VERSION=	0
JDK_PATCH_VERSION=	2
JDK_BUILD_NUMBER=	12
BSD_JDK_VERSION=	2

JDK_BUG_URL=	https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20

GNU_CONFIGURE=	yes
CONFIGURE_TARGET=${JDK_ARCH}-portbld-${OPSYS:tl}${OSREL}
CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed
CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
		--disable-ccache \
		--disable-javac-server \
		--with-alsa=${LOCALBASE} \
		--with-cups=${LOCALBASE} \
		--with-fontconfig=${LOCALBASE} \
		--with-freetype=system \
		--with-libjpeg=system \
		--with-giflib=system \
		--with-giflib-include=${LOCALBASE}/include \
		--with-giflib-lib=${LOCALBASE}/lib \
		--with-harfbuzz=system \
		--with-libpng=system \
		--with-num-cores=${MAKE_JOBS_NUMBER} \
		--with-zlib=system \
		--with-lcms=system \
		--x-includes=${LOCALBASE}/include \
		--x-libraries=${LOCALBASE}/lib \
		--with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \
		--with-native-debug-symbols=none \
		--with-debug-level=release \
		--with-vendor-name="OpenJDK BSD Porting Team" \
		--with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \
		--with-vendor-bug-url="${JDK_BUG_URL}" \
		--with-vendor-vm-bug-url="${JDK_BUG_URL}"

JAVAVMS_COMMENT=	OpenJDK${JDK_MAJOR_VERSION}

.if defined(BUILD_JRE)
ALL_TARGET=		legacy-images
.else
ALL_TARGET=		images
.endif
JDK_BUILD_TYPE=		release

.include <bsd.port.pre.mk>

JDK_BUILD_JVM=	server

MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
CONFIGURE_ARGS+=	--disable-warnings-as-errors

.if ${COMPILER_TYPE} == gcc
USE_GCC=	yes
CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
			--with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
			--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
.else
MAKE_ENV+=	USE_CLANG=true
EXTRA_CFLAGS+=		-Wno-unused-but-set-parameter
EXTRA_CFLAGS+=		-Wno-bitwise-instead-of-logical
EXTRA_CFLAGS+=		-Wno-error=deprecated-non-prototype
CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
.endif

.if ${ARCH} == aarch64
CONFIGURE_ARGS+=	--disable-dtrace
.endif

.if empty(ICONV_LIB)
ICONV_CFLAGS=	-DLIBICONV_PLUG
.else
ICONV_CFLAGS=	-I${LOCALBASE}/include
ICONV_LDFLAGS=	-L${LOCALBASE}/lib
ICONV_LIBS=	${ICONV_LIB}
.endif

post-patch:
	@${RM} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/thread_bsd_ppc.cpp
	@${MV} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/thread_bsd_ppc.hpp \
		${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/javaThread_bsd_ppc.hpp

	@${FIND} ${WRKSRC} -name '*.orig' -delete
	@${CHMOD} 755 ${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
		${WRKSRC}/configure \
		${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp
	@${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \
		-e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
		-e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \
		${WRKSRC}/make/autoconf/libraries.m4

post-build:
.if defined(OPENJDK_SYMLINK_CACERTS)
	@${RM} ${JDK_IMAGEDIR}/lib/security/cacerts
	@${LN} -sf ${OPENJDK_SYMLINK_CACERTS} ${JDK_IMAGEDIR}/lib/security/cacerts
.endif

do-install:
	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
	@cd ${STAGEDIR}${INSTALLDIR} && \
		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
	@${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper
	@${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
	@${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
		${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}

.include <bsd.port.post.mk>
Loading