Attachment #183472 for bug #219959

Lines 2-9 Link Here

(-)b/lang/julia/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= julia	4	PORTNAME= julia
5	PORTVERSION= 0.5.1	5	PORTVERSION= 0.5.2
6	PORTREVISION= 1
7	DISTVERSIONSUFFIX= -full	6	DISTVERSIONSUFFIX= -full
8	CATEGORIES= lang math	7	CATEGORIES= lang math
9	MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/	8	MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/

Lines 1-3 Link Here

(-)b/lang/julia/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1488773295	1	TIMESTAMP = 1495877395
2	SHA256 (julia-0.5.1-full.tar.gz) = 533b6427a1b01bd38ea0601f58a32d15bf403f491b8415e9ce4305b8bc83bb21	2	SHA256 (julia-0.5.2-full.tar.gz) = f5ef56d79ed55eacba9fe968bb175317be3f61668ef93e747d76607678cc01dd
3	SIZE (julia-0.5.1-full.tar.gz) = 93326909	3	SIZE (julia-0.5.2-full.tar.gz) = 93374133

Lines 1-4 Link Here

(-)b/lang/julia/files/patch-Make.inc (-3 / +3 lines)
1	--- Make.inc.orig 2016-09-20 02:54:21 UTC	1	--- Make.inc.orig 2017-05-08 07:00:02 UTC
2	+++ Make.inc	2	+++ Make.inc
3	@@ -128,12 +128,7 @@ endif	3	@@ -128,12 +128,7 @@ endif
4	# disable automatic Makefile rules	4	# disable automatic Makefile rules
Lines 40-46 Link Here
40	endif	40	endif
41		41
42	STDLIBCPP_FLAG :=	42	STDLIBCPP_FLAG :=
43	@@ -393,14 +388,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-function	43	@@ -393,14 +388,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
44	endif	44	endif
45		45
46	ifeq ($(USECLANG),1)	46	ifeq ($(USECLANG),1)
Lines 58-64 Link Here
58	ifeq ($(OS), Darwin)	58	ifeq ($(OS), Darwin)
59	ifeq ($(USE_LIBCPP), 1)	59	ifeq ($(USE_LIBCPP), 1)
60	CC += -stdlib=libc++ -mmacosx-version-min=10.7	60	CC += -stdlib=libc++ -mmacosx-version-min=10.7
61	@@ -832,7 +827,7 @@ endif	61	@@ -833,7 +828,7 @@ endif
62		62
63	ifeq ($(USE_SYSTEM_UTF8PROC), 1)	63	ifeq ($(USE_SYSTEM_UTF8PROC), 1)
64	LIBUTF8PROC := -lutf8proc	64	LIBUTF8PROC := -lutf8proc




--- Makefile.orig	2017-05-08 07:00:02 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/
 	@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
+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; \
@@ -389,10 +384,6 @@ endif
@@ -389,10 +388,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)/

 	# Remove perf suite
 	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
 	# Remove various files which should not be installed
@@ -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)/

 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 -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \
 	done
-else ifeq ($(OS), Linux)
+else

 	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
+

+	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




lib/julia/sys.so
%%DEBUG%%lib/libjulia-debug.so
%%DEBUG%%lib/libjulia-debug.so.0.5
%%DEBUG%%lib/libjulia-debug.so.0.5.2
lib/libjulia.so
lib/libjulia.so.0.5
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

%%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

Return to bug 219959

Lines 1-16 Link Here

