svn commit: r502855 - in head/lang: . julia11 julia11/files

[Alexey Dokuchaev]

On Tue, May 28, 2019 at 06:01:00AM +0000, Li-Wen Hsu wrote:
> New Revision: 502855
> URL: https://svnweb.freebsd.org/changeset/ports/502855
> 
> Modified: head/lang/julia11/files/patch-Make.inc
> ==============================================================================
> --- head/lang/julia10/files/patch-Make.inc	Tue May 28 05:59:00 2019	(r502854)
> +++ head/lang/julia11/files/patch-Make.inc	Tue May 28 06:00:59 2019	(r502855)
> @@ -1,6 +1,6 @@
> ---- Make.inc.orig	2018-12-18 01:38:57 UTC
> +--- Make.inc.orig	2019-01-13 00:25:11 UTC
>  +++ Make.inc
> -@@ -130,12 +130,7 @@ endif
> +@@ -134,12 +134,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
> -@@ -185,7 +180,7 @@ libdir := $(prefix)/lib
> +@@ -189,7 +184,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
> -@@ -198,7 +193,7 @@ build_depsbindir := $(build_prefix)/tools
> +@@ -202,7 +197,7 @@ build_depsbindir := $(build_prefix)/tools
>   build_libdir := $(build_prefix)/lib
>   build_libexecdir := $(build_prefix)/libexec
>   build_datarootdir := $(build_prefix)/share
> @@ -31,7 +31,7 @@
>   build_man1dir := $(build_mandir)/man1
>   build_includedir := $(build_prefix)/include
>   build_sysconfdir := $(build_prefix)/etc
> -@@ -364,7 +359,7 @@ endif
> +@@ -367,7 +362,7 @@ endif
>   ifeq ($(USEIFC), 1)
>   FC := ifort
>   else
> @@ -40,7 +40,7 @@
>   endif
>   
>   STDLIBCPP_FLAG :=
> -@@ -417,8 +412,8 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
> +@@ -420,8 +415,8 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
>   endif
>   
>   ifeq ($(USECLANG),1)
> 
> Modified: head/lang/julia11/files/patch-Makefile
> ==============================================================================
> --- head/lang/julia10/files/patch-Makefile	Tue May 28 05:59:00 2019	(r502854)
> +++ head/lang/julia11/files/patch-Makefile	Tue May 28 06:00:59 2019	(r502855)
> @@ -1,6 +1,6 @@
> ---- Makefile.orig	2018-12-18 01:38:57 UTC
> +--- Makefile.orig	2019-01-13 00:25:11 UTC
>  +++ Makefile
> -@@ -264,24 +264,6 @@ endif
> +@@ -265,24 +265,6 @@ endif
>   endif
>   endif
>   
> @@ -25,7 +25,7 @@
>   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
> +@@ -329,8 +311,7 @@ JL_PRIVATE_LIBS-0 += libgfortran libgcc_s libquadmath
>   endif
>   
>   
> @@ -35,7 +35,7 @@
>   	@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
> +@@ -373,10 +354,6 @@ endif
>   			fi \
>   		done \
>   	done
> @@ -46,7 +46,7 @@
>   endif
>   
>   	# Copy public headers
> -@@ -389,8 +366,6 @@ endif
> +@@ -391,8 +368,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)/
> @@ -55,7 +55,7 @@
>   	# 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
> +@@ -402,16 +377,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)/
> @@ -72,7 +72,7 @@
>   
>   	# 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)
> +@@ -422,7 +387,7 @@ ifeq ($(OS), Darwin)
>   	done
>   else ifneq (,$(findstring $(OS),Linux FreeBSD))
>   	for j in $(JL_TARGETS) ; do \
> @@ -81,7 +81,7 @@
>   	done
>   endif
>   
> -@@ -431,22 +396,24 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1)
> +@@ -433,22 +398,24 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1)
>   endif
>   
>   endif

Please, try to drop the patches where changes are mostly context and/or
line numbers (and if they apply cleanly as-is) from the commit batch to
reduce the repo churn and make commit less noisy.  Thank you,

./danfe