[arch-commits] Commit in camlp4/repos (4 files)

[Jürgen Hötzel]

    Date: Friday, October 11, 2019 @ 10:56:31
  Author: juergen
Revision: 514757

archrelease: copy trunk to community-x86_64

Added:
  camlp4/repos/community-x86_64/PKGBUILD
    (from rev 514756, camlp4/trunk/PKGBUILD)
  camlp4/repos/community-x86_64/configure.patch
    (from rev 514756, camlp4/trunk/configure.patch)
  camlp4/repos/extra-x86_64/
Deleted:
  camlp4/repos/community-x86_64/PKGBUILD

----------------------------------+
 /PKGBUILD                        |   38 +++++++++++++++++++++++++++++++++++++
 community-x86_64/PKGBUILD        |   38 -------------------------------------
 community-x86_64/configure.patch |   14 +++++++++++++
 3 files changed, 52 insertions(+), 38 deletions(-)

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2019-10-11 10:53:51 UTC (rev 514756)
+++ community-x86_64/PKGBUILD	2019-10-11 10:56:31 UTC (rev 514757)
@@ -1,38 +0,0 @@
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=camlp4
-pkgver=4.08
-pkgrel=3
-pkgdesc='Caml preprocessor and pretty-printer'
-arch=('x86_64')
-license=('GPL2')
-url='https://github.com/ocaml/camlp4/releases'
-depends=('ocaml>=4.09.0')
-makedepends=('git' 'ocamlbuild' 'ocaml-compiler-libs')
-options=('!makeflags' '!emptydirs' 'staticlibs')
-source=("https://github.com/ocaml/camlp4/archive/4.08+1.tar.gz" "configure.patch")
-sha256sums=('655cd3bdcafbf8435877f60f4b47dd2eb69feef5afd8881291ef01ba12bd9d88'
-            '6add54ea15e44df000446deede1e9aa0bad742c647b3d1cd4e67db0bb947fb98')
-
-prepare() {
-  cd "${srcdir}/$pkgname-${pkgver}-1"
-  patch -i  "${srcdir}/configure.patch" -p0
-}
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver}-1"
-  ./configure
-  make all camlp4/META
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver}-1"
-  make \
-    BINDIR="$pkgdir/usr/bin" \
-    LIBDIR="$pkgdir/usr/lib/ocaml" \
-    PKGDIR="$pkgdir/usr/lib/ocaml" \
-    install install-META
-}
-
-# vim:set ts=2 sw=2 et:

Copied: camlp4/repos/community-x86_64/PKGBUILD (from rev 514756, camlp4/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2019-10-11 10:56:31 UTC (rev 514757)
@@ -0,0 +1,38 @@
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=camlp4
+pkgver=4.08
+pkgrel=3
+pkgdesc='Caml preprocessor and pretty-printer'
+arch=('x86_64')
+license=('GPL2')
+url='https://github.com/ocaml/camlp4/releases'
+depends=('ocaml>=4.09.0')
+makedepends=('git' 'ocamlbuild' 'ocaml-compiler-libs')
+options=('!makeflags' '!emptydirs' 'staticlibs')
+source=("https://github.com/ocaml/camlp4/archive/4.08+1.tar.gz" "configure.patch")
+sha256sums=('655cd3bdcafbf8435877f60f4b47dd2eb69feef5afd8881291ef01ba12bd9d88'
+            '6add54ea15e44df000446deede1e9aa0bad742c647b3d1cd4e67db0bb947fb98')
+
+prepare() {
+  cd "${srcdir}/$pkgname-${pkgver}-1"
+  patch -i  "${srcdir}/configure.patch" -p0
+}
+
+build() {
+  cd "${srcdir}/$pkgname-${pkgver}-1"
+  ./configure
+  make all camlp4/META
+}
+
+package() {
+  cd "${srcdir}/$pkgname-${pkgver}-1"
+  make \
+    BINDIR="$pkgdir/usr/bin" \
+    LIBDIR="$pkgdir/usr/lib/ocaml" \
+    PKGDIR="$pkgdir/usr/lib/ocaml" \
+    install install-META
+}
+
+# vim:set ts=2 sw=2 et:

Copied: camlp4/repos/community-x86_64/configure.patch (from rev 514756, camlp4/trunk/configure.patch)
===================================================================
--- community-x86_64/configure.patch	                        (rev 0)
+++ community-x86_64/configure.patch	2019-10-11 10:56:31 UTC (rev 514757)
@@ -0,0 +1,14 @@
+--- configure.sic	2019-09-30 15:48:53.742897037 +0200
++++ configure	2019-09-30 15:49:12.492545288 +0200
+@@ -39,8 +39,8 @@
+     echo "The standalone Camlp4 requires OCaml >= 4.02."
+     echo "For previous versions of OCaml use the Camlp4 distributed with OCaml."
+     exit 2
+-elif [ $major -ne 4 -o $minor -ne 8 ]; then
+-    echo "This version of Camlp4 is for OCaml 4.07 but you are using OCaml $ocaml_version."
++elif [ $major -ne 4 -o $minor -ne 9 ]; then
++    echo "This version of Camlp4 is for OCaml 4.09 but you are using OCaml $ocaml_version."
+     if [ -d .git ] ; then
+       if [ $PINNED -eq 1 ] ; then
+         echo "You've used the wrong opam pin URL for this switch.">&2
+