Subject: [alpine-aports] [PATCH] main/dzen: modernise APKBUILD

From: Cág <[email-masked]>
Date: Wed, 1 Nov 2017 19:15:14 +0000

---
 main/dzen/APKBUILD | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/main/dzen/APKBUILD b/main/dzen/APKBUILD
index 56312812cd..8ceb804004 100644
--- a/main/dzen/APKBUILD
+++ b/main/dzen/APKBUILD
@@ -1,8 +1,8 @@
-# Maintainer:
+# Maintainer: Cág <[email-masked]>
 pkgname=dzen
 _pkgver=488ab66
 pkgver=0.9.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A general purpose messaging, notification and menuing program for X11"
 url="https://github.com/robm/dzen"
 arch="all"
@@ -21,14 +21,14 @@ prepare() {
 	cd "$_builddir"
         for i in $source; do
                 case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+                *.patch) msg $i; patch -p1 -i "$srcdir"/$i;;
                 esac
         done
 }
 
 build() {
 	cd "$_builddir"
-	make || return 1
+	make
 
 	cd gadgets
 	make
@@ -44,9 +44,5 @@ gadgets() {
 	make PREFIX=/usr DESTDIR="$subpkgdir" install
 }
 
-md5sums="dbc2c84321a070201da0de47463692f9  dzen-0.9.5.tar.gz
-823d3aab9cc1c2211e6ee9271ee9993a  0001-Enable-Xinerama-and-XPM.patch"
-sha256sums="d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556  dzen-0.9.5.tar.gz
-b2a98a7fd3b59ef3c40c032670d82d771d738d2f1ae22830421033c56ef819fe  0001-Enable-Xinerama-and-XPM.patch"
 sha512sums="239acfcacbc871ded5755ee0d5cca3185fcd93142bcf81552974f2ffc19d9f5ebdc02956108931f58b35c68ac57ec6e748bdb9cdbf7791ec6e224ef270bda300  dzen-0.9.5.tar.gz
 06cf3474926e7f2d612e36a96e10673a2d261a9a1dd9fec8c2382f1ceb9f1d203232980d73910723cd050d6d25c14ef2fae81b6413a58056a183fec1936cd73a  0001-Enable-Xinerama-and-XPM.patch"
-- 
2.15.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Sören Tempel <[email-masked]>
Date: Wed, 1 Nov 2017 22:29:59 +0100

Hi Cág,

> +                *.patch) msg $i; patch -p1 -i "$srcdir"/$i;;

Since you already started modernizing this aport I would suggest
removing that function entirely since this is what is nowadays done by
default_prepare [1]. In order to utilize that function `_builddir` needs
to be renamed to `builddir`.

It would be nice if you could also apply this change for main/acpi.

[1]: https://git.alpinelinux.org/cgit/abuild/tree/abuild.in?h=v3.1.0#n595

Cheers,
Sören

---