git: 454352333f91 - main - java/linux-oracle-jdk18: Fix port install

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Fri, 16 May 2025 16:01:20 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=454352333f91cbae9155a1ac1bb447e87efc35cb

commit 454352333f91cbae9155a1ac1bb447e87efc35cb
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-05-16 15:57:45 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-05-16 15:57:45 +0000

    java/linux-oracle-jdk18: Fix port install
    
    ===>  Checking if linux-oracle-jdk18 is already installed
    ===>   Registering installation for linux-oracle-jdk18-8.291
    pkg-static: Invalid value for config option SHLIB_PROVIDE_PATHS_NATIVE, 'jre/lib' is not an absolute path.
    pkg-static: Invalid value for config option SHLIB_PROVIDE_PATHS_NATIVE, 'lib' is not an absolute path.
    pkg-static: Cannot parse configuration file!
    *** Error code 1
    
    This is variable LIB_DIRS collision with Mk/bsd.port.mk.
    
    PR:             286831
    Approved by:    java (maintainer, implicit - fix port)
    MFH:            2025Q2
---
 java/linux-oracle-jdk18/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/linux-oracle-jdk18/Makefile b/java/linux-oracle-jdk18/Makefile
index a16add1f3044..6696d0c7b62f 100644
--- a/java/linux-oracle-jdk18/Makefile
+++ b/java/linux-oracle-jdk18/Makefile
@@ -47,7 +47,7 @@ DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.htm
 
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_INTERNAL_VERSION}
 BIN_DIRS=	bin jre/bin
-LIB_DIRS=	${BIN_DIRS:S|bin$|lib|}
+_LIB_DIRS=	${BIN_DIRS:S|bin$|lib|}
 SHEBANG_FILES=	${BIN_DIRS:S|$|/jcontrol|}
 bash_CMD=	${SH}
 
@@ -103,6 +103,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${APP_HOME}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
 	@cd ${STAGEDIR}${APP_HOME} && \
-	    ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|}
+	    ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${_LIB_DIRS:S|$|/jexec|}
 
 .include <bsd.port.post.mk>