From a627ca550fd4309c72137fe73943471021e854cb Mon Sep 17 00:00:00 2001
From: dsainty <dsainty>
Date: Sat, 18 Aug 2012 13:14:05 +0000
Subject: ptrdiff_t is not defined for this header for at least Ubuntu 11.10. 
 But as nothing uses this difference_type anyway, just don't bother defining
 it.

Fixes build for Ubuntu 11.10, no change elsewhere.
---
 databases/palm-db-tools/distinfo         |  4 ++--
 databases/palm-db-tools/patches/patch-aa | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'databases/palm-db-tools')

diff --git a/databases/palm-db-tools/distinfo b/databases/palm-db-tools/distinfo
index b2acdb3c6a5..749ac9af1f3 100644
--- a/databases/palm-db-tools/distinfo
+++ b/databases/palm-db-tools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2010/08/11 12:21:56 dsainty Exp $
+$NetBSD: distinfo,v 1.4 2012/08/18 13:14:05 dsainty Exp $
 
 SHA1 (palm-db-tools-0_3_6.tar.gz) = b8ef6ed7059f5f71571622af6ece86b61cfacee6
 RMD160 (palm-db-tools-0_3_6.tar.gz) = 26a5ce1ab9d558a4b42f3278be809b31eefb19b4
 Size (palm-db-tools-0_3_6.tar.gz) = 201644 bytes
-SHA1 (patch-aa) = 63810ff29c59b3abb48f43b55ca92968711ec943
+SHA1 (patch-aa) = f80085ca7a97dab6e22622fe98d1b2f9aa1c8d3f
 SHA1 (patch-ab) = cc36b595666e8843728485a804f74322adb38b07
 SHA1 (patch-ac) = 15e13a574ccd5c800eac4216baac38692ee16ed7
 SHA1 (patch-ad) = 0c8d624367a135fb5b0cf7ab5514f52f8cf3ac16
diff --git a/databases/palm-db-tools/patches/patch-aa b/databases/palm-db-tools/patches/patch-aa
index 7ac0d2ea219..5b17e4f774b 100644
--- a/databases/palm-db-tools/patches/patch-aa
+++ b/databases/palm-db-tools/patches/patch-aa
@@ -1,9 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/02/19 21:19:14 dsainty Exp $
+$NetBSD: patch-aa,v 1.2 2012/08/18 13:14:05 dsainty Exp $
 
 GCC 4.1.2 errors on semicolon following namespace block.
 
+ptrdiff_t is not defined here on at least Ubuntu.  But as nothing uses
+this difference_type anyway, just don't bother defining it.
+
 --- libpalm/Block.h.orig	2003-06-20 11:37:47.000000000 +1200
 +++ libpalm/Block.h	2007-02-19 20:55:39.000000000 +1300
+@@ -29,7 +29,7 @@
+ 	typedef value_type& reference;
+ 	typedef const value_type& const_reference;
+ 	typedef size_t size_type;
+-	typedef ptrdiff_t difference_type;
++	//typedef ptrdiff_t difference_type;
+ 
+ 	// STL: reverisible container type definitions
+ #ifdef __GNUG__
 @@ -176,7 +176,7 @@
  	size_type m_size;
      };
-- 
cgit v1.2.3