- Updat to 0.6.0

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

14 files changed, 137 insertions, 228 deletions

diff --git a/lang/julia/Makefile b/lang/julia/Makefile
index 45e85c002219..bb0c1a4f20af 100644
--- a/lang/julia/Makefile
+++ b/lang/julia/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	julia
-PORTVERSION=	0.5.2
+PORTVERSION=	0.6.0
 DISTVERSIONSUFFIX=	-full
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libunwind.so:devel/libunwind \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libpcre2-8.so:devel/pcre2
-BUILD_DEPENDS=	llvm-config39:devel/llvm39 \
+BUILD_DEPENDS=	llvm-config40:devel/llvm40 \
 		pcre2-config:devel/pcre2 \
 		patchelf:sysutils/patchelf
 
@@ -35,17 +35,24 @@ ALL_TARGET=	default
 INSTALL_TARGET=	install
 TEST_TARGET=	test
 
+PLIST_SUB=	VERSION="${PORTVERSION:R}" \
+		SOVERSION="${PORTVERSION}"
+
 CXXFLAGS+=	-stdlib=libc++ -std=c++11
 MAKE_ARGS+=	prefix=${PREFIX} JCXXFLAGS="${CXXFLAGS}" \
 		FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \
 		USE_GPL_LIBS=${USE_GPL_LIBS}
 
 OPTIONS_DEFINE=	EXAMPLES DEBUG DOCS GPL_LIBS DESKTOP NATIVE
+OPTIONS_DEFAULT=	SYSLIBM
 OPTIONS_GROUP=	PRIVATE
 OPTIONS_GROUP_PRIVATE=	ARPACK
+OPTIONS_SINGLE=	LIBM
+OPTIONS_SINGLE_LIBM=	SYSLIBM OPENLIBM
 OPTIONS_SUB=	yes
 
 PRIVATE_DESC=	Build self-shipped private depends
+LIBM_DESC=	Math library implementation
 
 DEBUG_VARS=	FORCE_ASSERTIONS=1 \
 		ALL_TARGET=all
@@ -62,7 +69,7 @@ GPL_LIBS_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 GPL_LIBS_MAKE_ARGS=	USE_SYSTEM_SUITESPARSE=0
 GPL_LIBS_VARS=	USE_GPL_LIBS=1
 
-DESKTOP_DESC=	Install icon, .desktop and appdata file
+DESKTOP_DESC=	Install icon, .desktop and appdata files
 DESKTOP_VARS=	INSTALL_TARGET+=install-desktop \
 		INSTALLS_ICONS=yes
 
@@ -71,6 +78,13 @@ ARPACK_MAKE_ARGS=	USE_SYSTEM_ARPACK=0
 ARPACK_LIB_DEPENDS_OFF=	libarpack.so:math/arpack-ng
 ARPACK_MAKE_ARGS_OFF=	USE_SYSTEM_ARPACK=1
 
+SYSLIBM_DESC=	Build with system libm
+SYSLIBM_MAKE_ARGS=	USE_SYSTEM_LIBM=1
+
+OPENLIBM_DESC=	Build with OpenLibm (math/openlibm)
+OPENLIBM_MAKE_ARGS=	USE_SYSTEM_OPENLIBM=1
+OPENLIBM_LIB_DEPENDS=	libopenlibm.so:math/openlibm
+
 .include <bsd.port.options.mk>
 
 NATIVE_DESC=		Build with native CPU jit tuning
@@ -84,7 +98,7 @@ MAKE_ARGS+=	JULIA_CPU_TARGET=pentium4
 .else
 MAKE_ARGS+=	JULIA_CPU_TARGET=generic
 .endif
-.endif
+.endif  # .if ${PORT_OPTIONS:MNATIVE}
 
 .if ${ARCH} == "i386"
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ui_Makefile
diff --git a/lang/julia/distinfo b/lang/julia/distinfo
index 72fdceaf0439..193fdd337ac8 100644
--- a/lang/julia/distinfo
+++ b/lang/julia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495877395
-SHA256 (julia-0.5.2-full.tar.gz) = f5ef56d79ed55eacba9fe968bb175317be3f61668ef93e747d76607678cc01dd
-SIZE (julia-0.5.2-full.tar.gz) = 93374133
+TIMESTAMP = 1497947201
+SHA256 (julia-0.6.0-full.tar.gz) = 933c91cf460ba37520d19034378907c3208358741ed92bd8184cebb575633522
+SIZE (julia-0.6.0-full.tar.gz) = 89904207
diff --git a/lang/julia/files/patch-Make.inc b/lang/julia/files/patch-Make.inc
index bbf92669da90..02ab1cacf125 100644
--- a/lang/julia/files/patch-Make.inc
+++ b/lang/julia/files/patch-Make.inc
@@ -1,6 +1,6 @@
---- Make.inc.orig	2017-05-08 07:00:02 UTC
+--- Make.inc.orig	2017-06-19 17:48:45 UTC
 +++ Make.inc
