From 34a8b8725db414e6f51b35a6c248d4c67f53c154 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Tue, 19 Mar 2019 13:43:16 +0000
Subject:  user/netqmail: add a package() to APKBUILD, because abuild

---
 user/netqmail/APKBUILD | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'user/netqmail')

diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD
index b5b50d6ad..8329792ad 100644
--- a/user/netqmail/APKBUILD
+++ b/user/netqmail/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=netqmail
 pkgver=1.06
-pkgrel=4
+pkgrel=5
 pkgdesc="The qmail mail transfer agent (community version)"
 url="http://www.qmail.org/$pkgname/"
 arch="all"
@@ -13,9 +13,9 @@ depends="execline s6 s6-networking"
 makedepends="utmps-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 install="$pkgname.post-install $pkgname.pre-deinstall"
-source="http://www.qmail.org/$pkgname-$pkgver.tar.gz \
-	0001-DESTDIR.patch \
-	0002-qbiffutmpx-20170820.patch \
+source="http://www.qmail.org/$pkgname-$pkgver.tar.gz
+	0001-DESTDIR.patch
+	0002-qbiffutmpx-20170820.patch
 	0003-qmailremote-20170716.patch
 	0004-notifyfd.patch
 	qmail.run
@@ -66,21 +66,19 @@ makeservicedir()
 
 build() {
         cd "$builddir"
-        echo "gcc -O2 -pipe -W -Wall -Wextra" > conf-cc
-        echo "gcc -s -static" > conf-ld
-        echo "gcc -s" > conf-ldi  # because fakeroot doesn't work with static programs
+        echo "$CC $CFLAGS" > conf-cc
+        echo "$CC $LDFLAGS -s -static" > conf-ld
+        echo "$CC $LDFLAGS" > conf-ldi  # because fakeroot doesn't work with static programs
         echo 022 > conf-patrn
         echo /var/qmail > conf-qmail
         echo 255 > conf-spawn
         { echo alias; echo qmaild; echo qmaill; echo root; echo qmailp; echo qmailq; echo qmailr; echo qmails; } > conf-users
         { echo qmail; echo nofiles; } > conf-groups
         make
+}
 
-
-	# The following should be done in package(), but abuild only
-	# does it under fakeroot when it's done in build() and
-	# there's no package() function.
-
+package() {
+	cd "$builddir"
 	mkdir -p -m 0755 "$pkgdir"/var/qmail/services "$pkgdir"/var/log/qmail "$pkgdir"/usr/bin "$pkgdir"/usr/sbin "$pkgdir"/usr/share/doc "$pkgdir"/etc/qmail/services "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d
 	chown qmaill:qmaill "$pkgdir"/var/log/qmail
 	chmod 2700 "$pkgdir"/var/log/qmail
-- 
cgit v1.2.3-60-g2f50