git: 8a3c1b454234 - main - lang/julia: unbrake after update of math/suitesparse-cholmod

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8a3c1b4542340f4ac480a55ce225b10f10238436

commit 8a3c1b4542340f4ac480a55ce225b10f10238436
Author:     Eric Reardon <rizor.reardon@yahoo.com>
AuthorDate: 2022-12-02 06:58:10 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-12-03 20:42:26 +0000

    lang/julia: unbrake after update of math/suitesparse-cholmod
    
    Looks like julia is incompatible with the latest version of suitesparse-cholmod.
    suitesparse is an optional dependency so remove it for now and will
    add it back when a version of julia that is compatible with it is
    released.
    
    PR:             268025
    Reported by:    rizor.reardon@yahoo.com (maintainer)
---
 lang/julia/Makefile  | 50 +++++++++++++++++++++++---------------------------
 lang/julia/pkg-plist |  8 --------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/lang/julia/Makefile b/lang/julia/Makefile
index aa7faa882449..0419db24ea29 100644
--- a/lang/julia/Makefile
+++ b/lang/julia/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	julia
 DISTVERSION=	1.8.3
 DISTVERSIONSUFFIX=	-full
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/${PORTNAME}/releases/download/v${DISTVERSION}/
 
@@ -37,22 +37,11 @@ USES=		gmake compiler:c++14-lang cpe fortran python perl5 \
 
 CPE_VENDOR=	julialang
 
-BINARY_ALIAS=	python3=${PYTHON_CMD} gfortran=gfortran${_GCC_VER}
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
-CFLAGS+=	-fpic
 
 SHEBANG_GLOB=	*.sh
 
-WRKSRC=		${WRKDIR}/julia-${DISTVERSION}
-
-ALL_TARGET=	default
-INSTALL_TARGET=	install
-TEST_TARGET=	test
-
-PORTDOCS=	html
-PLIST_SUB=	VERSION="${PORTVERSION:R}"
-
 MAKE_ARGS+=	NO_GIT=1 \
 		USE_BINARYBUILDER=0 \
 		prefix=${PREFIX} \
@@ -77,26 +66,33 @@ MAKE_ARGS+=	NO_GIT=1 \
 		USE_SYSTEM_CSL=1 \
 		USE_SYSTEM_ZLIB=1 \
 		USE_SYSTEM_LIBUNWIND=1
+ALL_TARGET=	default
+INSTALL_TARGET=	install
+TEST_TARGET=	test
 
-OPTIONS_DEFINE=		DEBUG DOCS NATIVE GPL_LIBS
-OPTIONS_DEFAULT=	DOCS GPL_LIBS
+CFLAGS+=	-fpic
+
+BINARY_ALIAS=	python3=${PYTHON_CMD} gfortran=gfortran${_GCC_VER}
+
+WRKSRC=		${WRKDIR}/julia-${DISTVERSION}
+
+PLIST_SUB=	VERSION="${PORTVERSION:R}"
+PORTDOCS=	html
+
+OPTIONS_DEFINE=		DEBUG DOCS NATIVE
+OPTIONS_DEFAULT=	DOCS
 OPTIONS_SUB=		yes
 
+
+NATIVE_DESC=		Build with native CPU JIT tuning
+NATIVE_MAKE_ARGS=	JULIA_CPU_TARGET=native
+
 DEBUG_MAKE_ARGS=	FORCE_ASSERTIONS=1 \
 			ALL_TARGET=all \
 			BUNDLE_DEBUG_LIBS=1
 
 DOCS_VARS=		INSTALL_TARGET+=install-docs
 
-GPL_LIBS_DESC=		Build with GPL library suitesparse
-GPL_LIBS_LIB_DEPENDS=	libspqr.so:math/suitesparse-spqr \
-			libumfpack.so:math/suitesparse-umfpack
-GPL_LIBS_MAKE_ARGS=	USE_SYSTEM_LIBSUITESPARSE=1 \
-			USE_GPL_LIBS=1
-
-NATIVE_DESC=		Build with native CPU JIT tuning
-NATIVE_MAKE_ARGS=	JULIA_CPU_TARGET=native
-
 post-patch:
 	echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME} build\"" >> ${WRKSRC}/Make.user
 	# unset ARCH for auto-detection
@@ -122,15 +118,12 @@ pre-install:
 post-install:
 	# clean up for Pkg3.jl
 .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted *.orig
-	${FIND} ${STAGEDIR}${PREFIX}/share/julia/ -name ${file} -delete
+	${FIND} ${STAGEDIR}${PREFIX}/share/julia/ -name "${file}" -delete
 .endfor
 .for dir in Statistics SuiteSparse ArgTools Pkg Downloads LibCURL NetworkOptions Tar
 	${RM} -fr ${STAGEDIR}${PREFIX}/share/julia/stdlib/v${PORTVERSION:R}/${dir}/.github/
 .endfor
 
-post-install-DOCS-off:
-	${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc
-
 post-install-DEBUG-off:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/julia*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjulia.so*
@@ -138,4 +131,7 @@ post-install-DEBUG-off:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/julia/${bin}
 .endfor
 
+post-install-DOCS-off:
+	${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc
+
 .include <bsd.port.mk>
diff --git a/lang/julia/pkg-plist b/lang/julia/pkg-plist
index d87b5b7f9832..6596f25a9c78 100644
--- a/lang/julia/pkg-plist
+++ b/lang/julia/pkg-plist
@@ -39,16 +39,11 @@ include/julia/uv/unix.h
 include/julia/uv/version.h
 lib/julia/libLLVM-13jl.so
 lib/julia/libLLVM.so
-%%GPL_LIBS%%lib/julia/libamd.so
 lib/julia/libatomic.so.1
 lib/julia/libblastrampoline.so
 lib/julia/libblastrampoline.so.5
 lib/julia/libblastrampoline.so.5.0.2
-%%GPL_LIBS%%lib/julia/libcamd.so
 lib/julia/libccalltest.so
-%%GPL_LIBS%%lib/julia/libccolamd.so
-%%GPL_LIBS%%lib/julia/libcholmod.so
-%%GPL_LIBS%%lib/julia/libcolamd.so
 lib/julia/libcurl.so
 lib/julia/libdSFMT.so
 lib/julia/libgcc_s.so.1
@@ -78,12 +73,9 @@ lib/julia/libopenblas.so
 lib/julia/libopenlibm.so
 lib/julia/libpcre2-8.so
 lib/julia/libquadmath.so.0
-%%GPL_LIBS%%lib/julia/libspqr.so
 lib/julia/libssh2.so
 lib/julia/libssp.so.0
 lib/julia/libstdc++.so.6
-%%GPL_LIBS%%lib/julia/libsuitesparseconfig.so
-%%GPL_LIBS%%lib/julia/libumfpack.so
 lib/julia/libuv.so
 lib/julia/libuv.so.2
 lib/julia/libuv.so.2.0.0