-@@ -128,12 +128,7 @@ endif
+@@ -133,12 +133,7 @@ endif
  # disable automatic Makefile rules
  .SUFFIXES:
  
@@ -13,7 +13,7 @@
  
  # 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
-@@ -178,7 +173,7 @@ libdir := $(prefix)/lib
+@@ -183,7 +178,7 @@ libdir := $(prefix)/lib
  libexecdir := $(prefix)/libexec
  datarootdir := $(prefix)/share
  docdir := $(datarootdir)/doc/julia
@@ -22,7 +22,7 @@
  man1dir := $(mandir)/man1
  includedir := $(prefix)/include
  sysconfdir := $(prefix)/etc
-@@ -192,7 +187,7 @@ build_libdir := $(build_prefix)/lib
+@@ -197,7 +192,7 @@ build_libdir := $(build_prefix)/lib
  build_libexecdir := $(build_prefix)/libexec
  build_datarootdir := $(build_prefix)/share
  build_docdir := $(build_datarootdir)/doc/julia
@@ -31,7 +31,7 @@
  build_man1dir := $(build_mandir)/man1
  build_includedir := $(build_prefix)/include
  build_sysconfdir := $(build_prefix)/etc
-@@ -340,7 +335,7 @@ endif
+@@ -350,7 +345,7 @@ endif
  ifeq ($(USEIFC), 1)
  FC := ifort
  else
@@ -40,7 +40,7 @@
  endif
  
  STDLIBCPP_FLAG :=
-@@ -393,14 +388,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
+@@ -403,14 +398,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
  endif
  
  ifeq ($(USECLANG),1)
@@ -57,13 +57,4 @@
 +SHIPFLAGS := -O3
  ifeq ($(OS), Darwin)
  ifeq ($(USE_LIBCPP), 1)
- CC += -stdlib=libc++ -mmacosx-version-min=10.7
-@@ -833,7 +828,7 @@ endif
- 
- ifeq ($(USE_SYSTEM_UTF8PROC), 1)
-   LIBUTF8PROC := -lutf8proc
--  UTF8PROC_INC := /usr/include
-+  UTF8PROC_INC := $(LOCALBASE)/include
- else
-   LIBUTF8PROC := $(build_libdir)/libutf8proc.a
-   UTF8PROC_INC := $(build_includedir)
+ MACOSX_VERSION_MIN := 10.8
diff --git a/lang/julia/files/patch-Make.user b/lang/julia/files/patch-Make.user
index b5af34508718..5e1f2d447c67 100644
--- a/lang/julia/files/patch-Make.user
+++ b/lang/julia/files/patch-Make.user
@@ -1,24 +1,21 @@
---- Make.user.orig	2017-02-26 09:48:03 UTC
+--- Make.user.orig	2017-07-01 17:24:48 UTC
 +++ Make.user
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,20 @@
 +USE_SYSTEM_BLAS=	1
 +USE_SYSTEM_GMP=		1
 +USE_SYSTEM_LAPACK=	1
 +USE_SYSTEM_LIBGIT2=	1
-+USE_SYSTEM_LIBM=	1
 +USE_SYSTEM_LIBUNWIND=	1
 +USE_SYSTEM_LIBUV=	0
 +USE_SYSTEM_LLVM=	1
 +USE_SYSTEM_MPFR=	1
-+# USE_SYSTEM_OPENLIBM=	0
 +USE_SYSTEM_PATCHELF=	1
 +USE_SYSTEM_PCRE=	1
 +USE_SYSTEM_UTF8PROC=	1
-+
-+LLVM_CONFIG=	llvm-config39
-+
 +USE_SYSTEM_FFTW=	1
 +
++LLVM_CONFIG=	llvm-config40
++
 +LIBBLAS=	-lopenblasp -L$(LOCALBASE)/lib
 +LIBBLASNAME=	libopenblasp
 +
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile
index 29ecc13e278a..f8824c92ce41 100644
--- a/lang/julia/files/patch-Makefile
+++ b/lang/julia/files/patch-Makefile
@@ -1,38 +1,42 @@
---- Makefile.orig	2017-05-08 07:00:02 UTC
+--- Makefile.orig	2017-06-19 17:48:45 UTC
 +++ Makefile
