[PR PATCH] New Package: scryer-prolog-0.8.123

[PR PATCH] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

There is a new pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 1112 bytes --]

From a2d7a45ca0644832589b86f394d5c578a3b71eed Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..9c98b379891
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,17 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 1130 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 2046 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 1/2] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 2/2] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

Re: New Package: scryer-prolog-0.8.123

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-663825818

Comment:
Builds outside of x86_64 when m4 is moved to hostmakedepends. I guess it can build for i686 on i686 host, but don't have hardware nor VM around.

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 3055 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 1/3] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 2/3] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 3/3] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 3879 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 1/4] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 2/4] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 3/4] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 4/4] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 4557 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 1/5] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 2/5] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 3/5] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 4/5] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 5/5] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 5231 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 1/6] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 2/6] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 3/6] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 4/6] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 5/6] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 6/6] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 5988 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 1/7] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 2/7] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 3/7] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 4/7] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 5/7] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 6/7] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 7/7] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 6640 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 1/8] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 2/8] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 3/8] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 4/8] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 5/8] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 6/8] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 7/8] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 8/8] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 7462 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 1/9] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 2/9] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 3/9] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 4/9] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 5/9] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 6/9] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 7/9] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 8/9] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 9/9] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 8466 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/10] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 9117 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/11] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 10286 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/12] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

Re: New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 842 bytes --]

New comment by mkohlhaas on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-664100870

Comment:
Scryer Prolog uses the [GNU Multiple Precision Arithmetic Library GMP](https://gmplib.org/) as part of the FFI Rust library [gmp-mpfr-sys](https://crates.io/crates/gmp-mpfr-sys). When cross-compiling for i686 the configure script gets confusing information about the platform. It can't really figure out if it is 32 or 64 bit:
 
```
using ABI="64"
...
configure: error: Oops, mp_limb_t is 32 bits, but the assembler code in this configuration expects 64 bits.

```
I think one could solve the issue by specifying:

`configure ABI=32`

according to the [GMP documentation](https://gmplib.org/manual/ABI-and-ISA#ABI-and-ISA).

But how would this be possible with a build type of `cargo`?

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 11119 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/13] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 12025 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/14] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 12832 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/15] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 13647 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/16] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 14564 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/17] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 15537 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From ae1f850253e015358a3ee6963de83204eee43b51 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/18] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 16625 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From ae1f850253e015358a3ee6963de83204eee43b51 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

From be06b97be5962b8ed99a43176f255594e25eef5e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 15:48:59 +0200
Subject: [PATCH 19/19] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 8a75e646d90..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,6 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
@@ -12,11 +13,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	echo "Crossbuilding: $CROSS_BUILD"
-	echo "Host: $HOST"
-	echo "Target: $TARGET"
-}
 post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 17402 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From ae1f850253e015358a3ee6963de83204eee43b51 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

From be06b97be5962b8ed99a43176f255594e25eef5e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 15:48:59 +0200
Subject: [PATCH 19/20] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 8a75e646d90..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,6 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
@@ -12,11 +13,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	echo "Crossbuilding: $CROSS_BUILD"
-	echo "Host: $HOST"
-	echo "Target: $TARGET"
-}
 post_install() {
 	vlicense LICENSE
 }

From e0feb1c6bb9078bbbaac09e181b65ada1d2b592e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:29:17 +0200
Subject: [PATCH 20/20] scryer-prolog: update to 0.8.123.

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..d5f40edc575 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="m4 pkg-config git"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 18180 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From ae1f850253e015358a3ee6963de83204eee43b51 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

From be06b97be5962b8ed99a43176f255594e25eef5e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 15:48:59 +0200
Subject: [PATCH 19/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 8a75e646d90..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,6 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
@@ -12,11 +13,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	echo "Crossbuilding: $CROSS_BUILD"
-	echo "Host: $HOST"
-	echo "Target: $TARGET"
-}
 post_install() {
 	vlicense LICENSE
 }

