From nobody Thu Dec 29 12:04:27 2022 X-Original-To: dev-commits-ports-main@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 4NjRrq4d8jz2l8KG; Thu, 29 Dec 2022 12:04:27 +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 4NjRrq45vNz3sjw; Thu, 29 Dec 2022 12:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672315467; 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=84stXftBH/FgOT093bjjG3hzFfsgVEyAXsAwEF3CPuw=; b=RqqlIhMf3g8wt7I9dEeFxbf29YgWK1KJyiKz/qHQ08v6nfkkapOlHl1kpvNyVJ9uRcQgoV JQi6LJ68Mh7LfiTEBUv6RJvwz88E/IMDksLlL/xEsdb1a6CCIswqVNOSoXMQMnYfAROl1N 8w0e5EYp2kysA05hScOgN6uZtvUSjdb6pPMt9aMbfisVl8m67Q6JwU+HZ6vAy6nNuU9tUB 8yg72zS++/QHLMBNU8kWcFZStDvPW5LmKqRWO0BHhSJX5FAWkU8UsqAuBKIipBvQI7lN5d x3OZK4vja4LxeujlmdDiJ0kIYJNBhpB5tgvo443C2001esSRLunoTBTEZxgoBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672315467; 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=84stXftBH/FgOT093bjjG3hzFfsgVEyAXsAwEF3CPuw=; b=aFaLHPFJ4DomZhjj1trU05Sc3skF0fH2hzG9cP9FLKsaU5tvCzOjz+/QgN1qgs5+KFpUyd Bw5+r98qPJqouEWaSRRrxYDrrzTc1LTxWBDxGTcPxznIF63+8rU8HXUb3XtZKrpagqzr5T 6RUejWbOHVS6wm6oZa49Zs0ycLc51sh+QZmvaaEEZZQxcAtBsS1opVt6c0DiEzd10E7SfI qnVR6k9z9cOAIu+y5Dnzm9fb02bjrNX1OxcfXfSyt31Pi1gTGYPGA+IPCEpfoV06GaFLd3 H8ZvVQ7s7WW+KbDrayCH+vExH25p6rVfxurYsUSPEp7z7+6hb/R24ouFWZElpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672315467; a=rsa-sha256; cv=none; b=B2pkdTvbJlioMkmSeW4TNaz2+eXAuM0erRTzBk8tlg7rSK6JEWmt4pHVPK9axR3JirXth2 nnwK3JYqJrMS0oAOBAjMkGNy28QYPbKPFzl+nGbQmm/evZ8iY1dxzLbLReb70o+v1SAMfC 1uo9Xd/xOBweP5OPe2BHD5QTkBmWrfx0cDMEg3+kUWH5ijLp42V2OESOLHgxN5vyykO1Ia b0QSlIqbROI2L/02eSOx7SrEBk/6Qri3XlPEr1bKAbu7FplXTKe9piCwmJk30Sd68p0VjS AQ4Hwe9q17veMerpWuKSi4JckM6/mGM8QCJGUlONgcs+KsPseg4NxvyNqJnWUw== 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 4NjRrq2lVQzSB9; Thu, 29 Dec 2022 12:04:27 +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 2BTC4RYT087667; Thu, 29 Dec 2022 12:04:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BTC4RC1087666; Thu, 29 Dec 2022 12:04:27 GMT (envelope-from git) Date: Thu, 29 Dec 2022 12:04:27 GMT Message-Id: <202212291204.2BTC4RC1087666@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Wen Heping Subject: git: 434d421449bd - main - lang/julia: Update to 1.8.4 and Makefile cleanup List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 434d421449bd0115adde98d43fba4c9c75102e66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=434d421449bd0115adde98d43fba4c9c75102e66 commit 434d421449bd0115adde98d43fba4c9c75102e66 Author: Wen Heping AuthorDate: 2022-12-29 12:02:23 +0000 Commit: Wen Heping CommitDate: 2022-12-29 12:02:23 +0000 lang/julia: Update to 1.8.4 and Makefile cleanup PR: 268629 Reported by: rizor.reardon@yahoo.com(maintainer) --- lang/julia/Makefile | 9 ++------- lang/julia/distinfo | 6 +++--- lang/julia/files/patch-Make.inc | 8 ++++---- lang/julia/files/patch-Makefile | 6 +++--- lang/julia/files/patch-base_Makefile | 11 ++++++++++- lang/julia/pkg-plist | 3 +-- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/lang/julia/Makefile b/lang/julia/Makefile index 0419db24ea29..641013855d6b 100644 --- a/lang/julia/Makefile +++ b/lang/julia/Makefile @@ -1,7 +1,6 @@ PORTNAME= julia -DISTVERSION= 1.8.3 +DISTVERSION= 1.8.4 DISTVERSIONSUFFIX= -full -PORTREVISION= 3 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -32,16 +31,13 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libopenlibm.so:math/openlibm RUN_DEPENDS= ${MY_DEPENDS} -USES= gmake compiler:c++14-lang cpe fortran python perl5 \ - shebangfix blaslapack:openblas +USES= gmake cpe fortran python perl5 blaslapack:openblas CPE_VENDOR= julialang USE_CXXSTD= c++14 USE_LDCONFIG= yes -SHEBANG_GLOB= *.sh - MAKE_ARGS+= NO_GIT=1 \ USE_BINARYBUILDER=0 \ prefix=${PREFIX} \ @@ -83,7 +79,6 @@ 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 diff --git a/lang/julia/distinfo b/lang/julia/distinfo index 29206070d739..defbdb1224ca 100644 --- a/lang/julia/distinfo +++ b/lang/julia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668644873 -SHA256 (julia-1.8.3-full.tar.gz) = 52b6895a9d4ad2fe36db261ee8c4c8cc9212b837a12f93002faaf537a2151f50 -SIZE (julia-1.8.3-full.tar.gz) = 275266765 +TIMESTAMP = 1671919330 +SHA256 (julia-1.8.4-full.tar.gz) = 1cd032262c5c42048a7819bccd684e843bbb8f66cf9ff56c315881ea431f0033 +SIZE (julia-1.8.4-full.tar.gz) = 275343783 diff --git a/lang/julia/files/patch-Make.inc b/lang/julia/files/patch-Make.inc index 9245bb1b8bc0..fd922c9d5b94 100644 --- a/lang/julia/files/patch-Make.inc +++ b/lang/julia/files/patch-Make.inc @@ -1,6 +1,6 @@ ---- Make.inc.orig 2022-11-21 01:55:42 UTC +--- Make.inc.orig 2022-12-23 22:14:27 UTC +++ Make.inc -@@ -251,7 +251,7 @@ docdir := $(prefix)/$(framework_documentation) +@@ -251,7 +251,7 @@ libdir := $(prefix)/$(framework_currver) libexecdir := $(prefix)/$(framework_helpers) datarootdir := $(prefix)/$(framework_resources) docdir := $(prefix)/$(framework_documentation) @@ -9,7 +9,7 @@ man1dir := $(mandir)/man1 includedir := $(prefix)/$(framework_headers) sysconfdir := $(prefix)/$(framework_resources) -@@ -279,7 +279,7 @@ build_datarootdir := $(build_prefix)/share +@@ -279,7 +279,7 @@ build_depsbindir := $(build_prefix)/tools build_libdir := $(build_prefix)/lib build_libexecdir := $(build_prefix)/libexec build_datarootdir := $(build_prefix)/share @@ -18,7 +18,7 @@ build_man1dir := $(build_mandir)/man1 build_includedir := $(build_prefix)/include build_sysconfdir := $(build_prefix)/etc -@@ -498,8 +498,8 @@ ifeq ($(USECLANG),1) +@@ -500,8 +500,8 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions endif ifeq ($(USECLANG),1) diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index b10c5bc24ccb..57a8f3c81353 100644 --- a/lang/julia/files/patch-Makefile +++ b/lang/julia/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-11-18 12:39:16 UTC +--- Makefile.orig 2022-12-23 22:14:27 UTC +++ Makefile -@@ -229,7 +229,7 @@ endef +@@ -229,7 +229,7 @@ define stringreplace endef @@ -31,7 +31,7 @@ # Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel) ifneq ($(private_libdir_rel),$(build_private_libdir_rel)) -@@ -392,26 +384,15 @@ endif +@@ -402,26 +394,15 @@ endif endif endif diff --git a/lang/julia/files/patch-base_Makefile b/lang/julia/files/patch-base_Makefile index 2f4734b51e67..e3afc7857f0a 100644 --- a/lang/julia/files/patch-base_Makefile +++ b/lang/julia/files/patch-base_Makefile @@ -1,4 +1,4 @@ ---- base/Makefile.orig 2022-01-04 19:47:19 UTC +--- base/Makefile.orig 2022-12-23 22:14:27 UTC +++ base/Makefile @@ -190,7 +190,7 @@ symlink_p7zip: $(build_bindir)/7z$(EXE) @@ -9,3 +9,12 @@ endif $(build_bindir)/7z$(EXE): +@@ -218,6 +218,8 @@ else + $(eval $(call symlink_system_library,CSL,libgcc_s,1)) + endif + endif ++else ++$(eval $(call symlink_system_library,CSL,libgcc_s,1)) + endif + ifneq (,$(LIBGFORTRAN_VERSION)) + $(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION))) diff --git a/lang/julia/pkg-plist b/lang/julia/pkg-plist index 6596f25a9c78..1521f676d76e 100644 --- a/lang/julia/pkg-plist +++ b/lang/julia/pkg-plist @@ -753,8 +753,7 @@ libexec/7z %%DATADIR%%/stdlib/v%%VERSION%%/Pkg/test/repl.jl %%DATADIR%%/stdlib/v%%VERSION%%/Pkg/test/resolve.jl %%DATADIR%%/stdlib/v%%VERSION%%/Pkg/test/resolve_utils.jl -%%DATADIR%%/stdlib/v%%VERSION%%/Pkg/test/resolvedata1.jl -%%DATADIR%%/stdlib/v%%VERSION%%/Pkg/test/resolvedata2.jl +%%DATADIR%%/stdlib/v%%VERSION%%/Pkg/test/resolvedata.tar.gz %%DATADIR%%/stdlib/v%%VERSION%%/Pkg/test/runtests.jl %%DATADIR%%/stdlib/v%%VERSION%%/Pkg/test/sandbox.jl %%DATADIR%%/stdlib/v%%VERSION%%/Pkg/test/subdir.jl