From 00e5d8a6b07323c117660ea05da850ba6c3b266b Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 3 Nov 2017 09:48:49 +0000
Subject: main/dovecot: refactor configure

move configure to a function so we avoid specify the common options
multiple times
---
 main/dovecot/APKBUILD | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 072de62138..d609685a73 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -37,17 +37,24 @@ builddir="$srcdir/$pkgname-$pkgver"
 _builddirpigeonhole="$srcdir/$pkgname-${_pkgvermajor}-pigeonhole-$_pigeonholever"
 _builddirpluginextdata="$srcdir/pigeonhole-${_pigeonholevermajor/./-}-sieve-extdata-$_pluginextdataver"
 
-build() {
-	cd "$builddir"
+
+_configure() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--libexecdir=/usr/lib/$pkgname \
 		--localstatedir=/var \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--disable-static \
+		"$@"
+}
+
+build() {
+	cd "$builddir"
+	_configure \
+		--libexecdir=/usr/lib/$pkgname \
 		--with-gssapi=plugin \
 		--with-ldap=plugin \
 		--with-sql=plugin \
@@ -61,28 +68,15 @@ build() {
 
 	# Build pigeonhole plugin
 	cd "$_builddirpigeonhole"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
+	_configure \
 		--with-dovecot="$builddir" \
-		--with-ldap=plugin \
-		--disable-static
+		--with-ldap=plugin
 	make
 
 	# Build the extdata plugin
 	cd "$_builddirpluginextdata"
 	./autogen.sh
-	./configure \
-		--prefix=/usr \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
+	_configure \
 		--with-dovecot="$builddir" \
 		--with-pigeonhole="$_builddirpigeonhole"
 	make
@@ -142,6 +136,7 @@ _mv() {
 
 dev() {
 	default_dev
+	mkdir -p "$subpkgdir"/usr/lib/dovecot
 	mv "$pkgdir"/usr/lib/dovecot/dovecot-config \
 		"$subpkgdir"/usr/lib/dovecot/
 }
-- 
cgit v1.2.3