From 0053da96f2f135e48706bfa44585992cfce8139a Mon Sep 17 00:00:00 2001
From: tv <tv@pkgsrc.org>
Date: Fri, 15 Oct 2004 11:54:10 +0000
Subject: Update linkage to libltdl, now in its own package.

---
 databases/openldap/Makefile             | 4 ++--
 databases/openldap/options.mk           | 4 ++--
 databases/unixodbc-DataManager/Makefile | 4 ++--
 databases/unixodbc-ODBCConfig/Makefile  | 4 ++--
 databases/unixodbc/Makefile             | 4 ++--
 databases/unixodbc/Makefile.common      | 4 ++--
 databases/unixodbc/buildlink3.mk        | 5 +----
 devel/kdesdk2/Makefile                  | 6 +++---
 devel/kdesdk3/Makefile                  | 5 +++--
 devel/kdesdk3/buildlink3.mk             | 4 ++--
 devel/kdevelop-base/Makefile            | 3 ++-
 emulators/tme/Makefile                  | 6 +++---
 graphics/digikam/Makefile               | 4 ++--
 graphics/plplot/Makefile                | 6 +++---
 14 files changed, 31 insertions(+), 32 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/+$//}
diff --git a/devel/kdesdk2/Makefile b/devel/kdesdk2/Makefile
index 5ea0f6e2541..13e1d8018b4 100644
--- a/devel/kdesdk2/Makefile
+++ b/devel/kdesdk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:29 tv Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/15 11:54:10 tv Exp $
 
 DISTNAME=	kdesdk-2.2.2
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
@@ -21,7 +21,7 @@ PLIST_SRC+=	${PKGDIR}/PLIST.kmtrace
 PLIST_SRC+=	${PKGDIR}/PLIST
 
 .include "../../databases/db/buildlink3.mk"
-.include "../../devel/libtool/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../x11/kde2/kde2.mk"
 .include "../../x11/kdebase2/buildlink3.mk"
 
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index bb0da577831..de6edada203 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2004/10/13 12:58:49 markd Exp $
+# $NetBSD: Makefile,v 1.28 2004/10/15 11:54:10 tv Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
@@ -37,7 +38,7 @@ PLIST_SRC+=	${PKGDIR}/PLIST
 .include "../../meta-pkgs/kde3/kde3.mk"
 
 .include "../../databases/db4/buildlink3.mk"
-.include "../../devel/libtool/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index 183b265a90f..d817cd9a131 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:29 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/15 11:54:10 tv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDESDK_BUILDLINK3_MK:=	${KDESDK_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.kdesdk?=	../../devel/kdesdk3
 .endif	# KDESDK_BUILDLINK3_MK
 
 .include "../../databases/db4/buildlink3.mk"
-.include "../../devel/libtool/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 67272607705..f4530093453 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2004/10/13 13:00:53 markd Exp $
+# $NetBSD: Makefile,v 1.36 2004/10/15 11:54:11 tv Exp $
 
 DISTNAME=	kdevelop-3.1.1
 PKGNAME=	kdevelop-base-3.1.1
+PKGREVISION=	1
 CATEGORIES=	devel kde
 
 HOMEPAGE=       http://www.kdevelop.org/
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 6294c69c475..56fb6609c09 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:14:41 tv Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/15 11:54:11 tv Exp $
 #
 
 DISTNAME=		tme-0.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		emulators
 MASTER_SITES=		http://theory.lcs.mit.edu/~fredette/tme/
 
@@ -18,6 +18,6 @@ USE_GNU_TOOLS+=		make
 
 CONFIGURE_ARGS+=	--disable-debug
 
-.include "../../devel/libtool/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index c8bca1ed030..a26b0ebe5bb 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:14:49 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/15 11:54:11 tv Exp $
 
 DISTNAME=		digikam-0.6.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=digikam/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index fb9bb2dca1e..7271c56efcc 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2004/10/03 00:14:56 tv Exp $
+# $NetBSD: Makefile,v 1.38 2004/10/15 11:54:11 tv Exp $
 
 DISTNAME=		plplot-5.2.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=plplot/}
 
@@ -62,7 +62,7 @@ post-install:
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/libtool/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../x11/tk83/buildlink3.mk"
 .include "../../lang/tcl83/buildlink3.mk"
 .include "../../mk/autoconf.mk"
-- 
cgit v1.2.3