Update linkage to libltdl, now in its own package.

7 files changed, 13 insertions, 16 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 71d485f5256..33cb20ef740 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: Makefile,v 1.84 2004/10/15 11:54:10 tv Exp $
 
 DISTNAME=		openldap-2.2.13
 SVR4_PKGNAME=		oldap
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=		.tgz
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk
index aeb2ce07d75..6911a13f571 100644
--- a/databases/openldap/options.mk
+++ b/databases/openldap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/09/27 04:11:52 rh Exp $
+# $NetBSD: options.mk,v 1.4 2004/10/15 11:54:10 tv Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap
 PKG_SUPPORTED_OPTIONS=	dynamic kerberos sasl slp
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS=	dynamic kerberos sasl slp
 ### specified, then link the backend modules statically into slapd.
 ###
 .if !empty(PKG_OPTIONS:Mdynamic)
-.  include "../../devel/libtool/buildlink3.mk"
+.  include "../../devel/libltdl/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-modules
 PLIST_SUBST+=		DYNAMIC_MOD=
 .else
diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile
index da067aec819..50f2e740dab 100644
--- a/databases/unixodbc-DataManager/Makefile
+++ b/databases/unixodbc-DataManager/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:24 tv Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/15 11:54:11 tv Exp $
 
 PKGNAME=		unixodbc-DataManager-${ODBC_BASE_VERS}
-PKGREVISION=		3
+PKGREVISION=		4
 COMMENT=		GUI tool for unixODBC data source management
 
 USE_BUILDLINK3=		YES
diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile
index 3792add6cf7..f0901e61b6a 100644
--- a/databases/unixodbc-ODBCConfig/Makefile
+++ b/databases/unixodbc-ODBCConfig/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:24 tv Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/15 11:54:11 tv Exp $
 
 PKGNAME=		unixodbc-ODBCConfig-${ODBC_BASE_VERS}
-PKGREVISION=		3
+PKGREVISION=		4
 COMMENT=		GUI tool for unixODBC driver configuration
 
 USE_BUILDLINK3=		YES
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 73dff9f5966..512e88f866e 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:13:24 tv Exp $
+# $NetBSD: Makefile,v 1.13 2004/10/15 11:54:10 tv Exp $
 
 PKGNAME=		unixodbc-${ODBC_BASE_VERS}
-PKGREVISION=		3
+PKGREVISION=		4
 COMMENT=		ODBC 2.x/3.x driver manager
 
 CONFLICTS+=		iodbc-[0-9]*
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common
index 6476bf145b9..c4a59e1599f 100644
--- a/databases/unixodbc/Makefile.common
+++ b/databases/unixodbc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/09/30 02:51:36 tv Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/10/15 11:54:10 tv Exp $
 
 DISTNAME=	unixODBC-${ODBC_DIST_VERS}
 CATEGORIES=	databases
@@ -57,7 +57,7 @@ fix-ltdl-and-lexlib:
 		${MV} -f $${file}.fixed $${file};			\
 	done
 
-.include "../../devel/libtool/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
diff --git a/databases/unixodbc/buildlink3.mk b/databases/unixodbc/buildlink3.mk
index 42b667ce6d1..b6f8e0851bd 100644
--- a/databases/unixodbc/buildlink3.mk
+++ b/databases/unixodbc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:24 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/15 11:54:10 tv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 UNIXODBC_BUILDLINK3_MK:=	${UNIXODBC_BUILDLINK3_MK}+
@@ -16,7 +16,4 @@ BUILDLINK_RECOMMENDED.unixodbc+=	unixodbc>=2.0.11nb3
 BUILDLINK_PKGSRCDIR.unixodbc?=	../../databases/unixodbc
 .endif	# UNIXODBC_BUILDLINK3_MK
 
-.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/libtool/buildlink3.mk"
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}