Subject: [alpine-aports] [PATCH] testing/erlang: Fixing nteventlog dependency from os_mon

From: Marlus Saraiva <[email-masked]>
Date: Fri, 26 Jun 2015 04:20:10 +0000

---
 testing/erlang/APKBUILD                            | 16 ++++------
 ...all-nteventlog-and-related-doc-files-on-n.patch | 36 +++++++++++-----------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/testing/erlang/APKBUILD b/testing/erlang/APKBUILD
index 002f0dc..87de3b7 100644
--- a/testing/erlang/APKBUILD
+++ b/testing/erlang/APKBUILD
@@ -1,13 +1,9 @@
 # Contributor: Michael Mason <[email-masked]>
-# Maintainer: John Regan <[email-masked]>
-
-# TODO: create subpackages
-# Check how fedora does it:
-# http://pkgs.fedoraproject.org/gitweb/?p=erlang.git;a=blob;f=erlang.spec
+# Maintainer: Marlus Saraiva <[email-masked]>
 
 pkgname=erlang
 pkgver=17.5
-pkgrel=0
+pkgrel=1
 pkgdesc="General-purpose programming language and runtime environment"
 url="http://www.erlang.org/"
 license="ERPL"
@@ -67,7 +63,7 @@ subpackages="$pkgname-dev
 	     $pkgname-typer:typer
 	     $pkgname-webtool:webtool
 	     $pkgname-xmerl:xmerl"
-# Patches found: http://pkgs.fedoraproject.org/gitweb/?p=erlang.git;a=tree
+# Patches 0001-0009 found: http://pkgs.fedoraproject.org/gitweb/?p=erlang.git;a=tree
 source="http://www.erlang.org/download/otp_src_$pkgver.tar.gz
         otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
         otp-0002-Remove-rpath.patch
@@ -216,7 +212,7 @@ md5sums="346dd0136bf1cc28cebc140e505206bb  otp_src_17.5.tar.gz
 6202359c7326ad45da303dea5b865ed7  otp-0002-Remove-rpath.patch
 49e76b9d1356c432141cc9e472ece48f  otp-0003-Do-not-install-C-sources.patch
 b16edcf58468e7f33da182ba622d9372  otp-0004-Do-not-install-Java-sources.patch
-3bd87bbf27b341b93d1f36025d2cea3c  otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+7e28da985292a2eec4ca24ae582afe89  otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 df2f5d70293bce953d94cb4ae76bb3a8  otp-0006-Do-not-install-erlang-sources.patch
 df323f3ed63e1112826ddc8012cae9d8  otp-0007-Split-off-webtool-dependency-from-tools.patch
 4689e0e5fd9040a86433d36e23020a6e  otp-0008-Introduce-os-getenv-2.patch
@@ -228,7 +224,7 @@ sha256sums="3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474  ot
 f431800227050a8665c958ed9f21738adb7bbab5cbadb863eeb282f3da193a33  otp-0002-Remove-rpath.patch
 b4b2cfd436b9e75ea998784cce40492aa41512417321332e5b315361e80383d8  otp-0003-Do-not-install-C-sources.patch
 94380dab56a7687f6646b8e0b9e6433086ba36efd568ca41a7059312c3b9b5b1  otp-0004-Do-not-install-Java-sources.patch
-899dbbe6f4c8595720d995a951676303a45573d2a4fff46c77cbf1876281290b  otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+a091577926bd30204e43b5e1350b9c4dfd8adc6728075d62a1b888a3b7dac196  otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 ff3600d52418ac5d70161955d6cebd2d6ce0fd93700afdc1834df29fc437a705  otp-0006-Do-not-install-erlang-sources.patch
 b15610e9cc879467e2387db1eef450827bc58bf4cbc9ffd5d40272ba6b76c8d2  otp-0007-Split-off-webtool-dependency-from-tools.patch
 0dca75b3fc682b03d3ed736100ef4589bd7fcc28af53325a1d36c46a2a56330e  otp-0008-Introduce-os-getenv-2.patch
