From 8a237d7bb6ece7aae8928795fc6a083934055ac5 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 23 Feb 2012 07:47:41 +0000
Subject: main/gnokii: upgrade to 0.6.31

---
 main/gnokii/APKBUILD      | 25 +++++++++++++++++--------
 main/gnokii/gnokii.patch  |  9 ++++-----
 main/gnokii/xgnokii.patch | 11 +++++++++++
 3 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 main/gnokii/xgnokii.patch

(limited to 'main')

diff --git a/main/gnokii/APKBUILD b/main/gnokii/APKBUILD
index 1cf052fbf3..3c80b132c9 100644
--- a/main/gnokii/APKBUILD
+++ b/main/gnokii/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnokii
-pkgver=0.6.30
-pkgrel=4
+pkgver=0.6.31
+pkgrel=0
 pkgdesc="Tools and user space driver for use with mobile phones"
 url="http://www.gnokii.org/"
 arch="all"
@@ -9,18 +9,25 @@ license="GPL"
 depends=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs xgnokii $pkgname-smsd
 	$pkgname-smsd-pgsql:pgsql $pkgname-smsd-mysql:mysql
-	$pkgname-smsd-sqlite:sqlite"
+	$pkgname-smsd-sqlite:sqlite $pkgname-lang"
 
 makedepends="gtk+-dev mysql-dev intltool libusb-compat-dev libxpm-dev
-	bluez-dev libical-dev postgresql-dev sqlite-dev"
+	bluez-dev libical-dev postgresql-dev sqlite-dev
+	autoconf automake libtool"
 source="http://www.gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2
-	gnokii.patch"
+	gnokii.patch
+	xgnokii.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	autoreconf || return 1
 	sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in
-	patch -Np1 -i "$srcdir/gnokii.patch"
 }
 
 build() {
@@ -30,6 +37,7 @@ build() {
 		--enable-security \
 		--disable-unix98test \
 		--disable-phonet \
+		--with-x \
 		|| return 1
 	make
 }
@@ -80,5 +88,6 @@ sqlite() {
 	mkdir -p "$subpkgdir"/usr/lib/smsd
 	mv "$pkgdir"/usr/lib/smsd/*sqlite*.so "$subpkgdir"/usr/lib/smsd/
 }
-md5sums="c90137d403febbc16712d64f0eb196de  gnokii-0.6.30.tar.bz2
-4d764727686ee34bc73489c8b1321c82  gnokii.patch"
+md5sums="d9627f4a1152d3ea7806df4532850d5f  gnokii-0.6.31.tar.bz2
+5de7a1c6a59b740df9d24f5c08cea448  gnokii.patch
+6b87d13cb012bfdfd3581d89f42a3cff  xgnokii.patch"
diff --git a/main/gnokii/gnokii.patch b/main/gnokii/gnokii.patch
index e64d81aa12..69ca868e3b 100644
--- a/main/gnokii/gnokii.patch
+++ b/main/gnokii/gnokii.patch
@@ -1,10 +1,9 @@
-diff -ur gnokii-0.6.7-old/Docs/sample/gnokiirc gnokii-0.6.7/Docs/sample/gnokiirc
---- gnokii-0.6.7-old/Docs/sample/gnokiirc	2005-05-16 20:55:13.000000000 +0200
-+++ gnokii-0.6.7/Docs/sample/gnokiirc	2005-06-03 10:49:42.000000000 +0200
-@@ -112,7 +112,7 @@
+--- ./Docs/sample/gnokiirc.orig
++++ ./Docs/sample/gnokiirc
+@@ -238,7 +238,7 @@
+ # In particular ensure that mgnokiidev is in this location, with
  # permissions 4750, owned by root, group gnokii.  Ensure you
  # are in the gnokii group and that the group exists...
- [gnokiid]
 -bindir = /usr/local/sbin/
 +bindir = /usr/sbin/
  
diff --git a/main/gnokii/xgnokii.patch b/main/gnokii/xgnokii.patch
new file mode 100644
index 0000000000..b354166139
--- /dev/null
+++ b/main/gnokii/xgnokii.patch
@@ -0,0 +1,11 @@
+--- ./configure.in.orig
++++ ./configure.in
+@@ -689,7 +689,7 @@
+    fi
+ fi
+ 
+-AM_CONDITIONAL(XGNOKII, test "x$_support" = "xyes")
++AM_CONDITIONAL(XGNOKII, test "x$x_support" = "xyes")
+ 
+ dnl ======================== Check for libsocket
+ AC_CHECK_LIB(socket, socket)
-- 
cgit v1.2.3