From 036592cfccc2ec908a013c683182fe47a0baea8d Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 6 Jan 2017 15:11:49 +0100 Subject: [PATCH] dev-lang/elixir: bump to 1.4.0 --- ...1.3.4.exheres-0 => elixir-1.4.0.exheres-0} | 4 -- ...DIR-for-binaries-and-SHARE_PREFIX-fo.patch | 48 ------------------- 2 files changed, 52 deletions(-) rename packages/dev-lang/elixir/{elixir-1.3.4.exheres-0 => elixir-1.4.0.exheres-0} (91%) delete mode 100644 packages/dev-lang/elixir/files/0001-Allow-to-set-BINDIR-for-binaries-and-SHARE_PREFIX-fo.patch diff --git a/packages/dev-lang/elixir/elixir-1.3.4.exheres-0 b/packages/dev-lang/elixir/elixir-1.4.0.exheres-0 similarity index 91% rename from packages/dev-lang/elixir/elixir-1.3.4.exheres-0 rename to packages/dev-lang/elixir/elixir-1.4.0.exheres-0 index 110d1cfa..a4f0b6ba 100644 --- a/packages/dev-lang/elixir/elixir-1.3.4.exheres-0 +++ b/packages/dev-lang/elixir/elixir-1.4.0.exheres-0 @@ -17,10 +17,6 @@ DEPENDENCIES=" dev-lang/erlang[>=18] " -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/0001-Allow-to-set-BINDIR-for-binaries-and-SHARE_PREFIX-fo.patch -) - DEFAULT_SRC_COMPILE_PARAMS=( Q="" ) diff --git a/packages/dev-lang/elixir/files/0001-Allow-to-set-BINDIR-for-binaries-and-SHARE_PREFIX-fo.patch b/packages/dev-lang/elixir/files/0001-Allow-to-set-BINDIR-for-binaries-and-SHARE_PREFIX-fo.patch deleted file mode 100644 index 9e4b69c6..00000000 --- a/packages/dev-lang/elixir/files/0001-Allow-to-set-BINDIR-for-binaries-and-SHARE_PREFIX-fo.patch +++ /dev/null @@ -1,48 +0,0 @@ -Author: Julian Ospald -Reason: Allow to set BINDIR for binaries and SHARE_PREFIX for manpages -Upstream: merged, https://github.com/elixir-lang/elixir/commit/0f95aa76fbbc33494f5b01259f3eba4fd9f6bed4 - ---- elixir-1.3.0/Makefile -+++ elixir-1.3.0/Makefile -@@ -1,5 +1,6 @@ - REBAR ?= "$(CURDIR)/rebar" - PREFIX ?= /usr/local -+SHARE_PREFIX ?= $(PREFIX)/share - DOCS := v1.3 - CANONICAL := stable - ELIXIRC := bin/elixirc --verbose --ignore-module-conflict -@@ -8,6 +9,7 @@ - VERSION := $(strip $(shell cat VERSION)) - Q := @ - LIBDIR := lib -+BINDIR := bin - INSTALL = install - INSTALL_DIR = $(INSTALL) -m755 -d - INSTALL_DATA = $(INSTALL) -m644 -@@ -105,9 +107,9 @@ - done - $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin" - $(Q) $(INSTALL_PROGRAM) $(filter-out %.ps1, $(filter-out %.bat, $(wildcard bin/*))) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin" -- $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/bin" -+ $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(BINDIR)" - $(Q) for file in "$(DESTDIR)$(PREFIX)"/$(LIBDIR)/elixir/bin/* ; do \ -- ln -sf "../$(LIBDIR)/elixir/bin/$${file##*/}" "$(DESTDIR)$(PREFIX)/bin/" ; \ -+ ln -sf "../$(LIBDIR)/elixir/bin/$${file##*/}" "$(DESTDIR)$(PREFIX)/$(BINDIR)/" ; \ - done - $(MAKE) install_man - -@@ -255,9 +257,9 @@ - rm -f man/iex.1 - - install_man: build_man -- $(Q) mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 -- $(Q) $(INSTALL_DATA) man/elixir.1 $(DESTDIR)$(PREFIX)/share/man/man1 -- $(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(PREFIX)/share/man/man1 -- $(Q) $(INSTALL_DATA) man/iex.1 $(DESTDIR)$(PREFIX)/share/man/man1 -- $(Q) $(INSTALL_DATA) man/mix.1 $(DESTDIR)$(PREFIX)/share/man/man1 -+ $(Q) mkdir -p $(DESTDIR)$(SHARE_PREFIX)/man/man1 -+ $(Q) $(INSTALL_DATA) man/elixir.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 -+ $(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 -+ $(Q) $(INSTALL_DATA) man/iex.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 -+ $(Q) $(INSTALL_DATA) man/mix.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 - $(MAKE) clean_man