From 1f628645d6fd09d978f82a2ecafa3917acc82ad8 Mon Sep 17 00:00:00 2001
From: tonio <tonio@pkgsrc.org>
Date: Sun, 4 Sep 2005 14:53:15 +0000
Subject: Fix build of the osx_addressbook plugin under macosx 10.4 tiger

---
 databases/lbdb/distinfo         |  4 ++--
 databases/lbdb/patches/patch-aa | 23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'databases/lbdb')

diff --git a/databases/lbdb/distinfo b/databases/lbdb/distinfo
index 1c0106eee9b..b0d48a304c8 100644
--- a/databases/lbdb/distinfo
+++ b/databases/lbdb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/08/30 16:14:53 tonio Exp $
+$NetBSD: distinfo,v 1.3 2005/09/04 14:53:15 tonio Exp $
 
 SHA1 (lbdb_0.30.tar.gz) = d137c11857ea23e9689e0f93d876ec107a7b8467
 RMD160 (lbdb_0.30.tar.gz) = 289c2a9395523bac08bc36510894b14fb3b18057
 Size (lbdb_0.30.tar.gz) = 104620 bytes
-SHA1 (patch-aa) = 1a3218252c353c45e85d75278f824eca6c6811b3
+SHA1 (patch-aa) = 22fe204b0a72e6565fd20e812be1ca84550689b3
 SHA1 (patch-ab) = 9fda85f934b41be45239c1c4083e6592caa01d00
diff --git a/databases/lbdb/patches/patch-aa b/databases/lbdb/patches/patch-aa
index 4ccba1b9a9a..5b853d3222c 100644
--- a/databases/lbdb/patches/patch-aa
+++ b/databases/lbdb/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/08/30 16:14:53 tonio Exp $
+$NetBSD: patch-aa,v 1.3 2005/09/04 14:53:15 tonio Exp $
 
---- Makefile.in.orig	2004-01-18 12:58:43.000000000 +0000
-+++ Makefile.in	2005-07-05 17:40:54.000000000 +0100
-@@ -38,6 +38,7 @@
+--- Makefile.in.orig	2004-01-18 13:58:43.000000000 +0100
++++ Makefile.in
+@@ -38,6 +38,7 @@ srcdir=@srcdir@
  libdir=@libdir@
  mandir=@mandir@
  sysconfdir=@sysconfdir@
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.2 2005/08/30 16:14:53 tonio Exp $
  
  ALL=lbdbq lbdb_lib lbdb-fetchaddr lbdb-munge fetchaddr qpto8bit munge \
  	munge-keeporder	nodelist2lbdb palm_lsaddr mutt_ldap_query lbdbq.man \
-@@ -49,7 +50,7 @@
+@@ -49,7 +50,7 @@ all: Makefile $(ALL)
  install: all
  	$(srcdir)/mkinstalldirs $(install_prefix)$(bindir)
  	$(srcdir)/mkinstalldirs $(install_prefix)$(libdir)
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.2 2005/08/30 16:14:53 tonio Exp $
  	$(srcdir)/mkinstalldirs $(install_prefix)$(mandir)
  	$(srcdir)/mkinstalldirs $(install_prefix)$(mandir)/man1
  	$(INSTALL) -m 755 fetchaddr $(install_prefix)$(libdir)
-@@ -70,7 +71,7 @@
+@@ -70,7 +71,7 @@ install: all
  		$(INSTALL) -m 644 mutt_ldap_query.man \
  			$(install_prefix)$(mandir)/man1/mutt_ldap_query.1; \
  		$(INSTALL) -m 644 lbdb_ldap.rc \
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.2 2005/08/30 16:14:53 tonio Exp $
  	fi
  	if [ "$(XCODEBUILD)" != "no" -o "$(PBXBUILD)" != "no" ]; then \
  		$(INSTALL) -m 755 ABQuery/sym/ABQuery $(install_prefix)$(libdir); \
-@@ -81,7 +82,7 @@
+@@ -81,7 +82,7 @@ install: all
  	$(INSTALL) -m 644 lbdbq.man $(install_prefix)$(mandir)/man1/lbdbq.1
  	$(INSTALL) -m 644 lbdb-fetchaddr.man \
  		$(install_prefix)$(mandir)/man1/lbdb-fetchaddr.1
@@ -37,3 +37,12 @@ $NetBSD: patch-aa,v 1.2 2005/08/30 16:14:53 tonio Exp $
  	if [ "$(DOTLOCK_TARGET)" != "" ]; then \
  		$(INSTALL) -m 755 lbdb_dotlock $(install_prefix)$(bindir); \
  		$(INSTALL) -m 644 dotlock.man \
+@@ -145,7 +146,7 @@ ABQuery/sym/ABQuery: ABQuery/pbxbuild.sh
+ 
+ ABQuery/pbxbuild.sh:
+ 	if [ "$(XCODEBUILD)" != "no" ]; then \
+-		(cd ABQuery; xcodebuild -buildstyle Deployment; printf '#!/bin/sh\nmkdir ABQuery/sym; cp ABQuery/build/ABQuery ABQuery/sym\n' > pbxbuild.sh; chmod a+x pbxbuild.sh) \
++		(cd ABQuery; xcodebuild -buildstyle Deployment; printf '#!/bin/sh\nmkdir ABQuery/sym; if test -d ABQuery/build/Deployment; then cp ABQuery/build/Deployment/ABQuery ABQuery/sym; else cp ABQuery/build/ABQuery ABQuery/sym; fi\n' > pbxbuild.sh; chmod a+x pbxbuild.sh) \
+ 	else \
+ 		(cd ABQuery; pbxbuild -buildstyle Deployment export) \
+ 	fi
-- 
cgit v1.2.3