system/e*: modernise, fix metadata

5 files changed, 5 insertions, 16 deletions

diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD
index 741de2e38..5231d8004 100644
--- a/system/e2fsprogs/APKBUILD
+++ b/system/e2fsprogs/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=e2fsprogs
 pkgver=1.45.4
 pkgrel=0
-pkgdesc="Standard ext2/3/4 filesystem utilities"
+pkgdesc="Ext2/3/4 filesystem utilities"
 url="http://e2fsprogs.sourceforge.net"
 arch="all"
 license="GPL-2.0-only AND LGPL-2.0-only AND MIT"
diff --git a/system/ed/APKBUILD b/system/ed/APKBUILD
index 38acc491c..d13ab5a2b 100644
--- a/system/ed/APKBUILD
+++ b/system/ed/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=ed
 pkgver=1.15
 pkgrel=0
-pkgdesc="GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files"
+pkgdesc="GNU version of standard text editor"
 url="https://www.gnu.org/software/ed/"
 arch="all"
 license="GPL-3.0+"
@@ -14,24 +14,19 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz"
 builddir=$srcdir/$pkgname-$pkgver
 
 build() {
-	cd "$builddir"
-	# bindir needs correspond with busybox location
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--bindir=/bin \
 		--mandir=/usr/share/man
 	make all
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 836b9c392..3e903ee56 100644
--- a/system/execline/APKBUILD
+++ b/system/execline/APKBUILD
@@ -14,7 +14,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 \
@@ -26,11 +25,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-
 libs() {
         pkgdesc="$pkgdesc (shared libraries)"
         depends="skalibs-libs>=$_skalibs_version"
@@ -42,6 +39,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/"
 }
@@ -57,7 +55,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/expat/APKBUILD b/system/expat/APKBUILD
index cc412af83..4ec70f244 100644
--- a/system/expat/APKBUILD
+++ b/system/expat/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=expat
 pkgver=2.2.9
 pkgrel=0
-pkgdesc="An XML Parser library written in C"
+pkgdesc="XML parser library written in C"
 url="https://libexpat.github.io/"
 arch="all"
 license="MIT"
diff --git a/system/expect/APKBUILD b/system/expect/APKBUILD
index aa52a2e81..b2b2a5475 100644
--- a/system/expect/APKBUILD
+++ b/system/expect/APKBUILD
@@ -14,12 +14,10 @@ builddir="$srcdir"/$pkgname$pkgver
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -34,12 +32,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }