summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-10-05 19:28:20 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-10-05 19:28:20 +0000
commitb9b051749c7bbaa706152c103f6a277cbe8068a7 (patch)
treee60a5dd3b73d5be66e2a9dc42bc24e0d3eb83f22 /user
parentc21edcce6991a2615532a893f4f7c7df2d8e937f (diff)
parentc9ee32b12586ce3e6cb2e8be86dbf810846af1eb (diff)
downloadpackages-b9b051749c7bbaa706152c103f6a277cbe8068a7.tar.gz
packages-b9b051749c7bbaa706152c103f6a277cbe8068a7.tar.bz2
packages-b9b051749c7bbaa706152c103f6a277cbe8068a7.tar.xz
packages-b9b051749c7bbaa706152c103f6a277cbe8068a7.zip
Merge branch 'skaware.20191003' into 'master'
Skaware.20191003 See merge request adelie/packages!359
Diffstat (limited to 'user')
-rw-r--r--user/s6-dns/APKBUILD4
-rw-r--r--user/s6-linux-utils/APKBUILD40
-rw-r--r--user/s6-portable-utils/APKBUILD40
3 files changed, 82 insertions, 2 deletions
diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD
index c7eff41e1..7dbace338 100644
--- a/user/s6-dns/APKBUILD
+++ b/user/s6-dns/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-dns
pkgver=2.3.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities"
url="https://skarnet.org/software/s6-dns/"
arch="all"
@@ -22,7 +22,7 @@ build() {
--disable-allstatic \
--prefix=/usr \
--libdir=/usr/lib \
- --libexecdir="/usr/lib/$package" \
+ --libexecdir="/usr/lib/$pkgname" \
--with-dynlib=/lib
make
}
diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD
new file mode 100644
index 000000000..73c96b67c
--- /dev/null
+++ b/user/s6-linux-utils/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
+pkgname=s6-linux-utils
+pkgver=2.5.1.0
+pkgrel=0
+pkgdesc="skarnet.org's Linux-specific miscellaneous utilities"
+url="https://skarnet.org/software/s6-linux-utils/"
+arch="all"
+options="!check"
+license="ISC"
+_skalibs_version=2.9.0.0
+depends=
+makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
+subpackages="$pkgname-doc"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --disable-allstatic \
+ --prefix=/usr \
+ --with-dynlib=/lib
+ make
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+
+doc() {
+ pkgdesc="$pkgdesc (documentation)"
+ depends=
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+}
+
+sha512sums="03c63e3772812da99ffaa4c83163626bcdfe4887bb1a9bd576e21b0ff3c2c2a7de49234f9e2fd4d0881758b20ac2ef0cb827a20b32004cd7bf6e05c921f32d0e s6-linux-utils-2.5.1.0.tar.gz"
diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD
new file mode 100644
index 000000000..59ddf7559
--- /dev/null
+++ b/user/s6-portable-utils/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
+pkgname=s6-portable-utils
+pkgver=2.2.2.0
+pkgrel=0
+pkgdesc="skarnet.org's portable miscellaneous utilities"
+url="https://skarnet.org/software/s6-portable-utils/"
+arch="all"
+options="!check"
+license="ISC"
+_skalibs_version=2.9.0.0
+depends=
+makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
+subpackages="$pkgname-doc"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
+
+build() {
+ cd "$builddir"
+ ./configure \
+ --disable-allstatic \
+ --prefix=/usr \
+ --with-dynlib=/lib
+ make
+}
+
+package() {
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
+}
+
+
+doc() {
+ pkgdesc="$pkgdesc (documentation)"
+ depends=
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+}
+
+sha512sums="0f4400b00e44e984900e6a77fa326b91f472f3a97497d02549f3ec68f40d48438f37e574a3ee026498930449d8fd8de9a908923dcd58e1e99b58052f1fa35c40 s6-portable-utils-2.2.2.0.tar.gz"