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

[Alexander Rødseth]

    Date: Friday, May 25, 2018 @ 07:51:45
  Author: arodseth
Revision: 329302

upgpkg: ocaml-findlib 1.8.0-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-25 07:49:45 UTC (rev 329301)
+++ PKGBUILD	2018-05-25 07:51:45 UTC (rev 329302)
@@ -8,24 +8,17 @@
 # Contributor: Alif <alive4ever at live.com>
 
 pkgname=ocaml-findlib
-pkgver=1.7.3
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 pkgdesc='OCaml package manager'
 arch=('x86_64')
 url='http://projects.camlcity.org/projects/findlib.html'
 license=('MIT')
-depends=('ocaml' 'ocaml-compiler-libs')
-makedepends=('setconf')
-source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz" "externalmeta6.patch")
-sha256sums=('d196608fa23c36c2aace27d5ef124a815132a5fcea668d41fa7d6c1ca246bd8b'
-            '6530279c403098b68d1b070c922590a2da63eb19bd9258203ccf98b0f3f6a09c')
+depends=('ocaml-compiler-libs')
+source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz")
+sha256sums=('2b7b7d6d65bb0f3f8a2c51c63c02b0bcf1fea4c23513f866140dc7dc24fe27ad')
 options=('staticlibs' '!strip' 'zipman' '!makeflags')
 
-prepare() {
-  cd "findlib-$pkgver"
-  patch -i "${srcdir}/externalmeta6.patch"
-}
-
 build() {
   cd "findlib-$pkgver"
 
@@ -42,11 +35,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"'
-
-  install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/"
+  install -Dm755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/ocamlfind_opt"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:

Deleted: makefile.patch
===================================================================
--- makefile.patch	2018-05-25 07:49:45 UTC (rev 329301)
+++ makefile.patch	2018-05-25 07:51:45 UTC (rev 329302)
@@ -1,13 +0,0 @@
-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"
-