-@@ -63,11 +63,6 @@ CLEAN_TARGETS += clean-docdir
- clean-docdir:
- 	@-rm -fr $(abspath $(build_docdir))
- $(build_prefix)/.examples: $(wildcard $(JULIAHOME)/examples/*.jl) $(shell find $(JULIAHOME)/examples/clustermanager)
--	@echo Copying in usr/share/doc/julia/examples
--	@-rm -fr $(build_docdir)/examples
--	@mkdir -p $(build_docdir)/examples
--	@cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/
--	@cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/
+@@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $(
+ 	@mkdir -p $(build_docdir)/examples
+ 	@cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/
+ 	@cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/
+-	@cp -R $(JULIAHOME)/examples/embedding $(build_docdir)/examples
  	@echo 1 > $@
  
  julia-symlink: julia-ui-$(JULIA_BUILD_MODE)
-@@ -328,7 +323,7 @@ define stringreplace
+@@ -96,7 +95,7 @@ julia-src-release julia-src-debug : juli
+ julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
+ 	@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$*
+ 
+-julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples
++julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE)
+ 	@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
+ 
+ ifneq ($(CPUID_SPECIFIC_BINARIES), 0)
+@@ -332,7 +331,7 @@ define stringreplace
  	$(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
  endef
  
--install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html
+-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
 +install: $(build_depsbindir)/stringreplace
  	@$(MAKE) $(QUIET_MAKE) all
- 	@for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
+ 	@for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
  		mkdir -p $(DESTDIR)$$subdir; \
-@@ -389,10 +384,6 @@ endif
- 	$(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/
+@@ -377,9 +376,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 $(build_docdir)/* $(DESTDIR)$(docdir)/
 -	cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
--	-rm $(DESTDIR)$(docdir)/html/.buildinfo
  	# Remove perf suite
  	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
  	# Remove various files which should not be installed
-@@ -400,38 +391,44 @@ endif
+@@ -387,38 +383,44 @@ endif
  	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
  	# Copy in beautiful new man page
  	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
@@ -72,8 +76,8 @@
  	cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
  
 +install-docs:
++	# Copy documentation
 +	cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
-+	rm $(DESTDIR)$(docdir)/html/.buildinfo
 +
 +install-examples:
 +	mkdir -p $(DESTDIR)$(datarootdir)/examples/julia/
diff --git a/lang/julia/files/patch-base_Terminals.jl b/lang/julia/files/patch-base_Terminals.jl
deleted file mode 100644
index 618c31b7f1fe..000000000000
--- a/lang/julia/files/patch-base_Terminals.jl
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/Terminals.jl.orig	2017-02-19 14:49:03 UTC
-+++ base/Terminals.jl
-@@ -156,7 +156,7 @@ else
-     function hascolor(t::TTYTerminal)
-         startswith(t.term_type, "xterm") && return true
-         try
--            return success(`tput setaf 0`)
-+            return success(`tput AF 0`)
-         catch
-             return false
-         end
diff --git a/lang/julia/files/patch-base_libdl.jl b/lang/julia/files/patch-base_libdl.jl
deleted file mode 100644
index 72e208a35dd9..000000000000
--- a/lang/julia/files/patch-base_libdl.jl
+++ /dev/null
@@ -1,48 +0,0 @@
---- base/libdl.jl.orig	2016-09-20 02:54:21 UTC
-+++ base/libdl.jl
-@@ -198,6 +198,31 @@ if is_linux()
-     end
- end # linux-only
- 
-+if is_bsd() && !is_apple()
-+    # DL_ITERATE_PHDR(3) on freebsd
-+    immutable dl_phdr_info
-+        # Base address of object
-+        addr::Cuint
-+
-+        # Null-terminated name of object
-+        name::Ptr{UInt8}
-+
-+        # Pointer to array of ELF program headers for this object
-+        phdr::Ptr{Void}
-+
-+        # Number of program headers for this object
-+        phnum::Cshort
-+    end
-+
-+    function dl_phdr_info_callback(di::dl_phdr_info, size::Csize_t, dy_libs::Array{AbstractString,1})
-+        name = unsafe_string(di.name)
-+        if !isempty(name)
-+            push!(dy_libs, name)
-+        end
-+        return convert(Cint, 0)::Cint
-+    end
-+end # bsd family
-+
- function dllist()
-     dynamic_libraries = Array{AbstractString}(0)
- 
-@@ -221,6 +246,13 @@ function dllist()
-         ccall(:jl_dllist, Cint, (Any,), dynamic_libraries)
-     end
- 
-+    @static if is_bsd() && !is_apple()
-+        const callback = cfunction(dl_phdr_info_callback, Cint,
-+                                   (Ref{dl_phdr_info}, Csize_t, Ref{Array{AbstractString,1}} ))
-+        ccall(:dl_iterate_phdr, Cint, (Ptr{Void}, Ref{Array{AbstractString,1}}), callback, dynamic_libraries)
-+        shift!(dynamic_libraries)
-+    end
-+
-     return dynamic_libraries
- end
- 
diff --git a/lang/julia/files/patch-base_mmap.jl b/lang/julia/files/patch-base_mmap.jl
deleted file mode 100644
index 1eefb32d88ab..000000000000
--- a/lang/julia/files/patch-base_mmap.jl
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/mmap.jl.orig	2017-02-23 09:50:38 UTC
-+++ base/mmap.jl
-@@ -27,7 +27,7 @@ const PROT_READ     = Cint(1)
- const PROT_WRITE    = Cint(2)
- const MAP_SHARED    = Cint(1)
- const MAP_PRIVATE   = Cint(2)
--const MAP_ANONYMOUS = Cint(is_apple() ? 0x1000 : 0x20)
-+const MAP_ANONYMOUS = Cint(0x1000)
- const F_GETFL       = Cint(3)
- 
- gethandle(io::IO) = fd(io)
diff --git a/lang/julia/files/patch-base_sharedarray.jl b/lang/julia/files/patch-base_sharedarray.jl
deleted file mode 100644
index 81da304186d8..000000000000
--- a/lang/julia/files/patch-base_sharedarray.jl
+++ /dev/null
@@ -1,17 +0,0 @@
---- base/sharedarray.jl.orig	2017-02-23 09:55:38 UTC
-+++ base/sharedarray.jl
-@@ -477,13 +477,7 @@ complex(S1::SharedArray,S2::SharedArray)
- 
- function print_shmem_limits(slen)
-     try
--        if is_linux()
--            pfx = "kernel"
--        elseif is_apple()
--            pfx = "kern.sysv"
--        else
--            return
--        end
-+        pfx = "kern.ipc"
- 
-         shmmax_MB = div(parse(Int, split(readstring(`sysctl $(pfx).shmmax`))[end]), 1024*1024)
-         page_size = parse(Int, split(readstring(`getconf PAGE_SIZE`))[end])
diff --git a/lang/julia/files/patch-base_socket.jl b/lang/julia/files/patch-base_socket.jl
deleted file mode 100644
index e57755988392..000000000000
--- a/lang/julia/files/patch-base_socket.jl
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/socket.jl.orig	2017-02-24 09:57:14 UTC
-+++ base/socket.jl
-@@ -762,7 +762,7 @@ function getsockname(sock::Union{TCPServ
-             addrv4 = raddress[1:4]
-             naddr = ntoh(unsafe_load(Ptr{Cuint}(pointer(addrv4)), 1))
-             addr = IPv4(naddr)
--        elseif rfamily[] == @static is_windows() ? 23 : (@static is_apple() ? 30 : 10) # AF_INET6
-+        elseif rfamily[] == 28 # AF_INET6
-             naddr = ntoh(unsafe_load(Ptr{UInt128}(pointer(raddress)), 1))
-             addr = IPv6(naddr)
-         else
diff --git a/lang/julia/files/patch-deps_suitesparse.mk b/lang/julia/files/patch-deps_suitesparse.mk
deleted file mode 100644
index 31a04009761d..000000000000
--- a/lang/julia/files/patch-deps_suitesparse.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/suitesparse.mk.orig	2016-09-20 02:54:21 UTC
-+++ deps/suitesparse.mk
-@@ -93,7 +93,7 @@ install-suitesparse: $(SUITESPARSE_OBJ_T
- # SUITESPARSE WRAPPER
- 
- ifeq ($(USE_SYSTEM_SUITESPARSE), 1)
--SUITESPARSE_INC := -I /usr/include/suitesparse
-+SUITESPARSE_INC := -I $(LOCALBASE)/include/suitesparse
- SUITESPARSE_LIB := -lumfpack -lcholmod -lamd -lcamd -lcolamd -lspqr
- else
- SUITESPARSE_INC := -I $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/CHOLMOD/Include -I $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse_config -I $(BUILDDIR)/SuiteSparse-$(SUITESPARSE_VER)/SPQR/Include
diff --git a/lang/julia/files/patch-src_Makefile b/lang/julia/files/patch-src_Makefile
index 1afb292e5b6c..6f886938a328 100644
--- a/lang/julia/files/patch-src_Makefile
+++ b/lang/julia/files/patch-src_Makefile
@@ -1,28 +1,20 @@
---- src/Makefile.orig	2017-03-06 03:32:23 UTC
+--- src/Makefile.orig	2017-06-19 17:48:45 UTC
 +++ src/Makefile
-@@ -9,7 +9,7 @@ override CFLAGS += $(JCFLAGS)
- ifeq ($(LLVM_VER),3.3)
- override CXXFLAGS += $(JCXXFLAGS) -std=c++11
- else
--override CXXFLAGS += $(JCXXFLAGS)
-+override CXXFLAGS += $(JCXXFLAGS) -stdlib=libc++ -std=c++11
+@@ -263,7 +263,7 @@ else
  endif
- override CPPFLAGS += $(JCPPFLAGS)
  
-@@ -21,6 +21,7 @@ FLAGS := \
- 	-D_GNU_SOURCE -I$(BUILDDIR) -I$(SRCDIR) \
- 	-I$(SRCDIR)/flisp -I$(SRCDIR)/support \
- 	-I$(LIBUV_INC) -I$(build_includedir) -DLIBRARY_EXPORTS \
-+	-I$(LOCALBASE)/include \
- 	-I$(JULIAHOME)/deps/valgrind
- ifneq ($(USEMSVC), 1)
- FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden -fno-common \
-@@ -76,7 +77,7 @@ else
- ifeq ($(OS),WINNT)
- LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
- else
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
-+LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags --libs)
- endif # OS == WINNT
- endif # LLVM_USE_CMAKE == 1
- FLAGS += -DLLVM_SHLIB
+ $(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)
+@@ -278,7 +278,7 @@ $(BUILDDIR)/libjulia-debug.a: $(SRCDIR)/
+ 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-ui_Makefile b/lang/julia/files/patch-ui_Makefile
deleted file mode 100644
index e6878e287919..000000000000
--- a/lang/julia/files/patch-ui_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- ui/Makefile.orig	2016-09-20 02:54:22 UTC
-+++ ui/Makefile
-@@ -66,10 +66,12 @@ else
- CXXLD := $(LD)
- endif
- 
-+LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags --system-libs)
-+
- $(build_bindir)/julia$(EXE): $(OBJS)
--	@$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ -L$(build_private_libdir) -L$(build_libdir) -L$(build_shlibdir) -ljulia $(JLDFLAGS) $(CXXLDFLAGS))
-+	@$(call PRINT_LINK, $(CXXLD) -v $(CXXFLAGS) $(CXXLDFLAGS) $(LINK_FLAGS) $(SHIPFLAGS) $^ -o $@ -L$(build_private_libdir) -L$(build_libdir) -L$(build_shlibdir) -ljulia $(JLDFLAGS) $(CXXLDFLAGS) $(LLVMLINK))
- $(build_bindir)/julia-debug$(EXE): $(DOBJS)
--	@$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(LINK_FLAGS) $(DEBUGFLAGS) $^ -o $@ -L$(build_private_libdir) -L$(build_libdir) -L$(build_shlibdir) -ljulia-debug $(JLDFLAGS) $(CXXLDFLAGS))
-+	@$(call PRINT_LINK, $(CXXLD) $(CXXFLAGS) $(CXXLDFLAGS) $(LINK_FLAGS) $(DEBUGFLAGS) $^ -o $@ -L$(build_private_libdir) -L$(build_libdir) -L$(build_shlibdir) -ljulia-debug $(JLDFLAGS) $(CXXLDFLAGS) $(LLVMLINK))
- 
- clean: | $(CLEAN_TARGETS)
- 	rm -f *.o *.dbg.obj
diff --git a/lang/julia/pkg-plist b/lang/julia/pkg-plist
index 1e4565a3c99e..861dc1ea082e 100644
--- a/lang/julia/pkg-plist
+++ b/lang/julia/pkg-plist
@@ -7,6 +7,7 @@ include/julia/ENTRY.i387.h
 include/julia/MurmurHash3.h
 include/julia/arraylist.h
 include/julia/bitvector.h
+include/julia/crc32c.h
 include/julia/dirpath.h
 include/julia/dtypes.h
 include/julia/hashing.h
@@ -48,11 +49,11 @@ lib/julia/libopenspecfun.so.1.3
 %%DEBUG%%lib/julia/sys-debug.so
 lib/julia/sys.so
 %%DEBUG%%lib/libjulia-debug.so
-%%DEBUG%%lib/libjulia-debug.so.0.5
-%%DEBUG%%lib/libjulia-debug.so.0.5.2
+%%DEBUG%%lib/libjulia-debug.so.%%SOVERSION%%
+%%DEBUG%%lib/libjulia-debug.so.%%VERSION%%
 lib/libjulia.so
-lib/libjulia.so.0.5
-lib/libjulia.so.0.5.2
+lib/libjulia.so.%%VERSION%%
+lib/libjulia.so.%%SOVERSION%%
 %%DESKTOP%%share/appdata/julia.appdata.xml
 %%DESKTOP%%share/applications/julia.desktop
 %%DESKTOP%%share/icons/hicolor/scalable/apps/julia.svg
@@ -66,6 +67,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/abstractarraymath.jl
 %%DATADIR%%/base/array.jl
 %%DATADIR%%/base/arraymath.jl
+%%DATADIR%%/base/associative.jl
 %%DATADIR%%/base/asyncmap.jl
 %%DATADIR%%/base/atomics.jl
 %%DATADIR%%/base/base.jl
@@ -81,12 +83,11 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/char.jl
 %%DATADIR%%/base/checked.jl
 %%DATADIR%%/base/client.jl
-%%DATADIR%%/base/clusterserialize.jl
-%%DATADIR%%/base/collections.jl
 %%DATADIR%%/base/combinatorics.jl
 %%DATADIR%%/base/complex.jl
 %%DATADIR%%/base/coreimg.jl
 %%DATADIR%%/base/coreio.jl
+%%DATADIR%%/base/ctypes.jl
 %%DATADIR%%/base/dSFMT.jl
 %%DATADIR%%/base/datafmt.jl
 %%DATADIR%%/base/dates/Dates.jl
@@ -95,6 +96,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/dates/arithmetic.jl
 %%DATADIR%%/base/dates/conversions.jl
 %%DATADIR%%/base/dates/io.jl
+%%DATADIR%%/base/dates/parse.jl
 %%DATADIR%%/base/dates/periods.jl
 %%DATADIR%%/base/dates/query.jl
 %%DATADIR%%/base/dates/ranges.jl
@@ -104,6 +106,16 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/deprecated.jl
 %%DATADIR%%/base/dft.jl
 %%DATADIR%%/base/dict.jl
+%%DATADIR%%/base/distributed/Distributed.jl
+%%DATADIR%%/base/distributed/cluster.jl
+%%DATADIR%%/base/distributed/clusterserialize.jl
+%%DATADIR%%/base/distributed/macros.jl
+%%DATADIR%%/base/distributed/managers.jl
+%%DATADIR%%/base/distributed/messages.jl
+%%DATADIR%%/base/distributed/pmap.jl
+%%DATADIR%%/base/distributed/process_messages.jl
+%%DATADIR%%/base/distributed/remotecall.jl
+%%DATADIR%%/base/distributed/workerpool.jl
 %%DATADIR%%/base/docs/Docs.jl
 %%DATADIR%%/base/docs/basedocs.jl
 %%DATADIR%%/base/docs/bindings.jl
@@ -128,7 +140,6 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/file_constants.jl
 %%DATADIR%%/base/filesystem.jl
 %%DATADIR%%/base/float.jl
-%%DATADIR%%/base/float16.jl
 %%DATADIR%%/base/floatfuncs.jl
 %%DATADIR%%/base/generator.jl
 %%DATADIR%%/base/gmp.jl
@@ -142,6 +153,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/hashing.jl
 %%DATADIR%%/base/hashing2.jl
 %%DATADIR%%/base/i18n.jl
+%%DATADIR%%/base/indices.jl
 %%DATADIR%%/base/inference.jl
 %%DATADIR%%/base/initdefs.jl
 %%DATADIR%%/base/int.jl
@@ -152,7 +164,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/iobuffer.jl
 %%DATADIR%%/base/iostream.jl
 %%DATADIR%%/base/irrationals.jl
-%%DATADIR%%/base/iterator.jl
+%%DATADIR%%/base/iterators.jl
 %%DATADIR%%/base/latex_symbols.jl
 %%DATADIR%%/base/libc.jl
 %%DATADIR%%/base/libdl.jl
@@ -187,6 +199,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/linalg/blas.jl
 %%DATADIR%%/base/linalg/bunchkaufman.jl
 %%DATADIR%%/base/linalg/cholesky.jl
+%%DATADIR%%/base/linalg/conjarray.jl
 %%DATADIR%%/base/linalg/dense.jl
 %%DATADIR%%/base/linalg/diagonal.jl
 %%DATADIR%%/base/linalg/eigen.jl
@@ -202,17 +215,18 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/linalg/lu.jl
 %%DATADIR%%/base/linalg/matmul.jl
 %%DATADIR%%/base/linalg/qr.jl
+%%DATADIR%%/base/linalg/rowvector.jl
 %%DATADIR%%/base/linalg/schur.jl
 %%DATADIR%%/base/linalg/special.jl
 %%DATADIR%%/base/linalg/svd.jl
 %%DATADIR%%/base/linalg/symmetric.jl
+%%DATADIR%%/base/linalg/transpose.jl
 %%DATADIR%%/base/linalg/triangular.jl
 %%DATADIR%%/base/linalg/tridiag.jl
 %%DATADIR%%/base/linalg/uniformscaling.jl
 %%DATADIR%%/base/loading.jl
 %%DATADIR%%/base/lock.jl
 %%DATADIR%%/base/locks.jl
-%%DATADIR%%/base/managers.jl
 %%DATADIR%%/base/markdown/Common/Common.jl
 %%DATADIR%%/base/markdown/Common/block.jl
 %%DATADIR%%/base/markdown/Common/inline.jl
@@ -237,7 +251,6 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/methodshow.jl
 %%DATADIR%%/base/mmap.jl
 %%DATADIR%%/base/mpfr.jl
-%%DATADIR%%/base/multi.jl
 %%DATADIR%%/base/multidimensional.jl
 %%DATADIR%%/base/multimedia.jl
 %%DATADIR%%/base/multinverses.jl
@@ -248,6 +261,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/options.jl
 %%DATADIR%%/base/ordering.jl
 %%DATADIR%%/base/osutils.jl
+%%DATADIR%%/base/pair.jl
 %%DATADIR%%/base/parse.jl
 %%DATADIR%%/base/path.jl
 %%DATADIR%%/base/pcre.jl
@@ -267,7 +281,6 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/pkg/resolve/versionweight.jl
 %%DATADIR%%/base/pkg/types.jl
 %%DATADIR%%/base/pkg/write.jl
-%%DATADIR%%/base/pmap.jl
 %%DATADIR%%/base/pointer.jl
 %%DATADIR%%/base/poll.jl
 %%DATADIR%%/base/precompile.jl
@@ -275,7 +288,6 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/process.jl
 %%DATADIR%%/base/profile.jl
 %%DATADIR%%/base/promotion.jl
-%%DATADIR%%/base/quadgk.jl
 %%DATADIR%%/base/random.jl
 %%DATADIR%%/base/range.jl
 %%DATADIR%%/base/rational.jl
@@ -285,7 +297,6 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/refpointer.jl
 %%DATADIR%%/base/regex.jl
 %%DATADIR%%/base/replutil.jl
-%%DATADIR%%/base/require.jl
 %%DATADIR%%/base/reshapedarray.jl
 %%DATADIR%%/base/rounding.jl
 %%DATADIR%%/base/serialize.jl
@@ -299,6 +310,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/sparse/abstractsparse.jl
 %%DATADIR%%/base/sparse/cholmod.jl
 %%DATADIR%%/base/sparse/cholmod_h.jl
+%%DATADIR%%/base/sparse/higherorderfns.jl
 %%DATADIR%%/base/sparse/linalg.jl
 %%DATADIR%%/base/sparse/sparse.jl
 %%DATADIR%%/base/sparse/sparsematrix.jl
@@ -306,8 +318,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/sparse/spqr.jl
 %%DATADIR%%/base/sparse/umfpack.jl
 %%DATADIR%%/base/sparse/umfpack_h.jl
-%%DATADIR%%/base/special/bessel.jl
-%%DATADIR%%/base/special/erf.jl
+%%DATADIR%%/base/special/exp.jl
 %%DATADIR%%/base/special/gamma.jl
 %%DATADIR%%/base/special/log.jl
 %%DATADIR%%/base/special/trig.jl
@@ -325,6 +336,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/strings/utf8proc.jl
 %%DATADIR%%/base/strings/util.jl
 %%DATADIR%%/base/subarray.jl
+%%DATADIR%%/base/summarysize.jl
 %%DATADIR%%/base/sysimg.jl
 %%DATADIR%%/base/sysinfo.jl
 %%DATADIR%%/base/task.jl
@@ -332,19 +344,21 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/base/threadcall.jl
 %%DATADIR%%/base/threadingconstructs.jl
 %%DATADIR%%/base/threads.jl
+%%DATADIR%%/base/traits.jl
 %%DATADIR%%/base/tuple.jl
+%%DATADIR%%/base/twiceprecision.jl
 %%DATADIR%%/base/util.jl
 %%DATADIR%%/base/uv_constants.jl
 %%DATADIR%%/base/version.jl
 %%DATADIR%%/base/version_git.jl
 %%DATADIR%%/base/weakkeydict.jl
-%%DATADIR%%/base/workerpool.jl
 %%DATADIR%%/build_sysimg.jl
 %%DATADIR%%/julia-config.jl
 %%DATADIR%%/test/TestHelpers.jl
 %%DATADIR%%/test/abstractarray.jl
 %%DATADIR%%/test/ambiguous.jl
 %%DATADIR%%/test/arrayops.jl
+%%DATADIR%%/test/asmvariant.jl
 %%DATADIR%%/test/backtrace.jl
 %%DATADIR%%/test/base64.jl
 %%DATADIR%%/test/bigfloat.jl
@@ -356,6 +370,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/test/broadcast.jl
 %%DATADIR%%/test/cartesian.jl
 %%DATADIR%%/test/ccall.jl
+%%DATADIR%%/test/channels.jl
 %%DATADIR%%/test/char.jl
 %%DATADIR%%/test/checked.jl
 %%DATADIR%%/test/choosetests.jl
@@ -366,7 +381,6 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/test/copy.jl
 %%DATADIR%%/test/core.jl
 %%DATADIR%%/test/datafmt.jl
-%%DATADIR%%/test/dates.jl
 %%DATADIR%%/test/dates/accessors.jl
 %%DATADIR%%/test/dates/adjusters.jl
 %%DATADIR%%/test/dates/arithmetic.jl
@@ -378,7 +392,11 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/test/dates/rounding.jl
 %%DATADIR%%/test/dates/types.jl
 %%DATADIR%%/test/dict.jl
+%%DATADIR%%/test/dimensionful.jl
+%%DATADIR%%/test/distributed.jl
+%%DATADIR%%/test/distributed_exec.jl
 %%DATADIR%%/test/docs.jl
+%%DATADIR%%/test/download.jl
 %%DATADIR%%/test/dsp.jl
 %%DATADIR%%/test/enums.jl
 %%DATADIR%%/test/env.jl
@@ -400,16 +418,27 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/test/inline.jl
 %%DATADIR%%/test/int.jl
 %%DATADIR%%/test/intfuncs.jl
+%%DATADIR%%/test/intrinsics.jl
 %%DATADIR%%/test/intset.jl
 %%DATADIR%%/test/iobuffer.jl
+%%DATADIR%%/test/iostream.jl
+%%DATADIR%%/test/iterators.jl
 %%DATADIR%%/test/keywordargs.jl
 %%DATADIR%%/test/libdl.jl
+%%DATADIR%%/test/libgit2-helpers.jl
 %%DATADIR%%/test/libgit2-online.jl
 %%DATADIR%%/test/libgit2.jl
+%%DATADIR%%/test/libgit2/invalid
+%%DATADIR%%/test/libgit2/invalid.pub
+%%DATADIR%%/test/libgit2/valid
+%%DATADIR%%/test/libgit2/valid-passphrase
+%%DATADIR%%/test/libgit2/valid-passphrase.pub
+%%DATADIR%%/test/libgit2/valid.pub
 %%DATADIR%%/test/linalg/arnoldi.jl
 %%DATADIR%%/test/linalg/bidiag.jl
 %%DATADIR%%/test/linalg/bunchkaufman.jl
 %%DATADIR%%/test/linalg/cholesky.jl
+%%DATADIR%%/test/linalg/conjarray.jl
 %%DATADIR%%/test/linalg/dense.jl
 %%DATADIR%%/test/linalg/diagonal.jl
 %%DATADIR%%/test/linalg/eigen.jl
@@ -422,6 +451,7 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/test/linalg/matmul.jl
 %%DATADIR%%/test/linalg/pinv.jl
 %%DATADIR%%/test/linalg/qr.jl
+%%DATADIR%%/test/linalg/rowvector.jl
 %%DATADIR%%/test/linalg/schur.jl
 %%DATADIR%%/test/linalg/special.jl
 %%DATADIR%%/test/linalg/svd.jl
@@ -431,6 +461,10 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/test/linalg/uniformscaling.jl
 %%DATADIR%%/test/lineedit.jl
 %%DATADIR%%/test/llvmcall.jl
+%%DATADIR%%/test/llvmcall2.jl
+%%DATADIR%%/test/llvmpasses/Makefile
+%%DATADIR%%/test/llvmpasses/lit.cfg
+%%DATADIR%%/test/llvmpasses/simdloop.ll
 %%DATADIR%%/test/loading.jl
 %%DATADIR%%/test/markdown.jl
 %%DATADIR%%/test/math.jl
@@ -445,14 +479,12 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/test/numbers.jl
 %%DATADIR%%/test/offsetarray.jl
 %%DATADIR%%/test/operators.jl
-%%DATADIR%%/test/parallel.jl
-%%DATADIR%%/test/parallel_exec.jl
+%%DATADIR%%/test/osutils.jl
 %%DATADIR%%/test/parse.jl
 %%DATADIR%%/test/path.jl
 %%DATADIR%%/test/pkg.jl
 %%DATADIR%%/test/pollfd.jl
 %%DATADIR%%/test/printf.jl
-%%DATADIR%%/test/priorityqueue.jl
 %%DATADIR%%/test/profile.jl
 %%DATADIR%%/test/random.jl
 %%DATADIR%%/test/ranges.jl
@@ -474,37 +506,42 @@ lib/libjulia.so.0.5.2
 %%DATADIR%%/test/simdloop.jl
 %%DATADIR%%/test/socket.jl
 %%DATADIR%%/test/sorting.jl
-%%DATADIR%%/test/sparse.jl
-%%DATADIR%%/test/sparsedir/cholmod.jl
-%%DATADIR%%/test/sparsedir/sparse.jl
-%%DATADIR%%/test/sparsedir/sparsevector.jl
-%%DATADIR%%/test/sparsedir/spqr.jl
-%%DATADIR%%/test/sparsedir/umfpack.jl
+%%DATADIR%%/test/sparse/cholmod.jl
+%%DATADIR%%/test/sparse/higherorderfns.jl
+%%DATADIR%%/test/sparse/sparse.jl
+%%DATADIR%%/test/sparse/sparsevector.jl
+%%DATADIR%%/test/sparse/spqr.jl
+%%DATADIR%%/test/sparse/umfpack.jl
 %%DATADIR%%/test/spawn.jl
+%%DATADIR%%/test/specificity.jl
 %%DATADIR%%/test/stacktraces.jl
 %%DATADIR%%/test/staged.jl
 %%DATADIR%%/test/statistics.jl
-%%DATADIR%%/test/string.jl
 %%DATADIR%%/test/strings/basic.jl
 %%DATADIR%%/test/strings/io.jl
 %%DATADIR%%/test/strings/search.jl
 %%DATADIR%%/test/strings/types.jl
 %%DATADIR%%/test/strings/util.jl
 %%DATADIR%%/test/subarray.jl
+%%DATADIR%%/test/subtype.jl
 %%DATADIR%%/test/sysinfo.jl
 %%DATADIR%%/test/test.jl
+%%DATADIR%%/test/test_exec.jl
 %%DATADIR%%/test/test_sourcepath.jl
 %%DATADIR%%/test/testdefs.jl
+%%DATADIR%%/test/testenv.jl
 %%DATADIR%%/test/threads.jl
 %%DATADIR%%/test/topology.jl
 %%DATADIR%%/test/triplequote.jl
 %%DATADIR%%/test/tuple.jl
-%%DATADIR%%/test/unicode.jl
 %%DATADIR%%/test/unicode/UnicodeError.jl
 %%DATADIR%%/test/unicode/utf8.jl
 %%DATADIR%%/test/unicode/utf8proc.jl
+%%DATADIR%%/test/util/segfault.jl
+%%DATADIR%%/test/util/throw_error_exception.jl
 %%DATADIR%%/test/vecelement.jl
 %%DATADIR%%/test/version.jl
 %%DATADIR%%/test/workspace.jl
+%%DATADIR%%/test/worlds.jl
 man/man1/julia.1.gz
-@dir %%DATADIR%%/site/v0.5
+@dir %%DATADIR%%/site/v%%VERSION%%