From 6e92de6b3fd71a9c17b74b1ea95ea1e9a4ed83bf Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 23 Oct 2019 10:43:35 -0500 Subject: system/skalibs et al.: update skaware to latest versions --- system/s6-rc/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'system/s6-rc') diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index c8e4895db..68a3fd70f 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=s6-rc -pkgver=0.5.1.0 +pkgver=0.5.1.1 pkgrel=0 pkgdesc="skarnet.org's service manager, working on top of s6" url="https://skarnet.org/software/s6-rc/" arch="all" options="!check" license="ISC" -_skalibs_version=2.9.0.0 -_s6_version=2.9.0.0 +_skalibs_version=2.9.1.0 +_s6_version=2.9.0.1 depends="execline" makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" @@ -67,4 +67,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="e529545e90110986ced7ff445bc831de74a953e76aef0a9802b28228ef3705dcc8bf1abd90034d6e8de8c29dd3f4512e492168c4a1582a15a9e9e8ad8dc88909 s6-rc-0.5.1.0.tar.gz" +sha512sums="88e6ad4f09501eda231e3bbac58e9dafc925ff4b2c2a845c9796f3c1519834901f0126d751705b00ecd71173e208085bd68c5ae221a7074da8254d2b71e8a772 s6-rc-0.5.1.1.tar.gz" -- cgit v1.2.3-70-g09d2 From 0bde1639103fa9dab748dc0bfc7d483c652e96a7 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 21 Dec 2019 01:20:54 +0000 Subject: system/s*: modernise, fix metadata --- system/s6-linux-init/APKBUILD | 5 ++--- system/s6-rc/APKBUILD | 5 ++--- system/s6/APKBUILD | 5 ++--- system/sed/APKBUILD | 1 + system/shimmy/APKBUILD | 2 -- system/skalibs/APKBUILD | 9 ++++----- system/sp/APKBUILD | 6 +----- system/ssmtp/APKBUILD | 4 +--- system/sysklogd/APKBUILD | 2 -- system/sysvinit/APKBUILD | 6 +----- 10 files changed, 14 insertions(+), 31 deletions(-) (limited to 'system/s6-rc') diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index 93b63a981..58415752b 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -17,7 +17,6 @@ install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" provides="/sbin/init=0" build() { - cd "$builddir" ./configure \ --enable-shared \ --enable-static \ @@ -31,7 +30,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install for i in rc.init runlevel rc.shutdown ; do @@ -99,6 +97,7 @@ libs() { dev() { pkgdesc="$pkgdesc (development files)" depends="skalibs-dev>=$_skalibs_version" + install_if="dev $pkgname=$pkgver-r$pkgrel" mkdir -p "$subpkgdir/usr" mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/" } @@ -114,7 +113,7 @@ libsdev() { doc() { pkgdesc="$pkgdesc (documentation)" - depends= + depends="" install_if="docs $pkgname=$pkgver-r$pkgrel" mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index 68a3fd70f..f857861e5 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -16,7 +16,6 @@ subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --enable-shared \ --enable-static \ @@ -29,7 +28,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -45,6 +43,7 @@ libs() { dev() { pkgdesc="$pkgdesc (development files)" depends="skalibs-dev>=$_skalibs_version s6-dev>=$_s6_version" + install_if="dev $pkgname=$pkgver-r$pkgrel" mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" mv "$pkgdir/usr/include" "$subpkgdir/usr/" mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/" @@ -61,7 +60,7 @@ libsdev() { doc() { pkgdesc="$pkgdesc (documentation)" - depends= + depends="" install_if="docs $pkgname=$pkgver-r$pkgrel" mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 4ab995b4b..e4acf50ef 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -17,7 +17,6 @@ triggers="$pkgname.trigger=/run/service" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --enable-shared \ --enable-static \ @@ -30,7 +29,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir -p -m 0755 "$pkgdir/var/lib/s6/services" } @@ -47,6 +45,7 @@ libs() { dev() { pkgdesc="$pkgdesc (development files)" depends="skalibs-dev>=$_skalibs_version" + install_if="dev $pkgname=$pkgver-r$pkgrel" mkdir -p "$subpkgdir/usr" mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/" } @@ -62,7 +61,7 @@ libsdev() { doc() { pkgdesc="$pkgdesc (documentation)" - depends= + depends="" install_if="docs $pkgname=$pkgver-r$pkgrel" mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" diff --git a/system/sed/APKBUILD b/system/sed/APKBUILD index 61d644e32..8b90aaee0 100644 --- a/system/sed/APKBUILD +++ b/system/sed/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="GNU stream editor" url="https://www.gnu.org/software/sed" arch="all" license="GPL-3.0+" +depends="" makedepends="perl" subpackages="$pkgname-doc $pkgname-lang" install="$pkgname.post-deinstall" diff --git a/system/shimmy/APKBUILD b/system/shimmy/APKBUILD index ae675b53b..ab9b55f64 100644 --- a/system/shimmy/APKBUILD +++ b/system/shimmy/APKBUILD @@ -14,12 +14,10 @@ replaces="musl-utils" source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index 0001ff676..2ec93cd17 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -12,7 +12,6 @@ subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --enable-shared \ --enable-static \ @@ -21,14 +20,13 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } libs() { pkgdesc="$pkgdesc (shared libraries)" - depends= + depends="" mkdir -p "$subpkgdir/lib" mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/" } @@ -36,7 +34,8 @@ libs() { dev() { pkgdesc="$pkgdesc (development files)" - depends= + depends="" + install_if="dev $pkgname=$pkgver-r$pkgrel" mkdir -p "$subpkgdir" mv "$pkgdir/usr" "$subpkgdir/" } @@ -52,7 +51,7 @@ libsdev() { doc() { pkgdesc="$pkgdesc (documentation)" - depends= + depends="" install_if="docs $pkgname=$pkgver-r$pkgrel" mkdir -p "$subpkgdir/usr/share/doc" cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" diff --git a/system/sp/APKBUILD b/system/sp/APKBUILD index c25be62d0..083aa3692 100644 --- a/system/sp/APKBUILD +++ b/system/sp/APKBUILD @@ -6,12 +6,10 @@ pkgrel=0 pkgdesc="An SGML system conforming to ISO 8879" url="http://www.jclark.com/sp/" arch="all" +options="!check" # No test suite. license="X11" depends="" -depends_dev="" makedepends="$depends_dev" -install="" -options="!check" subpackages="" source="ftp://ftp.jclark.com/pub/sp/sp-$pkgver.tar.gz configure.patch @@ -19,12 +17,10 @@ source="ftp://ftp.jclark.com/pub/sp/sp-$pkgver.tar.gz " build() { - cd "$builddir" make } package() { - cd "$builddir" # it will not create the prefix directory itself mkdir -p "$pkgdir"/usr make DESTDIR="$pkgdir" install diff --git a/system/ssmtp/APKBUILD b/system/ssmtp/APKBUILD index 4d77bb213..cb5dbbc09 100644 --- a/system/ssmtp/APKBUILD +++ b/system/ssmtp/APKBUILD @@ -10,7 +10,7 @@ options="!check" license="GPL-2.0+" provides=/usr/sbin/sendmail provider_priority=10 -depends= +depends="" makedepends="openssl-dev autoconf" subpackages="$pkgname-doc" # No HTTPS @@ -21,7 +21,6 @@ source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.o " build() { - cd "$builddir" sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in autoconf @@ -37,7 +36,6 @@ build() { } package() { - cd "$builddir" make prefix="$pkgdir"/usr \ etcdir="$pkgdir"/etc \ mandir="$pkgdir"/usr/share/man \ diff --git a/system/sysklogd/APKBUILD b/system/sysklogd/APKBUILD index f76f61435..d8046befd 100644 --- a/system/sysklogd/APKBUILD +++ b/system/sysklogd/APKBUILD @@ -27,12 +27,10 @@ source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar. LICENSE" build() { - cd "$builddir" make CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" LIBS="-lutmps -lskarnet" } package() { - cd "$builddir" make INSTALL="install -D" prefix="$pkgdir" install install -D -m644 "$srcdir"/sysklogd.logrotate \ diff --git a/system/sysvinit/APKBUILD b/system/sysvinit/APKBUILD index e13e92043..67ce05459 100644 --- a/system/sysvinit/APKBUILD +++ b/system/sysvinit/APKBUILD @@ -22,7 +22,6 @@ source="https://download.savannah.nongnu.org/releases/sysvinit/sysvinit-${pkgver builddir="$srcdir/sysvinit-${pkgver}dsf" prepare() { - cd "$builddir" default_prepare # util-linux @@ -45,13 +44,11 @@ prepare() { } build() { - cd "$builddir" export DISTRO="Adélie" make -C src } -_install_s6_stuff() -{ +_install_s6_stuff() { svcimg="$pkgdir/etc/s6-linux-init/current/run-image/service" mkdir -p -m 0755 "$pkgdir/sbin" "$svcimg/.s6-svscan" "$svcimg/s6-svscan-log" { echo '#!/bin/execlineb -P' ; echo 'false' ; } > "$svcimg/.s6-svscan/crash" @@ -64,7 +61,6 @@ _install_s6_stuff() } package() { - cd "$builddir" make -C src install ROOT="$pkgdir" rm "$pkgdir"/usr/bin/lastb || true install -D -m644 "$srcdir"/inittab-2.88 "$pkgdir"/etc/inittab -- cgit v1.2.3-70-g09d2 From b50054b25816d1be2f6f5df05dd32d361888f6e2 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Mon, 2 Mar 2020 19:39:23 -0600 Subject: system/s6-rc: bump to 0.5.1.2 --- system/s6-rc/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/s6-rc') diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index f857861e5..cc7148513 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=s6-rc -pkgver=0.5.1.1 +pkgver=0.5.1.2 pkgrel=0 pkgdesc="skarnet.org's service manager, working on top of s6" url="https://skarnet.org/software/s6-rc/" @@ -66,4 +66,4 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="88e6ad4f09501eda231e3bbac58e9dafc925ff4b2c2a845c9796f3c1519834901f0126d751705b00ecd71173e208085bd68c5ae221a7074da8254d2b71e8a772 s6-rc-0.5.1.1.tar.gz" +sha512sums="d52b8b22c709f5d8df7d54d70363f06f7b64b841019d046e9ecaf2cb5f1d319ce8995da5eb5aafb9627f993abfe213c4f75ae3ad6cadad2b3a3175271989ac95 s6-rc-0.5.1.2.tar.gz" -- cgit v1.2.3-70-g09d2