From: Daniel Isaksen <d@duniel.no>
To: alpine-aports@lists.alpinelinux.org
Cc: Daniel Isaksen <d@duniel.no>
Subject: [alpine-aports] [PATCH] community/erlang: bump to 20.0.5, use github as source
Date: Fri, 22 Sep 2017 20:42:15 +0000
Message-Id: <20170922204215.16682-1-d@duniel.no>
Precedence: list

I have updated the community/erlang package to version 20.0.5, and changed the
APKBUILD file to pull the source from github.com/erlang/otp instead of
erlang.com as they distribute "older" releases there.

Three applications were removed upstream (and subsequently here):
  - erlang-percept (concurrency profiling tool)
  - erlang-typer (type annotator)
  - erlang-gs (graphics system)

---
 ...all-nteventlog-and-related-doc-files-on-n.patch |  8 +++---
 community/erlang/0010-fix-nteventlog-remove.patch  |  4 +--
 community/erlang/APKBUILD                          | 31 +++++++---------------
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
index dcfa6bcfad..05ea1eec89 100644
--- a/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+++ b/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
@@ -5,8 +5,8 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32
 
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
---- otp_src_18.0-orig/lib/os_mon/doc/src/Makefile
-+++ otp_src_18.0-fixed/lib/os_mon/doc/src/Makefile
+--- a/lib/os_mon/doc/src/Makefile
++++ b/lib/os_mon/doc/src/Makefile
 @@ -36,12 +36,17 @@
  # Target Specs
  # ----------------------------------------------------
@@ -26,8 +26,8 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
  
  XML_REF6_FILES = os_mon_app.xml 
  
---- otp_src_18.0-orig/lib/os_mon/src/Makefile
-+++ otp_src_18.0-fixed/lib/os_mon/src/Makefile
+--- a/lib/os_mon/src/Makefile
++++ b/lib/os_mon/src/Makefile
 @@ -34,8 +34,13 @@
  # ----------------------------------------------------
  # Target Specs
