Turn lang/julia to metaport & introduce JULIA_DEFAULT to bsd.default-versions.mk

PR:		235872
Submitted by:	Iblis Lin <iblis@hs.ntnu.edu.tw> (maintainer)

8 files changed, 0 insertions, 257 deletions

diff --git a/lang/julia/files/check_openblas.c b/lang/julia/files/check_openblas.c
deleted file mode 100644
index 6218d3507c65..000000000000
--- a/lang/julia/files/check_openblas.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <string.h>
-
-char* openblas_get_config(void);
-
-int main()
-{
-    if (strstr(openblas_get_config(), "USE64BITINT") == NULL)
-        return 1;
-    return 0;
-}
diff --git a/lang/julia/files/extra-patch-ui_Makefile b/lang/julia/files/extra-patch-ui_Makefile
deleted file mode 100644
index 2c3a834537dd..000000000000
--- a/lang/julia/files/extra-patch-ui_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/Makefile.orig	2016-09-20 02:54:22 UTC
-+++ ui/Makefile
-@@ -14,7 +14,7 @@ SRCS := repl
- HEADERS := $(addprefix $(JULIAHOME)/src/,julia.h julia_threads.h julia_internal.h options.h) \
- 	$(BUILDDIR)/../src/julia_version.h $(wildcard $(JULIAHOME)/src/support/*.h) $(LIBUV_INC)/uv.h
- 
--FLAGS := -I$(BUILDROOT)/src -I$(JULIAHOME)/src -I$(JULIAHOME)/src/support -I$(build_includedir)
-+FLAGS := -I$(BUILDROOT)/src -I$(JULIAHOME)/src -I$(JULIAHOME)/src/support -I$(build_includedir) -latomic
- ifneq ($(USEMSVC), 1)
- FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -Wc++-compat
- endif
diff --git a/lang/julia/files/patch-Make.inc b/lang/julia/files/patch-Make.inc
deleted file mode 100644
index 3ab1956f35e9..000000000000
--- a/lang/julia/files/patch-Make.inc
+++ /dev/null
@@ -1,53 +0,0 @@
---- Make.inc.orig	2018-07-31 20:35:41 UTC
-+++ Make.inc
-@@ -130,12 +130,7 @@ endif
- # disable automatic Makefile rules
- .SUFFIXES:
- 
--# find out if git repository is available
--ifeq ($(shell [ -e $(JULIAHOME)/.git ] && echo true || echo "Warning: git information unavailable; versioning information limited" >&2), true)
--NO_GIT := 0
--else
- NO_GIT := 1
--endif
- 
- # Julia's Semantic Versioning system labels the three decimal places in a version number as
- # the major, minor and patch versions.  Typically the major version would be incremented
-@@ -185,7 +180,7 @@ libdir := $(prefix)/lib
- libexecdir := $(prefix)/libexec
- datarootdir := $(prefix)/share
- docdir := $(datarootdir)/doc/julia
--mandir := $(datarootdir)/man
-+mandir := $(prefix)/man
- man1dir := $(mandir)/man1
- includedir := $(prefix)/include
- sysconfdir := $(prefix)/etc
-@@ -198,7 +193,7 @@ build_depsbindir := $(build_prefix)/tools
- build_libdir := $(build_prefix)/lib
- build_libexecdir := $(build_prefix)/libexec
- build_datarootdir := $(build_prefix)/share
--build_mandir := $(build_datarootdir)/man
-+build_mandir := $(build_prefix)/man
- build_man1dir := $(build_mandir)/man1
- build_includedir := $(build_prefix)/include
- build_sysconfdir := $(build_prefix)/etc
-@@ -364,7 +359,7 @@ endif
- ifeq ($(USEIFC), 1)
- FC := ifort
- else
--FC := $(CROSS_COMPILE)gfortran
-+FC ?= $(CROSS_COMPILE)gfortran
- endif
- 
- STDLIBCPP_FLAG :=
-@@ -417,8 +412,8 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
- endif
- 
- ifeq ($(USECLANG),1)
--CC := $(CROSS_COMPILE)clang
--CXX := $(CROSS_COMPILE)clang++
-+CC ?= $(CROSS_COMPILE)clang
-+CXX ?= $(CROSS_COMPILE)clang++
- JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- # AArch64 needs this flag to generate the .eh_frame used by libunwind
- JCPPFLAGS := -fasynchronous-unwind-tables
diff --git a/lang/julia/files/patch-Make.user b/lang/julia/files/patch-Make.user
deleted file mode 100644
index 2f14b992366d..000000000000
--- a/lang/julia/files/patch-Make.user
+++ /dev/null
@@ -1,11 +0,0 @@
---- Make.user.orig	2018-08-15 02:26:57 UTC
-+++ Make.user
-@@ -0,0 +1,8 @@
-+LIBBLAS=	-lopenblasp -L$(LOCALBASE)/lib
-+LIBBLASNAME=	libopenblasp
-+
-+LIBLAPACK=	$(LIBBLAS)
-+LIBLAPACKNAME=	$(LIBBLASNAME)
-+
-+override TAGGED_RELEASE_BANNER = "FreeBSD ports lang/julia build"
-+USE_BLAS64=0
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile
deleted file mode 100644
index e11bdb8eee7d..000000000000
--- a/lang/julia/files/patch-Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
---- Makefile.orig	2018-12-18 01:38:57 UTC
-+++ Makefile
-@@ -264,24 +264,6 @@ endif
- endif
- endif
- 
--# On FreeBSD, /lib/libgcc_s.so.1 is incompatible with Fortran; to use Fortran on FreeBSD,
--# we need to link to the libgcc_s that ships with the same GCC version used by libgfortran.
--# To work around this, we copy the GCC libraries we need, namely libgfortran, libgcc_s,
--# and libquadmath, into our build library directory, $(build_libdir). We also add them to
--# JL_PRIVATE_LIBS-0 so that they know where they need to live at install time.
--ifeq ($(OS),FreeBSD)
--define std_so
--julia-deps: | $$(build_libdir)/$(1).so
--$$(build_libdir)/$(1).so: | $$(build_libdir)
--	$$(INSTALL_M) $$(GCCPATH)/$(1).so* $$(build_libdir)
--JL_PRIVATE_LIBS-0 += $(1)
--endef
--
--$(eval $(call std_so,libgfortran))
--$(eval $(call std_so,libgcc_s))
--$(eval $(call std_so,libquadmath))
--endif # FreeBSD
--
- ifeq ($(OS),WINNT)
- define std_dll
- julia-deps: | $$(build_bindir)/lib$(1).dll $$(build_depsbindir)/lib$(1).dll
-@@ -328,8 +310,7 @@ JL_PRIVATE_LIBS-0 += libgfortran libgcc_s libquadmath
- endif
- 
- 
--install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
--	@$(MAKE) $(QUIET_MAKE) all
-+install: $(build_depsbindir)/stringreplace
- 	@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
- 		mkdir -p $(DESTDIR)$$subdir; \
- 	done
-@@ -371,10 +352,6 @@ endif
- 			fi \
- 		done \
- 	done
--	for suffix in $(JL_PRIVATE_LIBS-1) ; do \
--		lib=$(build_private_libdir)/$${suffix}.$(SHLIB_EXT); \
--		$(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
--	done
- endif
- 
- 	# Copy public headers
-@@ -389,8 +366,6 @@ endif
- 	$(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/
- 	# Copy in all .jl sources as well
- 	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/
--	# Copy documentation
--	cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
- 	# Remove various files which should not be installed
- 	-rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh
- 	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
-@@ -400,16 +375,6 @@ endif
- 	-rm -f $(DESTDIR)$(datarootdir)/julia/stdlib/$(VERSDIR)/*/build-checked
- 	# Copy in beautiful new man page
- 	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
--	# Copy icon and .desktop file
--	mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
--	$(INSTALL_F) $(JULIAHOME)/contrib/julia.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
--	-touch -c $(DESTDIR)$(datarootdir)/icons/hicolor/
--	-gtk-update-icon-cache $(DESTDIR)$(datarootdir)/icons/hicolor/
--	mkdir -p $(DESTDIR)$(datarootdir)/applications/
--	$(INSTALL_F) $(JULIAHOME)/contrib/julia.desktop $(DESTDIR)$(datarootdir)/applications/
--	# Install appdata file
--	mkdir -p $(DESTDIR)$(datarootdir)/appdata/
--	$(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/
- 
- 	# Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel)
- ifneq ($(private_libdir_rel),$(build_private_libdir_rel))
-@@ -420,7 +385,7 @@ ifeq ($(OS), Darwin)
- 	done
- else ifneq (,$(findstring $(OS),Linux FreeBSD))
- 	for j in $(JL_TARGETS) ; do \
--		patchelf --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $(DESTDIR)$(bindir)/$$j; \
-+		patchelf --set-rpath '$(GCCPATH):$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $(DESTDIR)$(bindir)/$$j; \
- 	done
- endif
- 
-@@ -431,22 +396,24 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1)
- endif
- 
- endif
--	# On FreeBSD, remove the build's libdir from each library's RPATH
--ifeq ($(OS),FreeBSD)
--	$(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(libdir) $(build_libdir)
--	$(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(private_libdir) $(build_libdir)
--	$(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(bindir) $(build_libdir)
--	# Set libgfortran's RPATH to ORIGIN instead of GCCPATH. It's only libgfortran that
--	# needs to be fixed here, as libgcc_s and libquadmath don't have RPATHs set. If we
--	# don't set libgfortran's RPATH, it won't be able to find its friends on systems
--	# that don't have the exact GCC port installed used for the build.
--	for lib in $(DESTDIR)$(private_libdir)/libgfortran*$(SHLIB_EXT)*; do \
--		$(build_depsbindir)/patchelf --set-rpath '$$ORIGIN' $$lib; \
--	done
--endif
--
- 	mkdir -p $(DESTDIR)$(sysconfdir)
- 	cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
-+
-+install-docs:
-+	# Copy documentation
-+	cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
-+
-+install-desktop:
-+	# Copy icon and .desktop file
-+	mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
-+	$(INSTALL_F) $(JULIAHOME)/contrib/julia.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
-+	-touch -c $(DESTDIR)$(datarootdir)/icons/hicolor/
-+	-gtk-update-icon-cache $(DESTDIR)$(datarootdir)/icons/hicolor/
-+	mkdir -p $(DESTDIR)$(datarootdir)/applications/
-+	$(INSTALL_F) $(JULIAHOME)/contrib/julia.desktop $(DESTDIR)$(datarootdir)/applications/
-+	# Install appdata file
-+	mkdir -p $(DESTDIR)$(datarootdir)/appdata/
-+	$(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/
- 
- distclean:
- 	-rm -fr $(BUILDROOT)/julia-*.tar.gz $(BUILDROOT)/julia*.exe $(BUILDROOT)/julia-*.7z $(BUILDROOT)/julia-$(JULIA_COMMIT)
diff --git a/lang/julia/files/patch-base_Makefile b/lang/julia/files/patch-base_Makefile
deleted file mode 100644
index 95a549c14f92..000000000000
--- a/lang/julia/files/patch-base_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/Makefile.orig 2018-09-20 04:08:53 UTC
-+++ base/Makefile
-@@ -109,7 +109,7 @@ ifneq ($(OS), WINNT)
- # put a symlink in the private libdir.
- # System package managers may want to install these links manually,
- # but if not, this will try to create the proper symlink to the right minor version.
--all: symlink_system_libraries
-+all:
- SYMLINK_SYSTEM_LIBRARIES :=
- 
- # if it's a symlink, pick up the symlink target instead, for one level of indirection
diff --git a/lang/julia/files/patch-src_Makefile b/lang/julia/files/patch-src_Makefile
deleted file mode 100644
index 557d854f3cca..000000000000
--- a/lang/julia/files/patch-src_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.orig	2018-07-13 22:23:23 UTC
-+++ src/Makefile
-@@ -266,7 +266,7 @@ else
- endif
- 
- $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV)
--	@$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(DEBUG_LIBS) $(SONAME_DEBUG))
-+	@$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(DEBUGFLAGS) $(DOBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(DEBUG_LIBS) $(SONAME_DEBUG)) -lgcc_s
- 	$(INSTALL_NAME_CMD)libjulia-debug.$(SHLIB_EXT) $@
- ifneq ($(OS), WINNT)
- 	@ln -sf libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_SHLIB_EXT)
-@@ -281,7 +281,7 @@ $(BUILDDIR)/libjulia-debug.a: $(SRCDIR)/julia.expmap $
- libjulia-debug: $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(PUBLIC_HEADER_TARGETS)
- 
- $(build_shlibdir)/libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)
--	@$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(RELEASE_LIBS) $(SONAME))
-+	@$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(SHIPFLAGS) $(OBJS) $(RPATH_LIB) -o $@ $(LDFLAGS) $(JLIBLDFLAGS) $(RELEASE_LIBS) $(SONAME)) -lgcc_s
- 	$(INSTALL_NAME_CMD)libjulia.$(SHLIB_EXT) $@
- ifneq ($(OS), WINNT)
- 	@ln -sf libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia.$(JL_MAJOR_SHLIB_EXT)
diff --git a/lang/julia/files/patch-stdlib_Makefile b/lang/julia/files/patch-stdlib_Makefile
deleted file mode 100644
index 9ab229c7b6e6..000000000000
--- a/lang/julia/files/patch-stdlib_Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- stdlib/Makefile.orig	2018-12-16 21:26:52 UTC
-+++ stdlib/Makefile
-@@ -25,8 +25,15 @@ PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git
- PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1
- $(eval $(call git-external,Pkg,PKG,,,$(BUILDDIR)))
- $(BUILDDIR)/$(PKG_SRC_DIR)/build-compiled: $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted
--	@# no build steps
-+	rm $(BUILDDIR)/$(PKG_SRC_DIR)/.gitignore
-+	rm $(BUILDDIR)/$(PKG_SRC_DIR)/.codecov.yml
-+	rm $(BUILDDIR)/$(PKG_SRC_DIR)/.travis.yml
-+	rm $(BUILDDIR)/$(PKG_SRC_DIR)/appveyor.yml
-+	rm $(BUILDDIR)/$(PKG_SRC_DIR)/ext/TOML/.travis.yml
-+	rm $(BUILDDIR)/$(PKG_SRC_DIR)/ext/TOML/appveyor.yml
-+	rm $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted
- 	echo 1 > $@
-+
- $(eval $(call symlink_install,Pkg,$$(PKG_SRC_DIR),$$(build_datarootdir)/julia/stdlib/$$(VERSDIR)))
- clean-Pkg:
- 	-rm $(BUILDDIR)/$(PKG_SRC_DIR)/build-compiled