system/p*: modernise, fix dependencies

6 files changed, 10 insertions, 25 deletions

diff --git a/system/patch/APKBUILD b/system/patch/APKBUILD
index 292076831..1adf32bda 100644
--- a/system/patch/APKBUILD
+++ b/system/patch/APKBUILD
@@ -7,9 +7,8 @@ url="https://www.gnu.org/software/patch/patch.html"
 arch="all"
 license="GPL-3.0+"
 depends=""
-makedepends=""
 checkdepends="bash ed"
-install=""
+makedepends=""
 subpackages="$pkgname-doc"
 source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	allow-missing.patch
@@ -19,7 +18,6 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	CVE-2019-13636.patch
 	CVE-2019-13638.patch
 	"
-builddir="$srcdir"/$pkgname-$pkgver
 
 # secfixes:
 #   2.7.6-r2:
@@ -32,7 +30,6 @@ builddir="$srcdir"/$pkgname-$pkgver
 #     - CVE-2019-13638
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -44,7 +41,6 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make SHELL=bash check
 }
 
diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD
index b16bdfa56..4df8d9e58 100644
--- a/system/perl/APKBUILD
+++ b/system/perl/APKBUILD
@@ -9,9 +9,9 @@ pkgrel=0
 pkgdesc="Larry Wall's Practical Extraction and Report Language"
 url="https://www.perl.org/"
 arch="all"
-license="Artistic-1.0-Perl GPL-2.0"
 # remove !check when tests pass.
 options="!check !fhs"
+license="Artistic-1.0-Perl GPL-2.0"
 depends=""
 makedepends="bzip2-dev zlib-dev"
 subpackages="$pkgname-doc $pkgname-dev"
diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD
index 94afc28ca..1110b56e0 100644
--- a/system/pkgconf/APKBUILD
+++ b/system/pkgconf/APKBUILD
@@ -6,10 +6,12 @@ pkgdesc="Toolkit for maintaining development package metadata"
 url="https://git.dereferenced.org/pkgconf/pkgconf/"
 arch="all"
 license="ISC"
+depends=""
+checkdepends="kyua atf"
+makedepends=""
 replaces="pkgconfig"
 provides="pkgconfig=1"
 subpackages="$pkgname-doc $pkgname-dev"
-checkdepends="kyua atf"
 source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz"
 
 build() {
diff --git a/system/popt/APKBUILD b/system/popt/APKBUILD
index c9ff115b7..61f815205 100644
--- a/system/popt/APKBUILD
+++ b/system/popt/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Command-line option parser"
 url="http://ftp.rpm.org/mirror/popt/README"
 arch="all"
 license="X11"
-depends=
+depends=""
 makedepends=""
 source="http://ftp.rpm.org/mirror/$pkgname/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-lang"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,14 +28,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
 sha512sums="bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694  popt-1.16.tar.gz"
diff --git a/system/procps/APKBUILD b/system/procps/APKBUILD
index f16c674ae..65b740d62 100644
--- a/system/procps/APKBUILD
+++ b/system/procps/APKBUILD
@@ -6,9 +6,10 @@ pkgdesc="Utilities for monitoring your system and processes on your system"
 url="https://gitlab.com/procps-ng/procps"
 arch="all"
 license="GPL-2.0+ LGPL-2.0+"
+depends=""
+checkdepends="dejagnu"
 makedepends_build="autoconf automake libtool gettext-tiny"
 makedepends_host="ncurses-dev utmps-dev"
-checkdepends="dejagnu"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libproc"
 source="https://gitlab.com/procps-ng/procps/-/archive/v$pkgver/procps-v$pkgver.tar.bz2
 	0001-pt_BR-fix-translation-error.patch
@@ -16,15 +17,12 @@ source="https://gitlab.com/procps-ng/procps/-/archive/v$pkgver/procps-v$pkgver.t
 builddir="$srcdir/$pkgname-v$pkgver"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	printf "$pkgver" > .tarball-version
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
-
 	export LIBS="$LIBS -lutmps -lskarnet"
 	export VERSION="$pkgver"
 	./configure \
@@ -47,14 +45,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	# can't use `make check`; 'po' dir has no check target
 	make check-TESTS
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" ldconfig=true install="install -D" \
 		install
 
diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD
index f98d21cf1..bd86605fc 100644
--- a/system/psmisc/APKBUILD
+++ b/system/psmisc/APKBUILD
@@ -9,9 +9,10 @@ arch="all"
 options="!check"  # killall(8) is known-broken on musl:
                   # https://gitlab.com/psmisc/psmisc/issues/18
 license="GPL-2.0+"
+depends=""
+checkdepends="dejagnu"
 makedepends_build="autoconf>=2.69 automake"
 makedepends_host="ncurses-dev"
-checkdepends="dejagnu"
 subpackages="$pkgname-doc"
 [ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang"
 source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/$pkgname/$pkgname/repository/archive.tar.bz2?ref=v$pkgver
@@ -24,12 +25,10 @@ prepare() {
 
 	default_prepare
 
-	cd "$builddir"
 	sh autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -46,12 +45,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }