From a689b8b697d76b27ebbfaa17e4c8d22835b585e1 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 29 Jun 2011 12:25:14 +0000
Subject: [PATCH] - fix build with newer libtool

---
 mail/courier-authlib/Makefile | 3 ++-
 misc/hfsplus/Makefile         | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index 5113136130c..c293b0c4683 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2011/06/10 13:45:56 gsoares Exp $
+# $OpenBSD: Makefile,v 1.24 2011/06/29 12:25:14 jasper Exp $
 
 COMMENT-main=		authentication library for courier
 COMMENT-ldap=		ldap authentication module for courier-authLib
@@ -72,6 +72,7 @@ CONFIGURE_ARGS+=	--enable-static \
 			--includedir=${PREFIX}/include \
 			--enable-ltdl-install=no \
 			--with-ltdl-lib=${LOCALBASE}/lib \
+			--with-ltdl-include=${LOCALBASE}/include \
 			--cache-file=${WRKDIR}/courier-authlib.cache
 
 RUN_DEPENDS-main=	lang/expect,no_tk
diff --git a/misc/hfsplus/Makefile b/misc/hfsplus/Makefile
index 17f8d1d3c61..120aa610b87 100644
--- a/misc/hfsplus/Makefile
+++ b/misc/hfsplus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2011/06/29 12:20:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2011/06/29 12:25:31 jasper Exp $
 
 COMMENT=	hfsplus filesystem access tool
 
@@ -25,6 +25,7 @@ USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
 
 AUTOCONF_VERSION=	2.59
+AUTOMAKE_VERSION=	1.9
 BUILD_DEPENDS=		${MODGNU_AUTOCONF_DEPENDS}
 # needs the AM_PROG_LIBTOOL macro                                           
 BUILD_DEPENDS +=	devel/libtool
@@ -40,6 +41,7 @@ WRKDIST=		${WRKDIR}/hfsplus-${VERSION}
 DOC=bugs.html hfsp.html libhfsp.html
 
 pre-configure:
+	@cd ${WRKDIST} && ln -s ${LOCALBASE}/share/libtool/config/ltmain.sh
 	@cd ${WRKDIST} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \
 		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
 		${MAKE_PROGRAM} -f Makefile.cvs all