From d14e248d2b12a7b2299e9103d2d1fd06ad925469 Mon Sep 17 00:00:00 2001
From: Alyx Wolcott <alyx@malkier.net>
Date: Sat, 22 Feb 2020 19:39:34 -0600
Subject: New packages: user/libgeoip, user/libmaxminddb, user/lua-yaml,
 user/yaml-cpp

---
 user/lua-yaml/APKBUILD | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 user/lua-yaml/APKBUILD

(limited to 'user/lua-yaml')

diff --git a/user/lua-yaml/APKBUILD b/user/lua-yaml/APKBUILD
new file mode 100644
index 000000000..6c835554f
--- /dev/null
+++ b/user/lua-yaml/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: Alyx Wolcott <alyx@leuhta.com>
+# Maintainer: Alyx Wolcott <alyx@leuhta.com>
+pkgname=lua-yaml
+pkgver=6.2.4
+pkgrel=0
+pkgdesc="LibYAML binding for Lua"
+url="https://gvvaughan.github.io/lyaml/"
+arch="all"
+license="MIT"
+depends="lua5.3"
+makedepends="lua5.3-dev yaml-dev"
+options="!check"
+source="$pkgname-$pkgver.tar.gz::https://github.com/gvvaughan/lyaml/archive/v$pkgver.tar.gz"
+builddir="$srcdir/lyaml-$pkgver"
+
+build () {
+	./build-aux/luke PREFOX=$pkgdir/usr VERSION="${pkgver}"
+}
+
+package() {
+	mkdir -p $pkgdir/usr
+	./build-aux/luke PREFIX=$pkgdir/usr install
+}
+
+sha512sums="92dea86a3b1d648093d2134ea4c558432b0861942aa141359d1ca9d7bc55f33a62bb38e12fd653d69139e0a6f0ea6202a9e8c57f750a065d35f0dd674eacaf8a  lua-yaml-6.2.4.tar.gz"
-- 
cgit v1.2.3-70-g09d2


From b2afa3d3e2afa81810509893149032c2912f23ee Mon Sep 17 00:00:00 2001
From: Alyx Wolcott <alyx@malkier.net>
Date: Mon, 24 Feb 2020 22:47:05 -0600
Subject: user/libmaxminddb, user/lua-yaml, user/yaml-cpp: Do the needful

---
 user/libmaxminddb/APKBUILD |  1 -
 user/lua-yaml/APKBUILD     |  2 +-
 user/yaml-cpp/APKBUILD     | 10 +---------
 3 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'user/lua-yaml')

diff --git a/user/libmaxminddb/APKBUILD b/user/libmaxminddb/APKBUILD
index b7724ffdf..f1762c4ca 100644
--- a/user/libmaxminddb/APKBUILD
+++ b/user/libmaxminddb/APKBUILD
@@ -9,7 +9,6 @@ arch="all"
 license="Apache-2.0"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/maxmind/libmaxminddb/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	./configure \
diff --git a/user/lua-yaml/APKBUILD b/user/lua-yaml/APKBUILD
index 6c835554f..f252b3a7b 100644
--- a/user/lua-yaml/APKBUILD
+++ b/user/lua-yaml/APKBUILD
@@ -6,10 +6,10 @@ pkgrel=0
 pkgdesc="LibYAML binding for Lua"
 url="https://gvvaughan.github.io/lyaml/"
 arch="all"
+options="!check"  # No tests, sweet.
 license="MIT"
 depends="lua5.3"
 makedepends="lua5.3-dev yaml-dev"
-options="!check"
 source="$pkgname-$pkgver.tar.gz::https://github.com/gvvaughan/lyaml/archive/v$pkgver.tar.gz"
 builddir="$srcdir/lyaml-$pkgver"
 
diff --git a/user/yaml-cpp/APKBUILD b/user/yaml-cpp/APKBUILD
index 4f7e7bfa9..53f41b87b 100644
--- a/user/yaml-cpp/APKBUILD
+++ b/user/yaml-cpp/APKBUILD
@@ -13,7 +13,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/jbeder/yaml-cpp/archive/yaml
 builddir="$srcdir/$pkgname-$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -30,17 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
-}
-
-check() {
-	cd "$builddir"
-	make test 
+        CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-- 
cgit v1.2.3-70-g09d2