diff --git a/community/erlang/0010-fix-nteventlog-remove.patch b/community/erlang/0010-fix-nteventlog-remove.patch
index c3d066bdfb..b981085165 100644
--- a/community/erlang/0010-fix-nteventlog-remove.patch
+++ b/community/erlang/0010-fix-nteventlog-remove.patch
@@ -1,5 +1,5 @@
---- otp_src_18.0/lib/os_mon/src/os_mon.app.src
-+++ otp_src_18.0-fixed/lib/os_mon/src/os_mon.app.src
+--- a/lib/os_mon/src/os_mon.app.src
++++ b/lib/os_mon/src/os_mon.app.src
 @@ -22,7 +22,7 @@
     [{description, "CPO  CXC 138 46"},
      {vsn, "%VSN%"},
diff --git a/community/erlang/APKBUILD b/community/erlang/APKBUILD
index 93f192bd2b..6963e8dc74 100644
--- a/community/erlang/APKBUILD
+++ b/community/erlang/APKBUILD
@@ -3,9 +3,9 @@
 # Maintainer: Marlus Saraiva <marlus.saraiva@gmail.com>
 
 pkgname=erlang
-pkgver=19.3.0
-_srcver=19.3
-pkgrel=4
+pkgver=20.0.5
+_srcver=$pkgver
+pkgrel=0
 pkgdesc="General-purpose programming language and runtime environment"
 url="http://www.erlang.org/"
 license="ASL 2.0"
@@ -34,7 +34,6 @@ subpackages="$pkgname-dev
 	     $pkgname-erts:erts
 	     $pkgname-et:et
 	     $pkgname-eunit:eunit
-	     $pkgname-gs:gs
 	     $pkgname-hipe:hipe
 	     $pkgname-ic:ic
 	     $pkgname-inets:inets
@@ -48,7 +47,6 @@ subpackages="$pkgname-dev
 	     $pkgname-os-mon:os_mon
 	     $pkgname-otp-mibs:otp_mibs
 	     $pkgname-parsetools:parsetools
-	     $pkgname-percept:percept
 	     $pkgname-public-key:public_key
 	     $pkgname-reltool:reltool
 	     $pkgname-runtime-tools:runtime_tools
@@ -59,25 +57,25 @@ subpackages="$pkgname-dev
 	     $pkgname-stdlib:stdlib
 	     $pkgname-syntax-tools:syntax_tools
 	     $pkgname-tools:tools
-	     $pkgname-typer:typer
 	     $pkgname-xmerl:xmerl"
-source="http://www.erlang.org/download/otp_src_$_srcver.tar.gz
+source="https://github.com/erlang/otp/archive/OTP-$_srcver.tar.gz
         0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
         0010-fix-nteventlog-remove.patch"
 
-builddir="$srcdir/otp_src_$_srcver"
+builddir="$srcdir/otp-OTP-$_srcver"
 
 prepare() {
 	default_prepare || return 1
 
 	cd "$builddir"
-	rm lib/os_mon/ebin/*
+	#rm lib/os_mon/ebin/*
 }
 
 build() {
 	cd "$builddir"
 	export CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS"
 	export PATH="/usr/lib/jvm/java-1.7-openjdk/bin:$PATH"
+	./otp_build autoconf
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -130,7 +128,6 @@ erl_interface() { _mv_erlang_lib erl_interface; }
 erts() { _mv_erlang_lib erts; }
 et() { _mv_erlang_lib et; }
 eunit() { _mv_erlang_lib eunit; }
-gs() { _mv_erlang_lib gs; }
 hipe() { _mv_erlang_lib hipe; }
 ic() { _mv_erlang_lib ic; }
 inets() { _mv_erlang_lib inets; }
@@ -144,7 +141,6 @@ orber() { _mv_erlang_lib orber; }
 os_mon() { _mv_erlang_lib os_mon; }
 otp_mibs() { _mv_erlang_lib otp_mibs; }
 parsetools() { _mv_erlang_lib parsetools; }
-percept() { _mv_erlang_lib percept; }
 public_key() { _mv_erlang_lib public_key; }
 reltool() { _mv_erlang_lib reltool; }
 runtime_tools() { _mv_erlang_lib runtime_tools; }
@@ -155,7 +151,6 @@ ssl() { _mv_erlang_lib ssl; }
 stdlib() { _mv_erlang_lib stdlib; }
 syntax_tools() { _mv_erlang_lib syntax_tools; }
 tools() { _mv_erlang_lib tools; }
-typer() { _mv_erlang_lib typer; }
 xmerl() { _mv_erlang_lib xmerl; }
 
 dev() {
@@ -194,12 +189,6 @@ dev() {
 }
 
 
-md5sums="a8c259ec47bf84e77510673e1b76b6db  otp_src_19.3.tar.gz
-f4aa0cc27dc57ea4dcd57191b1948a4d  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
-0dd300003ff68fc46dc3c839c2541d53  0010-fix-nteventlog-remove.patch"
-sha256sums="fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83  otp_src_19.3.tar.gz
-71c8a55fe036d5a04ba2c008b51d8950c3f18d83edaffb9bef2a9d19dd2f79f3  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
-019c62ea3fee60068caa8c3152d7f96e76591fc5dc096abfcea48ec1593eb758  0010-fix-nteventlog-remove.patch"
-sha512sums="6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6  otp_src_19.3.tar.gz
-923addcb1f6472829ba13ccc91ad3cef161f269478404f0a19bc4997118e06edd7459011a60769eb393eac930f30d4bd6c5526301382a5f9815862237f4664d3  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
-b7387f92f8c27a0565c7885bba4b357183c62d422616e073bc5ffad338a0e22cb5165dcb3b95bf0b920ba00831599f2216027883f4be255aa6f6150b68b7a37c  0010-fix-nteventlog-remove.patch"
+sha512sums="51e027ee54a3683c8fc4de2611bf7709716b045ae4f4072c5ccad36bdc6040f7404074482eb7143cf0e4bd243a85de22356c3c23e7476511dd69ef203b6b8af2  OTP-20.0.5.tar.gz
+5d377faccd73382bc86c5aa3182767bc5d1639220c78c2f624135f597f3c823a6871ff13f6f8a109baa8a9ae5d215233b40193e5cfe07af275aa53f327e956de  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+bb4346dabe17115bc310837c5f0aeb367a745d8ba2159495084e599d0419fc57648d144c811306914ac48d0e087d6150a356f38640ba070642b4578acc5fe573  0010-fix-nteventlog-remove.patch"
-- 
2.14.1


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---