diff options
-rw-r--r-- | system/s6-linux-init/APKBUILD | 5 | ||||
-rw-r--r-- | system/s6-rc/APKBUILD | 5 | ||||
-rw-r--r-- | system/s6/APKBUILD | 5 | ||||
-rw-r--r-- | system/sed/APKBUILD | 1 | ||||
-rw-r--r-- | system/shimmy/APKBUILD | 2 | ||||
-rw-r--r-- | system/skalibs/APKBUILD | 9 | ||||
-rw-r--r-- | system/sp/APKBUILD | 6 | ||||
-rw-r--r-- | system/ssmtp/APKBUILD | 4 | ||||
-rw-r--r-- | system/sysklogd/APKBUILD | 2 | ||||
-rw-r--r-- | system/sysvinit/APKBUILD | 6 |
10 files changed, 14 insertions, 31 deletions
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 |