From 6a54b7423ddefcc2140175ec03f4108bec899492 Mon Sep 17 00:00:00 2001
From: ben <ben@pkgsrc.org>
Date: Tue, 10 Oct 2006 12:55:39 +0000
Subject: Fix coutier-imap to link to BDB_LIB instead of -ldb. This is related
 to PR#33802

---
 mail/courier-imap/Makefile         |  8 +++++++-
 mail/courier-imap/distinfo         |  3 ++-
 mail/courier-imap/patches/patch-al | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 mail/courier-imap/patches/patch-al

(limited to 'mail/courier-imap')

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index d73febad070..bde5b281afd 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/06/26 05:21:17 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2006/10/10 12:55:39 ben Exp $
 
 DISTNAME=	courier-imap-4.1.1
 PKGREVISION=	3
@@ -47,6 +47,12 @@ CONF_FILES_PERMS+=	${EGDIR}/${_file_}				\
 .endfor
 RCD_SCRIPTS=		courierimap courierimaps courierpop courierpops
 
+SUBST_CLASSES+=		bdb
+SUBST_MESSAGE.bdb=	Configuring to use $(BDB_LIBS)
+SUBST_STAGE.bdb=	post-patch
+SUBST_FILES.bdb=	configure bdbobj/configure.in bdbobj/configure
+SUBST_SED.bdb=		-e "s,-ldb,${BDB_LIBS},g"
+
 SUBST_CLASSES+=		courier
 SUBST_FILES.courier=	imap/imapd-ssl.dist.in imap/imapd.8.in		\
 			imap/imapd.cnf.in imap/imapd.dist.in		\
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 5d44d268db6..ccf0d24a924 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2006/06/09 22:12:10 jlam Exp $
+$NetBSD: distinfo,v 1.19 2006/10/10 12:55:39 ben Exp $
 
 SHA1 (courier-imap-4.1.1.tar.bz2) = 505f35a8a7d6f55b9d624e544785bc758700135c
 RMD160 (courier-imap-4.1.1.tar.bz2) = e7f4c0d7cbb0ccf061c31de1b0b2387ec9d87084
@@ -10,3 +10,4 @@ SHA1 (patch-af) = 37c54ed8aca2f86ac142f8fa920c217058c5fc29
 SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
 SHA1 (patch-ah) = 1870daea8320cc9748961fc7e37237bd5cde1b3c
 SHA1 (patch-ak) = 8919d48a0bc8093f30e2cc8316ff242752bcbc4a
+SHA1 (patch-al) = 5e3d549c96a0d25f963ecd08f8bf9f077263cd38
diff --git a/mail/courier-imap/patches/patch-al b/mail/courier-imap/patches/patch-al
new file mode 100644
index 00000000000..460ce4425cb
--- /dev/null
+++ b/mail/courier-imap/patches/patch-al
@@ -0,0 +1,35 @@
+$NetBSD: patch-al,v 1.1 2006/10/10 12:55:39 ben Exp $
+
+--- bdbobj/Makefile.in.orig	2006-01-29 12:36:19.000000000 -0500
++++ bdbobj/Makefile.in
+@@ -225,21 +225,6 @@ all: config.h
+ 
+ .SUFFIXES:
+ .SUFFIXES: .C .c .lo .o .obj
+-am--refresh:
+-	@:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+@@ -618,7 +603,7 @@ ps-am:
+ 
+ uninstall-am: uninstall-info-am
+ 
+-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
++.PHONY: CTAGS GTAGS all all-am check check-am clean \
+ 	clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ 	clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
+ 	dist-shar dist-tarZ dist-zip distcheck distclean \
-- 
cgit v1.2.3