Attachment #200356 for bug #234266

View | Details | Raw Unified | Return to bug 234266
Collapse All | Expand All

Lines 2-9 Link Here

(-)b/lang/julia/Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= julia	4	PORTNAME= julia
5	PORTVERSION= 1.0.2	5	PORTVERSION= 1.0.3
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 32-38 BUILD_DEPENDS= patchelf:sysutils/patchelf \ Link Here
32	USES= gmake compiler:c++11-lib fortran python:2.7,build perl5	31	USES= gmake compiler:c++11-lib fortran python:2.7,build perl5
33	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
34		33
35	WRKSRC= ${WRKDIR}/${PORTNAME}	34	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
36		35
37	ALL_TARGET= default	36	ALL_TARGET= default
38	INSTALL_TARGET= install	37	INSTALL_TARGET= install

Lines 1-3 Link Here

(-)b/lang/julia/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1541862400	1	TIMESTAMP = 1545107140
2	SHA256 (julia-1.0.2-full.tar.gz) = 74c850516b293029fcefb1114145c424cab64e1d2f87264350d88a237f5f8bc5	2	SHA256 (julia-1.0.3-full.tar.gz) = 618e6d29f1fba00f5b2bebf14e69a3a536c27c3132e021cf39774e8500dd29fa
3	SIZE (julia-1.0.2-full.tar.gz) = 95704004	3	SIZE (julia-1.0.3-full.tar.gz) = 95732731




--- Makefile.orig	2018-12-18 01:38:57 UTC
+++ Makefile
@@ -264,24 +264,6 @@ endif
 endif
 endif
 

 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

 	@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

 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)/

 	# 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

-	# 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)
@@ -403,7 +367,7 @@ ifeq ($(OS), Darwin)
 	done
 else ifneq (,$(findstring $(OS),Linux FreeBSD))
 	for j in $(JL_TARGETS) ; do \

 	done
 endif
 
@@ -431,22 +396,24 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1)
 endif
 
 endif

+	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)

Lines 1-15 Link Here

(-)b/lang/julia/files/patch-stdlib_Makefile (-8 / +12 lines)
1	--- stdlib/Makefile.orig 2018-11-08 20:15:38 UTC	1	--- stdlib/Makefile.orig 2018-12-16 21:26:52 UTC
2	+++ stdlib/Makefile	2	+++ stdlib/Makefile
3	@@ -21,6 +21,12 @@ $(eval $(call git-external,Pkg,PKG,,,$(BUILDDIR)))	3	@@ -25,8 +25,15 @@ PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git
4	extract-pkg: $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted	4	PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1
5	Pkg: $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted	5	$(eval $(call git-external,Pkg,PKG,,,$(BUILDDIR)))
6	rm -rf $@	6	$(BUILDDIR)/$(PKG_SRC_DIR)/build-compiled: $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted
		7	- @# no build steps
		8	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/.gitignore
7	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/.codecov.yml	9	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/.codecov.yml
8	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/.travis.yml	10	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/.travis.yml
9	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/appveyor.yml	11	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/appveyor.yml
10	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/ext/TOML/.travis.yml	12	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/ext/TOML/.travis.yml
11	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/ext/TOML/appveyor.yml	13	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/ext/TOML/appveyor.yml
12	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted	14	+ rm $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted
13	cp -r $(BUILDDIR)/$(PKG_SRC_DIR) $@	15	echo 1 > $@
14	get-pkg: Pkg	16	+
15	clean-pkg:	17	$(eval $(call symlink_install,Pkg,$$(PKG_SRC_DIR),$$(build_datarootdir)/julia/stdlib/$$(VERSDIR)))
		18	clean-Pkg:
		19	-rm $(BUILDDIR)/$(PKG_SRC_DIR)/build-compiled

Return to bug 234266

Lines 1-6 Link Here