(-)b/lang/julia/files/patch-Makefile (-9 / +20 lines)
1	--- Makefile.orig 2017-03-06 03:32:23 UTC	1	--- Makefile.orig 2017-05-08 07:00:02 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -328,8 +328,7 @@ define stringreplace	3	@@ -63,11 +63,6 @@ CLEAN_TARGETS += clean-docdir
		4	clean-docdir:
		5	@-rm -fr $(abspath $(build_docdir))
		6	$(build_prefix)/.examples: $(wildcard $(JULIAHOME)/examples/*.jl) $(shell find $(JULIAHOME)/examples/clustermanager)
		7	- @echo Copying in usr/share/doc/julia/examples
		8	- @-rm -fr $(build_docdir)/examples
		9	- @mkdir -p $(build_docdir)/examples
		10	- @cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/
		11	- @cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/
		12	@echo 1 > $@
		13
		14	julia-symlink: julia-ui-$(JULIA_BUILD_MODE)
		15	@@ -328,7 +323,7 @@ define stringreplace
4	$(build_depsbindir)/stringreplace $$(strings -t x - $1 \| grep '$2' \| awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"	16	$(build_depsbindir)/stringreplace $$(strings -t x - $1 \| grep '$2' \| awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
5	endef	17	endef
6		18
7	-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html	19	-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html
8	- @$(MAKE) $(QUIET_MAKE) all	20	+install: $(build_depsbindir)/stringreplace
9	+install: $(build_depsbindir)/stringreplace default	21	@$(MAKE) $(QUIET_MAKE) all
10	@for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \	22	@for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
11	mkdir -p $(DESTDIR)$$subdir; \	23	mkdir -p $(DESTDIR)$$subdir; \
12	done	24	@@ -389,10 +384,6 @@ endif
13	@@ -389,10 +388,6 @@ endif
14	$(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/	25	$(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/
15	# Copy in all .jl sources as well	26	# Copy in all .jl sources as well
16	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/	27	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/
Lines 21-27 Link Here
21	# Remove perf suite	32	# Remove perf suite
22	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/	33	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
23	# Remove various files which should not be installed	34	# Remove various files which should not be installed
24	@@ -400,38 +395,44 @@ endif	35	@@ -400,38 +391,44 @@ endif
25	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile	36	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
26	# Copy in beautiful new man page	37	# Copy in beautiful new man page
27	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/	38	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
Lines 43-49 Link Here
43	ifeq ($(OS), Darwin)	54	ifeq ($(OS), Darwin)
44	for julia in $(DESTDIR)$(bindir)/julia* ; do \	55	for julia in $(DESTDIR)$(bindir)/julia* ; do \
45	install_name_tool -rpath @executable_path/$(build_private_libdir_rel) @executable_path/$(private_libdir_rel) $$julia; \	56	install_name_tool -rpath @executable_path/$(build_private_libdir_rel) @executable_path/$(private_libdir_rel) $$julia; \
46	install_name_tool -rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \	57	install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \
47	done	58	done
48	-else ifeq ($(OS), Linux)	59	-else ifeq ($(OS), Linux)
49	+else	60	+else
Lines 61-67 Link Here
61	cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/	72	cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
62		73
63	+install-docs:	74	+install-docs:
64	+ mkdir -p $(DESTDIR)$(docdir)/
65	+ cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/	75	+ cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
66	+ rm $(DESTDIR)$(docdir)/html/.buildinfo	76	+ rm $(DESTDIR)$(docdir)/html/.buildinfo
67	+	77	+
Lines 74-79 Link Here
74	+ mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/	84	+ mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
75	+ $(INSTALL_F) $(JULIAHOME)/contrib/julia.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/	85	+ $(INSTALL_F) $(JULIAHOME)/contrib/julia.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
76	+ -touch -c $(DESTDIR)$(datarootdir)/icons/hicolor/	86	+ -touch -c $(DESTDIR)$(datarootdir)/icons/hicolor/
		87	+ -gtk-update-icon-cache $(DESTDIR)$(datarootdir)/icons/hicolor/
77	+ mkdir -p $(DESTDIR)$(datarootdir)/applications/	88	+ mkdir -p $(DESTDIR)$(datarootdir)/applications/
78	+ $(INSTALL_F) $(JULIAHOME)/contrib/julia.desktop $(DESTDIR)$(datarootdir)/applications/	89	+ $(INSTALL_F) $(JULIAHOME)/contrib/julia.desktop $(DESTDIR)$(datarootdir)/applications/
79	+ # Install appdata file	90	+ # Install appdata file

Lines 49-58 lib/julia/libopenspecfun.so.1.3 Link Here

(-)b/lang/julia/pkg-plist (-2 / +3 lines)
49	lib/julia/sys.so	49	lib/julia/sys.so
50	%%DEBUG%%lib/libjulia-debug.so	50	%%DEBUG%%lib/libjulia-debug.so
51	%%DEBUG%%lib/libjulia-debug.so.0.5	51	%%DEBUG%%lib/libjulia-debug.so.0.5
52	%%DEBUG%%lib/libjulia-debug.so.0.5.1	52	%%DEBUG%%lib/libjulia-debug.so.0.5.2
53	lib/libjulia.so	53	lib/libjulia.so
54	lib/libjulia.so.0.5	54	lib/libjulia.so.0.5
55	lib/libjulia.so.0.5.1	55	lib/libjulia.so.0.5.2
56	%%DESKTOP%%share/appdata/julia.appdata.xml	56	%%DESKTOP%%share/appdata/julia.appdata.xml
57	%%DESKTOP%%share/applications/julia.desktop	57	%%DESKTOP%%share/applications/julia.desktop
58	%%DESKTOP%%share/icons/hicolor/scalable/apps/julia.svg	58	%%DESKTOP%%share/icons/hicolor/scalable/apps/julia.svg
Lines 465-470 lib/libjulia.so.0.5.1 Link Here
465	%%DATADIR%%/test/replcompletions.jl	465	%%DATADIR%%/test/replcompletions.jl
466	%%DATADIR%%/test/replutil.jl	466	%%DATADIR%%/test/replutil.jl
467	%%DATADIR%%/test/resolve.jl	467	%%DATADIR%%/test/resolve.jl
		468	%%DATADIR%%/test/resolvedata1.jl
468	%%DATADIR%%/test/rounding.jl	469	%%DATADIR%%/test/rounding.jl
469	%%DATADIR%%/test/runtests.jl	470	%%DATADIR%%/test/runtests.jl
470	%%DATADIR%%/test/serialize.jl	471	%%DATADIR%%/test/serialize.jl