[arch-commits] Commit in ocaml-findlib/trunk (PKGBUILD makefile.patch)

[Alexander Rødseth]

    Date: Monday, July 11, 2016 @ 17:17:47
  Author: arodseth
Revision: 182659

upgpkg: ocaml-findlib 1.6.2-2

Added:
  ocaml-findlib/trunk/makefile.patch
Modified:
  ocaml-findlib/trunk/PKGBUILD

----------------+
 PKGBUILD       |   24 ++++++++++++++++++------
 makefile.patch |   13 +++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-11 16:49:25 UTC (rev 182658)
+++ PKGBUILD	2016-07-11 17:17:47 UTC (rev 182659)
@@ -5,10 +5,11 @@
 # Contributor: Sebastian Wiesner <lunaryorn at googlemail.com>
 # Contributor: Benjamin Andresen <benny at klapmuetz.org>
 # Contributor: scj <scj at archlinux.us>
+# Contributor: Alif <alive4ever at live.com>
 
 pkgname=ocaml-findlib
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc='OCaml package manager'
 arch=('x86_64' 'i686')
 url='http://projects.camlcity.org/projects/findlib.html'
@@ -15,14 +16,25 @@
 license=('MIT')
 depends=('ocaml')
 makedepends=('setconf')
-source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz")
-sha256sums=('3917904342ffbb66089f9fec1adc023b8854178bc21f303e4cbf96b8b164c946')
+source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz"
+        'makefile.patch')
+sha256sums=('3917904342ffbb66089f9fec1adc023b8854178bc21f303e4cbf96b8b164c946'
+            'ed9348ffee0ba5ba17a96c46a2db429870f1cae69deec8bcce67a998cf33fdb3')
 options=('staticlibs' '!strip' 'zipman' '!makeflags')
 
+prepare() {
+  cd "findlib-$pkgver"
+
+  patch -i "$srcdir/makefile.patch"
+}
+
 build() {
   cd "findlib-$pkgver"
 
-  ./configure -config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man
+  ./configure \
+    -sitelib /usr/lib/ocaml \
+    -config /etc/findlib.conf \
+    -mandir /usr/share/man
   make all opt
 }
 
@@ -32,8 +44,8 @@
   make prefix="$pkgdir" install
 
   # Add a directory to the path for compatibility with old-style packages
-  setconf "$pkgdir/etc/findlib.conf" path \
-    '"/usr/lib/ocaml:/usr/lib/ocaml-site-lib"'
+  setconf "$pkgdir/etc/findlib.conf" \
+    path='"/usr/lib/ocaml:/usr/lib/ocaml-site-lib"'
 
   install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"

Added: makefile.patch
===================================================================
--- makefile.patch	                        (rev 0)
+++ makefile.patch	2016-07-11 17:17:47 UTC (rev 182659)
@@ -0,0 +1,13 @@
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -71,7 +71,7 @@ findlib.conf: findlib.conf.in
+ 
+ .PHONY: install-doc
+ install-doc:
+-	mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
++	mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
+ 	-cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
+ 	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
+