From e0feb1c6bb9078bbbaac09e181b65ada1d2b592e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:29:17 +0200
Subject: [PATCH 20/21] scryer-prolog: update to 0.8.123.

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..d5f40edc575 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="m4 pkg-config git"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 0c4b313efe4708ae47abf36e9d76b156ec9ee8ac Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:31:56 +0200
Subject: [PATCH 21/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index d5f40edc575..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config git"
+hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

Re: New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

New comment by mkohlhaas on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-664436291

Comment:
When I am compiling for i686 is this actually a cross compile?

Setting up locally a bootstrap environment for i686 I get the same error message as Travis. If it were a cross-compile it would show up in the call to the configure script. See: https://gitlab.com/tspiteri/gmp-mpfr-sys/-/issues/15. But building the project just with `cargo build --release` when change rooting into `master_dir` works just fine. Don't know what the issue is.

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 18180 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From ae1f850253e015358a3ee6963de83204eee43b51 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

From be06b97be5962b8ed99a43176f255594e25eef5e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 15:48:59 +0200
Subject: [PATCH 19/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 8a75e646d90..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,6 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
@@ -12,11 +13,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	echo "Crossbuilding: $CROSS_BUILD"
-	echo "Host: $HOST"
-	echo "Target: $TARGET"
-}
 post_install() {
 	vlicense LICENSE
 }

From e0feb1c6bb9078bbbaac09e181b65ada1d2b592e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:29:17 +0200
Subject: [PATCH 20/21] scryer-prolog: update to 0.8.123.

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..d5f40edc575 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="m4 pkg-config git"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 0c4b313efe4708ae47abf36e9d76b156ec9ee8ac Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:31:56 +0200
Subject: [PATCH 21/21] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index d5f40edc575..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config git"
+hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 20067 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From ae1f850253e015358a3ee6963de83204eee43b51 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

From be06b97be5962b8ed99a43176f255594e25eef5e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 15:48:59 +0200
Subject: [PATCH 19/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 8a75e646d90..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,6 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
@@ -12,11 +13,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	echo "Crossbuilding: $CROSS_BUILD"
-	echo "Host: $HOST"
-	echo "Target: $TARGET"
-}
 post_install() {
 	vlicense LICENSE
 }

From e0feb1c6bb9078bbbaac09e181b65ada1d2b592e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:29:17 +0200
Subject: [PATCH 20/23] scryer-prolog: update to 0.8.123.

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..d5f40edc575 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="m4 pkg-config git"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 0c4b313efe4708ae47abf36e9d76b156ec9ee8ac Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:31:56 +0200
Subject: [PATCH 21/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index d5f40edc575..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config git"
+hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 64fdf49ae050e8da6f0bc841f8c45d08de9df0a9 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:39:27 +0200
Subject: [PATCH 22/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..1c980820014 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,9 +2,8 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="cargo m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -13,6 +12,11 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-post_install() {
+do_build() {
+	cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+	vbin target/${RUST_TARGET}/release/${scryer-prolog}
 	vlicense LICENSE
 }

From 01d737852d6cc4842a4ccf837a7bd1b38621e676 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:47:15 +0200
Subject: [PATCH 23/23] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 1c980820014..67cc4d13267 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -17,6 +17,6 @@ do_build() {
 }
 
 do_install() {
-	vbin target/${RUST_TARGET}/release/${scryer-prolog}
+	vbin target/${RUST_TARGET}/release/${pkgname}
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 20853 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From ae1f850253e015358a3ee6963de83204eee43b51 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

From be06b97be5962b8ed99a43176f255594e25eef5e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 15:48:59 +0200
Subject: [PATCH 19/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 8a75e646d90..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,6 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
@@ -12,11 +13,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	echo "Crossbuilding: $CROSS_BUILD"
-	echo "Host: $HOST"
-	echo "Target: $TARGET"
-}
 post_install() {
 	vlicense LICENSE
 }

From e0feb1c6bb9078bbbaac09e181b65ada1d2b592e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:29:17 +0200
Subject: [PATCH 20/24] scryer-prolog: update to 0.8.123.

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..d5f40edc575 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="m4 pkg-config git"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 0c4b313efe4708ae47abf36e9d76b156ec9ee8ac Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:31:56 +0200
Subject: [PATCH 21/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index d5f40edc575..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config git"
+hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 64fdf49ae050e8da6f0bc841f8c45d08de9df0a9 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:39:27 +0200
Subject: [PATCH 22/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..1c980820014 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,9 +2,8 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="cargo m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -13,6 +12,11 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-post_install() {
+do_build() {
+	cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+	vbin target/${RUST_TARGET}/release/${scryer-prolog}
 	vlicense LICENSE
 }

From 01d737852d6cc4842a4ccf837a7bd1b38621e676 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:47:15 +0200
Subject: [PATCH 23/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 1c980820014..67cc4d13267 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -17,6 +17,6 @@ do_build() {
 }
 
 do_install() {
-	vbin target/${RUST_TARGET}/release/${scryer-prolog}
+	vbin target/${RUST_TARGET}/release/${pkgname}
 	vlicense LICENSE
 }

From b9db593c1ac3eb9c4a9148ca515347bcd909147b Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 18:54:54 +0200
Subject: [PATCH 24/24] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 67cc4d13267..40b25ee06ea 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,7 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_helper=rust
-hostmakedepends="cargo m4 pkg-config"
+makedepends="cargo m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 21736 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From ae1f850253e015358a3ee6963de83204eee43b51 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

From be06b97be5962b8ed99a43176f255594e25eef5e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 15:48:59 +0200
Subject: [PATCH 19/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 8a75e646d90..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,6 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
@@ -12,11 +13,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	echo "Crossbuilding: $CROSS_BUILD"
-	echo "Host: $HOST"
-	echo "Target: $TARGET"
-}
 post_install() {
 	vlicense LICENSE
 }

From e0feb1c6bb9078bbbaac09e181b65ada1d2b592e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:29:17 +0200
Subject: [PATCH 20/25] scryer-prolog: update to 0.8.123.

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..d5f40edc575 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="m4 pkg-config git"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 0c4b313efe4708ae47abf36e9d76b156ec9ee8ac Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:31:56 +0200
Subject: [PATCH 21/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index d5f40edc575..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config git"
+hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 64fdf49ae050e8da6f0bc841f8c45d08de9df0a9 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:39:27 +0200
Subject: [PATCH 22/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..1c980820014 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,9 +2,8 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="cargo m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -13,6 +12,11 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-post_install() {
+do_build() {
+	cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+	vbin target/${RUST_TARGET}/release/${scryer-prolog}
 	vlicense LICENSE
 }

From 01d737852d6cc4842a4ccf837a7bd1b38621e676 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:47:15 +0200
Subject: [PATCH 23/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 1c980820014..67cc4d13267 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -17,6 +17,6 @@ do_build() {
 }
 
 do_install() {
-	vbin target/${RUST_TARGET}/release/${scryer-prolog}
+	vbin target/${RUST_TARGET}/release/${pkgname}
 	vlicense LICENSE
 }

From b9db593c1ac3eb9c4a9148ca515347bcd909147b Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 18:54:54 +0200
Subject: [PATCH 24/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 67cc4d13267..40b25ee06ea 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,7 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_helper=rust
-hostmakedepends="cargo m4 pkg-config"
+makedepends="cargo m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 22d78ac6344cc8d7c8f6e24cc2b5fe5966b8400a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 18:58:12 +0200
Subject: [PATCH 25/25] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 40b25ee06ea..f5ccec3a1f5 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,10 +13,10 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 do_build() {
-	cargo build --release --target ${RUST_TARGET}
+	cargo build --release
 }
 
 do_install() {
-	vbin target/${RUST_TARGET}/release/${pkgname}
+	vbin target/release/${pkgname}
 	vlicense LICENSE
 }

Re: New Package: scryer-prolog-0.8.123

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 914 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-664539170

Comment:
I hate rust toolchain for doing as much as possible to make troubleshooting hard.
If one conditionally state[1][2] ABI=32, it'll likely work. Usually it is just patch. With cargo, one need to publish full fixed source in git repository online, then patch dependency tree[3], if available.
Mentioned gmp-src/configure dissapears after build fails, luckily it is materialized in repo, not generated during build.

If you don't file like patching, just mark `archs="~i686*" # aggresive cpu detection`.

In any case, optionally report upstream.

[1] https://gitlab.com/tspiteri/gmp-mpfr-sys/-/blob/16e0a660/build.rs#L553
[2] https://gmplib.org/manual/ABI-and-ISA
[3] https://github.com/void-linux/void-packages/pull/22534/files#diff-c0a371b0356b2c0ee8ff4b74cc227f4a

Re: New Package: scryer-prolog-0.8.123

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-664540405

Comment:
> When I am compiling for i686 is this actually a cross compile?

It is native build. I was talking of i686, because gmp seems to use cpu identification at configure stage. Checked, it builds fine within i686 VM.

Re: New Package: scryer-prolog-0.8.123

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-664540405

Comment:
> When I am compiling for i686 is this actually a cross compile?

It is native build. I was talking of i686 [host], because gmp seems to use cpu identification at configure stage. Checked, it builds fine within i686 VM.

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by mkohlhaas against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 22921 bytes --]

From 20d09c0ce0d00969926a18dd244e72eaac726219 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From 99ffdadce1fbe6cb3bbf7b8ccb9fd2cee79f2aae Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 80280331bc25e962b451171889802059bf312b39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From 95700cd48cb86bc0f2bd7fdb4dd50abd87853795 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From fac8c6155bd4f3d0b05495fd5972fc67fa71a3e6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 6841516cfe710102e7297d8769bc0144b89e0aa1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From cddb59c1cb8b9fe8f95db4df0bb16e79a47ba00a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 04e5e74c2270f48772008747a17aae2ef67ebd7d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 1ffe1cbdaa02ca1277b5cb4f333ea403ca173ec1 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From df75df2a10ce9589770d86712e31977208cf095c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 9bba4b11998ade67da6edb204aae6d5dc324dec6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 44e631c3db073e2893e7376fd4887407e6cb9151 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From ec27fd4a60688cb56efae6556eeb2dabde168f2c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From e08a24e63692d7715b61d03dc1e86477d675e68c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 6d2dc94dd6bb1ceac0a82a1d1ba884ec8e388e5c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From cb2f53df15437c809de7e2dd19d979dada828065 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From 296f1497d075fdd4559e12e9907d7a33d9acccb6 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From ae1f850253e015358a3ee6963de83204eee43b51 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

From be06b97be5962b8ed99a43176f255594e25eef5e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 15:48:59 +0200
Subject: [PATCH 19/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 8a75e646d90..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,6 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
@@ -12,11 +13,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	echo "Crossbuilding: $CROSS_BUILD"
-	echo "Host: $HOST"
-	echo "Target: $TARGET"
-}
 post_install() {
 	vlicense LICENSE
 }

From e0feb1c6bb9078bbbaac09e181b65ada1d2b592e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:29:17 +0200
Subject: [PATCH 20/26] scryer-prolog: update to 0.8.123.

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..d5f40edc575 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="m4 pkg-config git"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 0c4b313efe4708ae47abf36e9d76b156ec9ee8ac Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:31:56 +0200
Subject: [PATCH 21/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index d5f40edc575..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config git"
+hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 64fdf49ae050e8da6f0bc841f8c45d08de9df0a9 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:39:27 +0200
Subject: [PATCH 22/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..1c980820014 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,9 +2,8 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="cargo m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -13,6 +12,11 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-post_install() {
+do_build() {
+	cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+	vbin target/${RUST_TARGET}/release/${scryer-prolog}
 	vlicense LICENSE
 }

From 01d737852d6cc4842a4ccf837a7bd1b38621e676 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:47:15 +0200
Subject: [PATCH 23/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 1c980820014..67cc4d13267 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -17,6 +17,6 @@ do_build() {
 }
 
 do_install() {
-	vbin target/${RUST_TARGET}/release/${scryer-prolog}
+	vbin target/${RUST_TARGET}/release/${pkgname}
 	vlicense LICENSE
 }

From b9db593c1ac3eb9c4a9148ca515347bcd909147b Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 18:54:54 +0200
Subject: [PATCH 24/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 67cc4d13267..40b25ee06ea 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,7 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_helper=rust
-hostmakedepends="cargo m4 pkg-config"
+makedepends="cargo m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 22d78ac6344cc8d7c8f6e24cc2b5fe5966b8400a Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 18:58:12 +0200
Subject: [PATCH 25/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 40b25ee06ea..f5ccec3a1f5 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,10 +13,10 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 do_build() {
-	cargo build --release --target ${RUST_TARGET}
+	cargo build --release
 }
 
 do_install() {
-	vbin target/${RUST_TARGET}/release/${pkgname}
+	vbin target/release/${pkgname}
 	vlicense LICENSE
 }

From 4ae764272750655e7fc360e0b4a2730b95a70150 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 20:43:21 +0200
Subject: [PATCH 26/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index f5ccec3a1f5..6e52005281e 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,8 +2,10 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="~i686"
+build_style=cargo
 build_helper=rust
-makedepends="cargo m4 pkg-config"
+hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -12,11 +14,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-do_build() {
-	cargo build --release
-}
-
-do_install() {
-	vbin target/release/${pkgname}
+post_install() {
 	vlicense LICENSE
 }

Re: New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 457 bytes --]

New comment by mkohlhaas on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-664612709

Comment:
> If you don't file like patching, just mark `archs="~i686*" # aggresive cpu detection`.

Ok, that's what I did now. I'm not fully satisfied though. I even tried a version without `build_style=cargo` and just called `cargo` directly. But no success.

Do you think the package can get approved as it stands now?

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by Chocimier against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 22921 bytes --]

From e00e42c6f9e12f0ba27e16fbf11fecccbf1f06fc Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH 01/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..0c8142ce8b3
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="x86_64*"
+build_style=cargo
+makedepends="gmp-devel libressl-devel m4"
+depends="gmp libressl"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

From cab9d27fd8dcecce90fe746cc9a1c0a2a1925367 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 01:20:11 +0200
Subject: [PATCH 02/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 0c8142ce8b3..e80d59b64b4 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -7,7 +7,7 @@ build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+maintainer="Hans Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From d19272786c464961ff3c8478041e7c380d8c039f Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:15:46 +0200
Subject: [PATCH 03/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index e80d59b64b4..c128cc9b880 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,12 +2,12 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
+archs="x86_64 i686"
 build_style=cargo
 makedepends="gmp-devel libressl-devel m4"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
-maintainer="Hans Schmid <knock@myopendoor.de>"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"

From f0655782e302203596e8c3b177954b5d9b0c939e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 10:18:40 +0200
Subject: [PATCH 04/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index c128cc9b880..bc690c72936 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,8 @@ version=0.8.123
 revision=1
 archs="x86_64 i686"
 build_style=cargo
-makedepends="gmp-devel libressl-devel m4"
+hostmakedepends="m4"
+makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 8b1439383d8d1c79d0710af4f4ebcbbf2bcff6d2 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:00:51 +0200
Subject: [PATCH 05/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index bc690c72936..efd6cc24f7c 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64 i686"
+archs="x86_64"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 9c2a98224129e0e469c1cd4554c8239f5c087467 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 14:50:31 +0200
Subject: [PATCH 06/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index efd6cc24f7c..2e9035ddad3 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64"
+archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4"
 makedepends="gmp-devel libressl-devel"

From 8ea352760c6c7d995addabbb8b793bbe425c352e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:23:33 +0200
Subject: [PATCH 07/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2e9035ddad3..2c0b69ce3e9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 archs="x86_64*"
 build_style=cargo
-hostmakedepends="m4"
+hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
 depends="gmp libressl"
 short_desc="Modern Prolog implementation written mostly in Rust"

From 0e65cc4f7fe5f9d02cae861954c6b19bda2cc14e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 01:24:33 +0200
Subject: [PATCH 08/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 2c0b69ce3e9..acda8f87848 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="x86_64*"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From fed7a0296a72c128ce5c2094ea349f2fe405a70e Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 03:36:55 +0200
Subject: [PATCH 09/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index acda8f87848..b7c94ef8696 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,6 +13,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) configure_args+=" ABI=32";;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From c155a5a205b223f000faf6e0bc6bcebaaf30d9ba Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:12:22 +0200
Subject: [PATCH 10/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index b7c94ef8696..3f72abdedcd 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,6 +2,7 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"
@@ -14,7 +15,7 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" ABI=32";;
+	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
 esac
 
 post_install() {

From 75f7e291def5ac446273b92f1028d8b919089eb7 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 04:35:13 +0200
Subject: [PATCH 11/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 3f72abdedcd..fc1ae5d0be8 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,7 +2,6 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-archs="i686"
 build_style=cargo
 hostmakedepends="m4 pkg-config"
 makedepends="gmp-devel libressl-devel"

From 4119fd511edb61208fd6bab8375ac3d36c2333fb Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 05:23:52 +0200
Subject: [PATCH 12/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index fc1ae5d0be8..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,8 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 hostmakedepends="m4 pkg-config"
-makedepends="gmp-devel libressl-devel"
-depends="gmp libressl"
+depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
 license="BSD-3-Clause"
@@ -13,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) RUST_TARGET="i686-unknown-linux-gnu";;
-esac
-
 post_install() {
 	vlicense LICENSE
 }

From 5da54f8cc77e4f5e467766d9b68b36386419f5de Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:00:43 +0200
Subject: [PATCH 13/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..da941e29bde 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
+esac
+
 post_install() {
 	vlicense LICENSE
 }

From 1994ad4d2ea9a9ecfb07c79a9eb42500ee437235 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:18:36 +0200
Subject: [PATCH 14/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index da941e29bde..27b60a12564 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,9 +12,9 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) export CARGO_FEATURE_FORCE_CROSS=1;;
-esac
+pre_configure() {
+	export CARGO_FEATURE_FORCE_CROSS=1
+}
 
 post_install() {
 	vlicense LICENSE

From 709abe5b77028f446781b284e24e0ff09a7cb52d Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 08:47:41 +0200
Subject: [PATCH 15/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 27b60a12564..eaff4074dcc 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,10 +12,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	export CARGO_FEATURE_FORCE_CROSS=1
-}
-
 post_install() {
 	vlicense LICENSE
 }

From e495c1e29bd5915abc6839aa0d69328ececdca38 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:02:37 +0200
Subject: [PATCH 16/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index eaff4074dcc..04636c9038f 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,10 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+pre_configure() {
+	echo "Host: $HOST"
+	echo "Target: $TARGET"
+}
 post_install() {
 	vlicense LICENSE
 }

From aff6b12e995b604c2fb7f712adb57851f1eec607 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 13:24:30 +0200
Subject: [PATCH 17/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 04636c9038f..10776ddb1db 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,6 +12,13 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+	  export HOST="x86_64-unknown-linux-gnu"
+	  export TARGET="i686-unknown-linux-gnu"
+	  ;;
+esac
+
 pre_configure() {
 	echo "Host: $HOST"
 	echo "Target: $TARGET"

From 798fcf96a6f9bb8fc8faded8d49918f8ff533bed Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 14:08:38 +0200
Subject: [PATCH 18/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 10776ddb1db..8a75e646d90 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -12,14 +12,8 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*)
-	  export HOST="x86_64-unknown-linux-gnu"
-	  export TARGET="i686-unknown-linux-gnu"
-	  ;;
-esac
-
 pre_configure() {
+	echo "Crossbuilding: $CROSS_BUILD"
 	echo "Host: $HOST"
 	echo "Target: $TARGET"
 }

From 04c0d5bfad9cf5fed212a5706cf9fe695d7e6f35 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 15:48:59 +0200
Subject: [PATCH 19/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 8a75e646d90..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,6 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
@@ -12,11 +13,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-pre_configure() {
-	echo "Crossbuilding: $CROSS_BUILD"
-	echo "Host: $HOST"
-	echo "Target: $TARGET"
-}
 post_install() {
 	vlicense LICENSE
 }

From 78f2483fd293eae71f767e1ebc2ce53baa8dc14f Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:29:17 +0200
Subject: [PATCH 20/26] scryer-prolog: update to 0.8.123.

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..d5f40edc575 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="m4 pkg-config git"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From f783c5c4489614d1652d8b17973a3fbb39ca0b92 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 16:31:56 +0200
Subject: [PATCH 21/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index d5f40edc575..144c40721c9 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -4,7 +4,7 @@ version=0.8.123
 revision=1
 build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config git"
+hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 193b684b77fdca4d2bd5f796b4195d59704fcb04 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:39:27 +0200
Subject: [PATCH 22/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 144c40721c9..1c980820014 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,9 +2,8 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
-build_style=cargo
 build_helper=rust
-hostmakedepends="m4 pkg-config"
+hostmakedepends="cargo m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -13,6 +12,11 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-post_install() {
+do_build() {
+	cargo build --release --target ${RUST_TARGET}
+}
+
+do_install() {
+	vbin target/${RUST_TARGET}/release/${scryer-prolog}
 	vlicense LICENSE
 }

From ceea2a2d5a38baa50e86067709a828720e3c3d39 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 17:47:15 +0200
Subject: [PATCH 23/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 1c980820014..67cc4d13267 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -17,6 +17,6 @@ do_build() {
 }
 
 do_install() {
-	vbin target/${RUST_TARGET}/release/${scryer-prolog}
+	vbin target/${RUST_TARGET}/release/${pkgname}
 	vlicense LICENSE
 }

From 508fd1f1bbdc2328fa1d6d708e8eb82c3cc6c95f Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 18:54:54 +0200
Subject: [PATCH 24/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 67cc4d13267..40b25ee06ea 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -3,7 +3,7 @@ pkgname=scryer-prolog
 version=0.8.123
 revision=1
 build_helper=rust
-hostmakedepends="cargo m4 pkg-config"
+makedepends="cargo m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"

From 9697abd056bbaa9fae9ac175833db825254664ea Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 18:58:12 +0200
Subject: [PATCH 25/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index 40b25ee06ea..f5ccec3a1f5 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -13,10 +13,10 @@ distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
 do_build() {
-	cargo build --release --target ${RUST_TARGET}
+	cargo build --release
 }
 
 do_install() {
-	vbin target/${RUST_TARGET}/release/${pkgname}
+	vbin target/release/${pkgname}
 	vlicense LICENSE
 }

From daa76bd4351658f53eda03e7748f30fc32b481b0 Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Mon, 27 Jul 2020 20:43:21 +0200
Subject: [PATCH 26/26] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
index f5ccec3a1f5..6e52005281e 100644
--- a/srcpkgs/scryer-prolog/template
+++ b/srcpkgs/scryer-prolog/template
@@ -2,8 +2,10 @@
 pkgname=scryer-prolog
 version=0.8.123
 revision=1
+archs="~i686"
+build_style=cargo
 build_helper=rust
-makedepends="cargo m4 pkg-config"
+hostmakedepends="m4 pkg-config"
 depends="gmp"
 short_desc="Modern Prolog implementation written mostly in Rust"
 maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -12,11 +14,6 @@ homepage="https://github.com/mthom/scryer-prolog"
 distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
 checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
 
-do_build() {
-	cargo build --release
-}
-
-do_install() {
-	vbin target/release/${pkgname}
+post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Updated] New Package: scryer-prolog-0.8.123

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

There is an updated pull request by Chocimier against master on the void-packages repository

https://github.com/mkohlhaas/void-packages scryer-prolog
https://github.com/void-linux/void-packages/pull/23821

New Package: scryer-prolog-0.8.123


A patch file from https://github.com/void-linux/void-packages/pull/23821.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scryer-prolog-23821.patch --]
[-- Type: text/x-diff, Size: 1135 bytes --]

From 00b03a7b11f30d572750e3504a899086f56a5d4c Mon Sep 17 00:00:00 2001
From: "Hans-J. Schmid" <knock@myopendoor.de>
Date: Sat, 25 Jul 2020 00:08:03 +0200
Subject: [PATCH] New Package: scryer-prolog-0.8.123

---
 srcpkgs/scryer-prolog/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/scryer-prolog/template

diff --git a/srcpkgs/scryer-prolog/template b/srcpkgs/scryer-prolog/template
new file mode 100644
index 00000000000..44c650c67dd
--- /dev/null
+++ b/srcpkgs/scryer-prolog/template
@@ -0,0 +1,18 @@
+# Template file for 'scryer-prolog'
+pkgname=scryer-prolog
+version=0.8.123
+revision=1
+archs="~i686" # aggresive cpu detection
+build_style=cargo
+hostmakedepends="m4 pkg-config"
+depends="gmp"
+short_desc="Modern Prolog implementation written mostly in Rust"
+maintainer="Hans-J. Schmid <knock@myopendoor.de>"
+license="BSD-3-Clause"
+homepage="https://github.com/mthom/scryer-prolog"
+distfiles="https://github.com/mthom/scryer-prolog/archive/v${version}.tar.gz"
+checksum=4370bc2200e3e56d411326801219bc5fc37a422febdb6cd3548ed3f65b5a44aa
+
+post_install() {
+	vlicense LICENSE
+}

Re: [PR PATCH] [Merged]: New Package: scryer-prolog-0.8.123

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

There's a merged pull request on the void-packages repository

New Package: scryer-prolog-0.8.123
https://github.com/void-linux/void-packages/pull/23821

Description:

Re: New Package: scryer-prolog-0.8.123

[mkohlhaas]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New comment by mkohlhaas on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-665216126

Comment:
Thank you!

Re: New Package: scryer-prolog-0.8.123

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-665216540

Comment:
Pushed with few changes: added requested comment on why not to build for i686, removed build helper as it is already effective with build style, squashed to single commit.

Prolog implementetion itself is quite unpolished. It ate all memory when asked for 4th solution of p(a, b). p(b, c). p(A,C) :- p(A,B), p(B,C).

Re: New Package: scryer-prolog-0.8.123

[triska]

[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]

New comment by triska on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-665219062

Comment:
Thank you a lot @Chocimier for merging this!

In several respects, Scryer Prolog is one of the most advanced Prolog systems that currently exists, even though it is still in its early stages of development. For instance, it conforms syntactically to the Prolog ISO standard, it includes extensions for constraint logic programming (CLP), and is the first Prolog system that implements a very compact internal representation of strings as lists of characters. It is an excellent platform to teach Prolog.

For your concrete example, try SLG resolution by adding the following two lines at the start of the program:

<pre>
:- use_module(library(tabling)).

:- table p/2.
</pre>

We then get for the most general query:

<pre>
<b>?- p(A, B).</b>
   A = a, B = b
;  A = a, B = c
;  A = b, B = c
;  false.
</pre>

i.e., all solutions are enumerated, and the query *terminates*.

Thank you a again!

Re: New Package: scryer-prolog-0.8.123

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/23821#issuecomment-665331688

Comment:
This templates fails to build on musl builders. Also it probably should link against system gmp, so we don't run into all these issues we have right now (i686 build failure would probably be also solved by that).

marked it for broken now on musl (and some comments on more things that should change) f0162e98210ab02158a84e0bd559d3de5aacdba2