@@ -240,7 +236,7 @@ sha512sums="cfd082c8baee7ded370a34f15a1ba3b846b7d81e06edc36c62308c9220697925f1fe
 2111ce99ecc59e44d707b92d3f10b109e326f2e5f68d342c2b0e20089dcd43c45bae1eeda48f9a2d7e655696dd707fb99a6ca3936302813a0dfbdad098edc48d  otp-0002-Remove-rpath.patch
 076cf7e08cfdf015170abfe936f62c98bbb9a743235eabfd29362b79c95f1bcdde7ddfb1c4a46503765e53a13b1aeaaa433ea4f51ca1721057bb90a8977a873b  otp-0003-Do-not-install-C-sources.patch
 5a89290eaaf622192f7ef32e70f8a1301581afa5541902aa961c0c4431183d9822668daa1d48bfc2dee010ab747b0c1f4511525a243be42c8cff252bdd7906f7  otp-0004-Do-not-install-Java-sources.patch
-f799a25a319c0382f66e4079fb5486644900f4746c53c33d16a795a2d8d5a015853a978918c93a46cbdb23a90fd4fcefd840238e509b9500c74e2797e20971d2  otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+dbc1f484060056609811aec51d611ffed89bbb234949088aadf94ec017f3d1dce95144ab6d38b6da709d14615825f6d3ec63e61b3b00cb95086d7d23070b3c0c  otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 ec0c06c8e219458f9fc624a98360a302d3facbb3f0ae4eaefabac04789d0019a493287956682d70f99d64134a7fe2dbaf86f74a28afdf2264d36893085260d88  otp-0006-Do-not-install-erlang-sources.patch
 de19924f6aa652a93481a16f89f6eff4181f76a776f8a3ebd0c9a5b2f6344b8d3d4c2bb6192a5ef542d2dd02095d9bb9a2f094c248c01446daeb5abed2d471fe  otp-0007-Split-off-webtool-dependency-from-tools.patch
 52c3cadd0ee294c209dc031623c415334a1946b9f77ed1acfb7c9e9e1b1d2a0186b7996098ea53d0cdfb4fc3d0c4a53587af0df1887040c4aafa9aad4cb74488  otp-0008-Introduce-os-getenv-2.patch
diff --git a/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
index cf8e970..74f4587 100644
--- a/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+++ b/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
@@ -1,15 +1,6 @@
-From: Peter Lemenkov <[email-masked]>
-Date: Sat, 19 Jun 2010 09:59:39 +0400
-Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32
- systems
-
-Signed-off-by: Peter Lemenkov <[email-masked]>
-
-diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
-index 08fd23e..5606cfc 100644
---- a/lib/os_mon/doc/src/Makefile
-+++ b/lib/os_mon/doc/src/Makefile
-@@ -35,12 +35,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+--- otp_src_17.5/lib/os_mon/doc/src/Makefile
++++ otp_src_17.5-fixed/lib/os_mon/doc/src/Makefile
+@@ -35,12 +35,17 @@
  # Target Specs
  # ----------------------------------------------------
  XML_APPLICATION_FILES = ref_man.xml
@@ -28,11 +19,20 @@ index 08fd23e..5606cfc 100644
  
  XML_REF6_FILES = os_mon_app.xml 
  
-diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
-index cd2dade..4e78cf8 100644
---- a/lib/os_mon/src/Makefile
-+++ b/lib/os_mon/src/Makefile
-@@ -33,8 +33,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
+--- otp_src_17.5/lib/os_mon/ebin/os_mon.app
++++ otp_src_17.5-fixed/lib/os_mon/ebin/os_mon.app
+@@ -21,7 +21,7 @@
+    [{description, "CPO  CXC 138 46"},
+     {vsn, "2.3.1"},
+     {modules, [os_mon, os_mon_mib, os_sup,
+-               disksup, memsup, cpu_sup, os_mon_sysinfo, nteventlog]},
++               disksup, memsup, cpu_sup, os_mon_sysinfo]},
+     {registered, [os_mon_sup, os_mon_sysinfo, disksup, memsup, cpu_sup, 
+                   os_sup_server]},
+     {applications, [kernel, stdlib, sasl]},
+--- otp_src_17.5/lib/os_mon/src/Makefile
++++ otp_src_17.5-fixed/lib/os_mon/src/Makefile
+@@ -33,8 +33,13 @@
  # ----------------------------------------------------
  # Target Specs
  # ----------------------------------------------------
@@ -47,7 +47,7 @@ index cd2dade..4e78cf8 100644
  
  INCLUDE=../include
  CSRC=../c_src
-@@ -78,7 +83,11 @@ docs:
+@@ -78,7 +83,11 @@
  # ----------------------------------------------------
  
  $(APP_TARGET): $(APP_SRC) ../vsn.mk
-- 
2.4.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---