[arch-commits] Commit in erlang/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Saturday, November 4, 2017 @ 09:03:26
  Author: arodseth
Revision: 265385

upgpkg: erlang 20.1-1

Modified:
  erlang/trunk/PKGBUILD

----------+
 PKGBUILD |   50 ++++++++++++++++++++------------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-03 23:49:53 UTC (rev 265384)
+++ PKGBUILD	2017-11-04 09:03:26 UTC (rev 265385)
@@ -10,18 +10,18 @@
 pkgname=('erlang' 'erlang-unixodbc')
 pkgver=20.1
 pkgrel=1
-_docver=20.0
+_docver=20.1
 arch=('x86_64' 'i686')
-url='http://www.erlang.org/'
+url='https://www.erlang.org/'
 license=('Apache')
-makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'glu' 'git'
-             'libxslt' 'fop' 'java-environment')
+makedepends=('fop' 'git' 'glu' 'java-environment' 'libxslt' 'lksctp-tools'
+             'mesa' 'perl' 'unixodbc' 'wxgtk')
 options=('staticlibs')
 source=("git+https://github.com/erlang/otp.git#tag=OTP-$pkgver"
         "http://www.erlang.org/download/otp_doc_man_$_docver.tar.gz"
         'epmd.service' 'epmd.socket' 'epmd.conf')
 sha256sums=('SKIP'
-            'b7f1542a94a170f8791f5d80a85706f9e8838924ea65d4301032d0c0cfb845cc'
+            '05ccf82ff85316e2eb1bebf1a1741dfac1ee450ed49cf0be365f9d4fec6d7b46'
             'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
             '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34'
             '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2')
@@ -50,30 +50,23 @@
 
   make -C otp DESTDIR="$pkgdir" install
 
-  # Documentation
-  install -d "$pkgdir/usr/share/doc/erlang"
-  install -m644 "$srcdir/otp/README.md" \
-    "$srcdir"/COPYRIGHT \
-    "$pkgdir/usr/share/doc/erlang"
-
-  # Compressed man pages
-  for page in "$srcdir/man/man?/*"; do gzip $page; done
-  cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang/"
-
-  # License
-  install -Dm644 "$srcdir/otp/LICENSE.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
-
-  # Move over files that will be packaged as erlang-unixodbc
-  mkdir "$srcdir/unixodbc"
+  # move files that belong to the erlang-unixodbc package
+  mkdir -p unixodbc
   mv "$pkgdir/usr/lib/erlang/lib/odbc"* "$srcdir/unixodbc/"
   mv "$pkgdir/usr/lib/erlang/man/man3/odbc.3.gz" "$srcdir"
 
-  # epmd service, socket and conf
-  cd "$srcdir"
+  # services and configuration
   install -Dm644 epmd.service "$pkgdir/usr/lib/systemd/system/epmd.service"
   install -Dm644 epmd.socket "$pkgdir/usr/lib/systemd/system/epmd.socket"
   install -Dm644 epmd.conf "$pkgdir/etc/conf.d/epmd"
+
+  # readme and licenses
+  install -Dm644 otp/README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+  install -Dm644 otp/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # man pages
+  cp -r man "$pkgdir/usr/lib/erlang/"
 }
 
 package_erlang-unixodbc() {
@@ -80,13 +73,10 @@
   pkgdesc='Unixodbc support for Erlang'
   depends=('unixodbc' 'erlang-nox')
 
-  # Get the files that should be packaged as erlang-unixodbc
-  mkdir -p "$pkgdir/usr/lib/erlang/"{lib,man/man3}
-  mv "$srcdir/unixodbc/"* "$pkgdir/usr/lib/erlang/lib/"
-  mv "$srcdir/odbc.3.gz" "$pkgdir/usr/lib/erlang/man/man3/"
-
-  # License
-  install -Dm644 "$srcdir/otp/LICENSE.txt" \
+  install -d "$pkgdir/usr/lib/erlang/lib"
+  mv unixodbc/* "$pkgdir/usr/lib/erlang/lib/"
+  install -Dm644 odbc.3.gz "$pkgdir/usr/lib/erlang/man/man3/odbc3.gz"
+  install -Dm644 otp/LICENSE.txt \
     "$pkgdir/usr/share/licenses/$pkgname/LICENCE.txt"
 }