diff --git a/lang/julia/Makefile b/lang/julia/Makefile index 50b0917f648e..45e85c002219 100644 --- a/lang/julia/Makefile +++ b/lang/julia/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= julia -PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTVERSION= 0.5.2 DISTVERSIONSUFFIX= -full CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ diff --git a/lang/julia/distinfo b/lang/julia/distinfo index 389a02c99b96..72fdceaf0439 100644 --- a/lang/julia/distinfo +++ b/lang/julia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488773295 -SHA256 (julia-0.5.1-full.tar.gz) = 533b6427a1b01bd38ea0601f58a32d15bf403f491b8415e9ce4305b8bc83bb21 -SIZE (julia-0.5.1-full.tar.gz) = 93326909 +TIMESTAMP = 1495877395 +SHA256 (julia-0.5.2-full.tar.gz) = f5ef56d79ed55eacba9fe968bb175317be3f61668ef93e747d76607678cc01dd +SIZE (julia-0.5.2-full.tar.gz) = 93374133 diff --git a/lang/julia/files/patch-Make.inc b/lang/julia/files/patch-Make.inc index 965b62a3abb1..bbf92669da90 100644 --- a/lang/julia/files/patch-Make.inc +++ b/lang/julia/files/patch-Make.inc @@ -1,4 +1,4 @@ ---- Make.inc.orig 2016-09-20 02:54:21 UTC +--- Make.inc.orig 2017-05-08 07:00:02 UTC +++ Make.inc @@ -128,12 +128,7 @@ endif # disable automatic Makefile rules @@ -40,7 +40,7 @@ endif STDLIBCPP_FLAG := -@@ -393,14 +388,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-function +@@ -393,14 +388,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions endif ifeq ($(USECLANG),1) @@ -58,7 +58,7 @@ ifeq ($(OS), Darwin) ifeq ($(USE_LIBCPP), 1) CC += -stdlib=libc++ -mmacosx-version-min=10.7 -@@ -832,7 +827,7 @@ endif +@@ -833,7 +828,7 @@ endif ifeq ($(USE_SYSTEM_UTF8PROC), 1) LIBUTF8PROC := -lutf8proc diff --git a/lang/julia/files/patch-Make.user b/lang/julia/files/patch-Make.user index b5af34508718..c8a6846f1bc1 100644 --- a/lang/julia/files/patch-Make.user +++ b/lang/julia/files/patch-Make.user @@ -1,4 +1,4 @@ ---- Make.user.orig 2017-02-26 09:48:03 UTC +--- Make.user.orig 2017-06-13 16:28:17 UTC +++ Make.user @@ -0,0 +1,23 @@ +USE_SYSTEM_BLAS= 1 diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index 91e7e3bdf5a0..29ecc13e278a 100644 --- a/lang/julia/files/patch-Makefile +++ b/lang/julia/files/patch-Makefile @@ -1,16 +1,27 @@ ---- Makefile.orig 2017-03-06 03:32:23 UTC +--- Makefile.orig 2017-05-08 07:00:02 UTC +++ Makefile -@@ -328,8 +328,7 @@ define stringreplace +@@ -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/ + @echo 1 > $@ + + julia-symlink: julia-ui-$(JULIA_BUILD_MODE) +@@ -328,7 +323,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 -- @$(MAKE) $(QUIET_MAKE) all -+install: $(build_depsbindir)/stringreplace default ++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 \ mkdir -p $(DESTDIR)$$subdir; \ - done -@@ -389,10 +388,6 @@ endif +@@ -389,10 +384,6 @@ endif $(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/ # Copy in all .jl sources as well cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/ @@ -21,7 +32,7 @@ # Remove perf suite -rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/ # Remove various files which should not be installed -@@ -400,38 +395,44 @@ endif +@@ -400,38 +391,44 @@ endif -rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile # Copy in beautiful new man page $(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/ @@ -43,7 +54,7 @@ ifeq ($(OS), Darwin) for julia in $(DESTDIR)$(bindir)/julia* ; do \ install_name_tool -rpath @executable_path/$(build_private_libdir_rel) @executable_path/$(private_libdir_rel) $$julia; \ - install_name_tool -rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \ + install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \ done -else ifeq ($(OS), Linux) +else @@ -61,7 +72,6 @@ cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/ +install-docs: -+ mkdir -p $(DESTDIR)$(docdir)/ + cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/ + rm $(DESTDIR)$(docdir)/html/.buildinfo + @@ -74,6 +84,7 @@ + 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 diff --git a/lang/julia/files/patch-base_Terminals.jl b/lang/julia/files/patch-base_Terminals.jl index 618c31b7f1fe..bbd562c45c30 100644 --- a/lang/julia/files/patch-base_Terminals.jl +++ b/lang/julia/files/patch-base_Terminals.jl @@ -1,4 +1,4 @@ ---- base/Terminals.jl.orig 2017-02-19 14:49:03 UTC +--- base/Terminals.jl.orig 2017-05-08 07:00:02 UTC +++ base/Terminals.jl @@ -156,7 +156,7 @@ else function hascolor(t::TTYTerminal) diff --git a/lang/julia/files/patch-base_libdl.jl b/lang/julia/files/patch-base_libdl.jl index 72e208a35dd9..bc9cab592ad6 100644 --- a/lang/julia/files/patch-base_libdl.jl +++ b/lang/julia/files/patch-base_libdl.jl @@ -1,4 +1,4 @@ ---- base/libdl.jl.orig 2016-09-20 02:54:21 UTC +--- base/libdl.jl.orig 2017-05-08 07:00:02 UTC +++ base/libdl.jl @@ -198,6 +198,31 @@ if is_linux() end diff --git a/lang/julia/files/patch-base_mmap.jl b/lang/julia/files/patch-base_mmap.jl index 1eefb32d88ab..78a747aefb5d 100644 --- a/lang/julia/files/patch-base_mmap.jl +++ b/lang/julia/files/patch-base_mmap.jl @@ -1,4 +1,4 @@ ---- base/mmap.jl.orig 2017-02-23 09:50:38 UTC +--- base/mmap.jl.orig 2017-05-08 07:00:02 UTC +++ base/mmap.jl @@ -27,7 +27,7 @@ const PROT_READ = Cint(1) const PROT_WRITE = Cint(2) diff --git a/lang/julia/files/patch-base_sharedarray.jl b/lang/julia/files/patch-base_sharedarray.jl index 81da304186d8..d2fe659442ef 100644 --- a/lang/julia/files/patch-base_sharedarray.jl +++ b/lang/julia/files/patch-base_sharedarray.jl @@ -1,4 +1,4 @@ ---- base/sharedarray.jl.orig 2017-02-23 09:55:38 UTC +--- base/sharedarray.jl.orig 2017-05-08 07:00:02 UTC +++ base/sharedarray.jl @@ -477,13 +477,7 @@ complex(S1::SharedArray,S2::SharedArray) diff --git a/lang/julia/files/patch-base_socket.jl b/lang/julia/files/patch-base_socket.jl index e57755988392..0e00da91ec6f 100644 --- a/lang/julia/files/patch-base_socket.jl +++ b/lang/julia/files/patch-base_socket.jl @@ -1,4 +1,4 @@ ---- base/socket.jl.orig 2017-02-24 09:57:14 UTC +--- base/socket.jl.orig 2017-05-08 07:00:02 UTC +++ base/socket.jl @@ -762,7 +762,7 @@ function getsockname(sock::Union{TCPServ addrv4 = raddress[1:4] diff --git a/lang/julia/files/patch-deps_suitesparse.mk b/lang/julia/files/patch-deps_suitesparse.mk index 31a04009761d..0b24ae86cc2f 100644 --- a/lang/julia/files/patch-deps_suitesparse.mk +++ b/lang/julia/files/patch-deps_suitesparse.mk @@ -1,4 +1,4 @@ ---- deps/suitesparse.mk.orig 2016-09-20 02:54:21 UTC +--- deps/suitesparse.mk.orig 2017-05-08 07:00:02 UTC +++ deps/suitesparse.mk @@ -93,7 +93,7 @@ install-suitesparse: $(SUITESPARSE_OBJ_T # SUITESPARSE WRAPPER diff --git a/lang/julia/files/patch-src_Makefile b/lang/julia/files/patch-src_Makefile index 1afb292e5b6c..b5b845c5af0b 100644 --- a/lang/julia/files/patch-src_Makefile +++ b/lang/julia/files/patch-src_Makefile @@ -1,4 +1,4 @@ ---- src/Makefile.orig 2017-03-06 03:32:23 UTC +--- src/Makefile.orig 2017-05-08 07:00:03 UTC +++ src/Makefile @@ -9,7 +9,7 @@ override CFLAGS += $(JCFLAGS) ifeq ($(LLVM_VER),3.3) diff --git a/lang/julia/files/patch-ui_Makefile b/lang/julia/files/patch-ui_Makefile index e6878e287919..9acca0730eba 100644 --- a/lang/julia/files/patch-ui_Makefile +++ b/lang/julia/files/patch-ui_Makefile @@ -1,4 +1,4 @@ ---- ui/Makefile.orig 2016-09-20 02:54:22 UTC +--- ui/Makefile.orig 2017-05-08 07:00:03 UTC +++ ui/Makefile @@ -66,10 +66,12 @@ else CXXLD := $(LD) diff --git a/lang/julia/pkg-plist b/lang/julia/pkg-plist index af79c976d798..1e4565a3c99e 100644 --- a/lang/julia/pkg-plist +++ b/lang/julia/pkg-plist @@ -49,10 +49,10 @@ lib/julia/libopenspecfun.so.1.3 lib/julia/sys.so %%DEBUG%%lib/libjulia-debug.so %%DEBUG%%lib/libjulia-debug.so.0.5 -%%DEBUG%%lib/libjulia-debug.so.0.5.1 +%%DEBUG%%lib/libjulia-debug.so.0.5.2 lib/libjulia.so lib/libjulia.so.0.5 -lib/libjulia.so.0.5.1 +lib/libjulia.so.0.5.2 %%DESKTOP%%share/appdata/julia.appdata.xml %%DESKTOP%%share/applications/julia.desktop %%DESKTOP%%share/icons/hicolor/scalable/apps/julia.svg @@ -465,6 +465,7 @@ lib/libjulia.so.0.5.1 %%DATADIR%%/test/replcompletions.jl %%DATADIR%%/test/replutil.jl %%DATADIR%%/test/resolve.jl +%%DATADIR%%/test/resolvedata1.jl %%DATADIR%%/test/rounding.jl %%DATADIR%%/test/runtests.jl %%DATADIR%%/test/serialize.jl