(-)b/lang/julia/files/patch-Makefile (-12 / +13 lines)
1	--- Makefile.orig 2018-08-02 19:21:47 UTC	1	--- Makefile.orig 2018-12-18 01:38:57 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -266,24 +266,6 @@ endif	3	@@ -264,24 +264,6 @@ endif
4	endif	4	endif
5	endif	5	endif
6		6
Lines 25-33 Link Here
25	ifeq ($(OS),WINNT)	25	ifeq ($(OS),WINNT)
26	define std_dll	26	define std_dll
27	julia-deps: \| $$(build_bindir)/lib$(1).dll $$(build_depsbindir)/lib$(1).dll	27	julia-deps: \| $$(build_bindir)/lib$(1).dll $$(build_depsbindir)/lib$(1).dll
28	@@ -316,8 +298,7 @@ define stringreplace	28	@@ -328,8 +310,7 @@ JL_PRIVATE_LIBS-0 += libgfortran libgcc_s libquadmath
29	$(build_depsbindir)/stringreplace $$(strings -t x - $1 \| grep '$2' \| awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"	29	endif
30	endef	30
31		31
32	-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html	32	-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
33	- @$(MAKE) $(QUIET_MAKE) all	33	- @$(MAKE) $(QUIET_MAKE) all
Lines 35-41 Link Here
35	@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \	35	@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
36	mkdir -p $(DESTDIR)$$subdir; \	36	mkdir -p $(DESTDIR)$$subdir; \
37	done	37	done
38	@@ -359,10 +340,6 @@ endif	38	@@ -371,10 +352,6 @@ endif
39	fi \	39	fi \
40	done \	40	done \
41	done	41	done
Lines 46-52 Link Here
46	endif	46	endif
47		47
48	# Copy public headers	48	# Copy public headers
49	@@ -376,24 +353,11 @@ endif	49	@@ -389,8 +366,6 @@ endif
50	$(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/	50	$(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/
51	# Copy in all .jl sources as well	51	# Copy in all .jl sources as well
52	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/	52	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/
Lines 55-60 Link Here
55	# Remove various files which should not be installed	55	# Remove various files which should not be installed
56	-rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh	56	-rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh
57	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile	57	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
		58	@@ -400,16 +375,6 @@ endif
		59	-rm -f $(DESTDIR)$(datarootdir)/julia/stdlib/$(VERSDIR)/*/build-checked
58	# Copy in beautiful new man page	60	# Copy in beautiful new man page
59	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/	61	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
60	- # Copy icon and .desktop file	62	- # Copy icon and .desktop file
Lines 67-77 Link Here
67	- # Install appdata file	69	- # Install appdata file
68	- mkdir -p $(DESTDIR)$(datarootdir)/appdata/	70	- mkdir -p $(DESTDIR)$(datarootdir)/appdata/
69	- $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/	71	- $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/
70	-	72
71	# Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel)	73	# Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel)
72	ifneq ($(private_libdir_rel),$(build_private_libdir_rel))	74	ifneq ($(private_libdir_rel),$(build_private_libdir_rel))
73	ifeq ($(OS), Darwin)	75	@@ -420,7 +385,7 @@ ifeq ($(OS), Darwin)
74	@@ -403,7 +367,7 @@ ifeq ($(OS), Darwin)
75	done	76	done
76	else ifneq (,$(findstring $(OS),Linux FreeBSD))	77	else ifneq (,$(findstring $(OS),Linux FreeBSD))
77	for j in $(JL_TARGETS) ; do \	78	for j in $(JL_TARGETS) ; do \
Lines 80-86 Link Here
80	done	81	done
81	endif	82	endif
82		83
83	@@ -414,22 +378,24 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1)	84	@@ -431,22 +396,24 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1)
84	endif	85	endif
85		86
86	endif	87	endif
Lines 117-121 Link Here
117	+ mkdir -p $(DESTDIR)$(datarootdir)/appdata/	118	+ mkdir -p $(DESTDIR)$(datarootdir)/appdata/
118	+ $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/	119	+ $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/
119		120
120	distclean dist-clean:	121	distclean:
121	-rm -fr $(BUILDROOT)/julia-.tar.gz $(BUILDROOT)/julia.exe $(BUILDROOT)/julia-*.7z $(BUILDROOT)/julia-$(JULIA_COMMIT)	122	-rm -fr $(BUILDROOT)/julia-.tar.gz $(BUILDROOT)/julia.exe $(BUILDROOT)/julia-*.7z $(BUILDROOT)/julia-$(JULIA_COMMIT)