From 9c8fda13e25549207ab76e557eaf3fb76b5a2c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Thu, 3 Nov 2016 09:19:38 +0200
Subject: main/openvpn-auth-ldap: fix build

---
 main/openvpn-auth-ldap/APKBUILD | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'main')

diff --git a/main/openvpn-auth-ldap/APKBUILD b/main/openvpn-auth-ldap/APKBUILD
index f68db97fb..8659aa2de 100644
--- a/main/openvpn-auth-ldap/APKBUILD
+++ b/main/openvpn-auth-ldap/APKBUILD
@@ -1,30 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openvpn-auth-ldap
 pkgver=2.0.3
-_openvpnver=2.1.3
-pkgrel=4
+pkgrel=5
 pkgdesc="LDAP authentication and authorization plugin for OpenVPN 2.x"
 url="http://code.google.com/p/openvpn-auth-ldap/"
 arch="all"
 license="GPL"
 depends=
-makedepends="openvpn re2c openldap-dev gcc-objc"
+makedepends="automake autoconf re2c openldap-dev openvpn-dev gcc-objc"
 install=
 subpackages=
 source="https://github.com/threerings/openvpn-auth-ldap/archive/auth-ldap-$pkgver.tar.gz
-	http://openvpn.net/release/openvpn-$_openvpnver.tar.gz
 	"
-_builddir="$srcdir"/auth-ldap-$pkgver
+builddir="$srcdir"/openvpn-auth-ldap-auth-ldap-$pkgver
 
 prepare() {
-	cd "$_builddir"
-	# apply patches here
-	sed -i -e '/<objc\/objc-api.h>/d' configure
+	default_prepare || return 1
+	cd "$builddir"
+	sed -i -e '/^builtin(include,objc.m4)/d' aclocal.m4
+	(autoconf && autoheader) || return 1
 	update_config_sub || return 1
+	sed -i -e '/<objc\/objc-api.h>/d' configure
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,21 +32,18 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-openvpn="$srcdir"/openvpn-$_openvpnver \
+		--with-openvpn=/usr \
 		--with-objc-runtime=GNU \
 		|| return 1
 	make || return 1
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	mkdir -p "$pkgdir"/usr/lib
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="edc1e9d61d4feb9eed24656094c2f907  auth-ldap-2.0.3.tar.gz
-7486d3e270ba4b033e311d3e022a0ad7  openvpn-2.1.3.tar.gz"
-sha256sums="3bafd6733513d8d824cfc84e308dfa91b2ed021b67892fc7488962cb9f94d283  auth-ldap-2.0.3.tar.gz
-5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36  openvpn-2.1.3.tar.gz"
-sha512sums="e09be3453fe6cf43e535c1bc85aefa4de51d83f301558176611595f63093fe70bd9bc5d21c8dea56d3ad46335019b3bb803afceeec03985514a4b27474f14512  auth-ldap-2.0.3.tar.gz
-a62519a9f4c1724a9fd68d4e9e5aca4d9eb371cc9ace5ee13ccabbf6aa4d0dcf9516bfd76579355434e93028f5bf92abcf89f0a4f6865b71970607c6b2892dcd  openvpn-2.1.3.tar.gz"
+md5sums="edc1e9d61d4feb9eed24656094c2f907  auth-ldap-2.0.3.tar.gz"
+sha256sums="3bafd6733513d8d824cfc84e308dfa91b2ed021b67892fc7488962cb9f94d283  auth-ldap-2.0.3.tar.gz"
+sha512sums="e09be3453fe6cf43e535c1bc85aefa4de51d83f301558176611595f63093fe70bd9bc5d21c8dea56d3ad46335019b3bb803afceeec03985514a4b27474f14512  auth-ldap-2.0.3.tar.gz"
-- 
cgit v1.2.3