Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

16 files changed, 161 insertions, 36 deletions

diff --git a/databases/db/Makefile b/databases/db/Makefile
index f5ef5ea3832..56c2d58364b 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/19 06:26:23 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 18:38:20 jlam Exp $
 
 DISTNAME=	db-2.7.7
 CATEGORIES=	databases
@@ -10,17 +10,20 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.sleepycat.com/
 COMMENT=	Sleepycat Software's Berkeley DB version 2
 
-USE_BUILDLINK_ONLY=	yes
+WRKSRC=		${WRKDIR}/${PKGNAME}/build_unix
+
+USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 
-WRKSRC=		${WRKDIR}/${PKGNAME}/build_unix
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--enable-compat185
+.endif
 
 post-install:
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/html/db
 
 .include "../../mk/bsd.pkg.mk"
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--enable-compat185
-.endif
diff --git a/databases/db/PLIST b/databases/db/PLIST
index 1246cad9b4d..8e97237763b 100644
--- a/databases/db/PLIST
+++ b/databases/db/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:29:36 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:20 jlam Exp $
 bin/db_load
 bin/db_dump
 bin/db_deadlock
diff --git a/databases/db/buildlink2.mk b/databases/db/buildlink2.mk
new file mode 100644
index 00000000000..6bda1b892ae
--- /dev/null
+++ b/databases/db/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:20 jlam Exp $
+
+.if !defined(DB_BUILDLINK2_MK)
+DB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		db
+BUILDLINK_DEPENDS.db?=		db>=2.7.3
+BUILDLINK_PKGSRCDIR.db?=	../../databases/db
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.db=db
+BUILDLINK_PREFIX.db_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.db=	include/db2/*
+BUILDLINK_FILES.db+=	lib/libdb2.*
+
+BUILDLINK_TARGETS+=	db-buildlink
+
+db-buildlink: _BUILDLINK_USE
+
+.endif	# DB_BUILDLINK2_MK
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 0ed8bf857c3..4362652dec8 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/02/18 15:14:05 seb Exp $
+# $NetBSD: Makefile,v 1.25 2002/08/25 18:38:21 jlam Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp 
 #
 
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/gdbm/gdbm.html
 COMMENT=	The GNU database manager
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/databases/gdbm/buildlink2.mk b/databases/gdbm/buildlink2.mk
new file mode 100644
index 00000000000..4657a69c18f
--- /dev/null
+++ b/databases/gdbm/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:21 jlam Exp $
+
+.if !defined(GDBM_BUILDLINK2_MK)
+GDBM_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		gdbm
+BUILDLINK_DEPENDS.gdbm?=	gdbm>=1.7.3
+BUILDLINK_PKGSRCDIR.gdbm?=	../../databases/gdbm
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.gdbm=gdbm
+BUILDLINK_PREFIX.gdbm_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.gdbm=	include/gdbm.h
+BUILDLINK_FILES.gdbm+=	lib/libgdbm.*
+
+BUILDLINK_TARGETS+=	gdbm-buildlink
+
+gdbm-buildlink: _BUILDLINK_USE
+
+.endif	# GDBM_BUILDLINK2_MK
diff --git a/databases/gdbm/patches/patch-ab b/databases/gdbm/patches/patch-ab
index 4955f87b1f2..57e0233bf3c 100644
--- a/databases/gdbm/patches/patch-ab
+++ b/databases/gdbm/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2002/05/20 22:16:54 cjep Exp $
+$NetBSD: patch-ab,v 1.9 2002/08/25 18:38:21 jlam Exp $
 --- Makefile.in.orig	Tue May 18 20:16:06 1999
 +++ Makefile.in	Thu Aug 16 14:27:07 2001
 @@ -27,11 +27,11 @@
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index 9ea09304057..c12034addf1 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.18 2002/06/16 21:45:45 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 18:38:22 jlam Exp $
 #
 
-.include "Makefile.common"
-
 PKGNAME=		${DISTNAME:S/-/-client-/}
 PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL, a free SQL database (client)
 
-USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK+=	scripts/mysql_config
-REPLACE_BUILDLINK+=	scripts/mysqlbug
+USE_BUILDLINK2=		YES
+
+.include "Makefile.common"
 
 CONFIGURE_ARGS+=	--without-server
 
@@ -20,6 +18,6 @@ post-install:
 	cd ${PREFIX}/man/man1; ${RM} -f mysqld.1 safe_mysqld.1
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
-.include "../../devel/readline/buildlink.mk"
+.include "../../devel/readline/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index e12e91aa0b7..9b60c17d12b 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2002/06/16 21:45:45 wiz Exp $
+# $NetBSD: Makefile.common,v 1.10 2002/08/25 18:38:22 jlam Exp $
 
 DISTNAME=		mysql-3.23.49
 CATEGORIES=		databases
@@ -53,4 +53,4 @@ post-extract:
 		${RM} $${file}.orig;					\
 	done
 
-.include "../../devel/zlib/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
diff --git a/databases/mysql-client/buildlink2.mk b/databases/mysql-client/buildlink2.mk
new file mode 100644
index 00000000000..726d97b623c
--- /dev/null
+++ b/databases/mysql-client/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:22 jlam Exp $
+
+.if !defined(MYSQL_CLIENT_BUILDLINK2_MK)
+MYSQL_CLIENT_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			mysql-client
+BUILDLINK_DEPENDS.mysql-client?=	mysql-client>=3.22
+BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql-client
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.mysql-client=mysql-client
+BUILDLINK_PREFIX.mysql-client_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.mysql-client=	include/mysql/*.h
+BUILDLINK_FILES.mysql-client+=	lib/mysql/libmysqlclient.*
+
+.include "../../devel/zlib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	mysql-client-buildlink
+
+mysql-client-buildlink: _BUILDLINK_USE
+
+.endif	# MYSQL_CLIENT_BUILDLINK2_MK
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 942a57d8f9b..0eba60899c4 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2002/08/19 19:29:18 mycroft Exp $
+# $NetBSD: Makefile,v 1.46 2002/08/25 18:38:23 jlam Exp $
 
 DISTNAME=	openldap-2.0.25
 SVR4_PKGNAME=	oldap
@@ -12,9 +12,7 @@ COMMENT=	Lightweight directory access protocol server and client package
 
 CONFLICTS+=	ldapsdk-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK_SED+=	-e "s|-L${WRKSRC}/libraries||g"
-
+USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/build/ltconfig
 
@@ -35,13 +33,13 @@ CONFIGURE_ARGS+=	--localstatedir=/var/openldap
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink.mk"
-CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
+.include "../../databases/db/buildlink2.mk"
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
 LIBS=		-ldb2 -lpthread -lrt
 .endif
 
 .if defined(USE_SASL) && (${USE_SASL} == "YES")
-.include "../../security/cyrus-sasl/buildlink.mk"
+.include "../../security/cyrus-sasl/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-cyrus-sasl
 CONFIGURE_ARGS+=	--enable-spasswd
 .endif
@@ -109,9 +107,9 @@ test:
 	-@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
 
-.include "../../security/openssl/buildlink.mk"
-.include "../../security/tcp_wrappers/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
 CONFIGURE_ARGS+=	--with-threads
diff --git a/databases/openldap/PLIST b/databases/openldap/PLIST
index 570cf3c16d7..465590f6b9a 100644
--- a/databases/openldap/PLIST
+++ b/databases/openldap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/08/19 19:29:18 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/08/25 18:38:23 jlam Exp $
 bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
diff --git a/databases/openldap/buildlink.mk b/databases/openldap/buildlink.mk
index 9c90a905aee..8a0633103f7 100644
--- a/databases/openldap/buildlink.mk
+++ b/databases/openldap/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2002/08/01 05:53:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2002/08/25 18:38:23 jlam Exp $
 #
 # This Makefile fragment is included by packages that use openldap.
 #
diff --git a/databases/openldap/buildlink2.mk b/databases/openldap/buildlink2.mk
new file mode 100644
index 00000000000..4fc9d3f797b
--- /dev/null
+++ b/databases/openldap/buildlink2.mk
@@ -0,0 +1,41 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:24 jlam Exp $
+
+.if !defined(OPENLDAP_BUILDLINK2_MK)
+OPENLDAP_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		openldap
+BUILDLINK_DEPENDS.openldap?=	openldap-2.0.*
+BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.openldap=openldap
+BUILDLINK_PREFIX.openldap_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.openldap=	include/disptmpl.h
+BUILDLINK_FILES.openldap+=	include/lber.h
+BUILDLINK_FILES.openldap+=	include/lber_types.h
+BUILDLINK_FILES.openldap+=	include/ldap.h
+BUILDLINK_FILES.openldap+=	include/ldap_cdefs.h
+BUILDLINK_FILES.openldap+=	include/ldap_features.h
+BUILDLINK_FILES.openldap+=	include/ldap_schema.h
+BUILDLINK_FILES.openldap+=	include/srchpref.h
+BUILDLINK_FILES.openldap+=	lib/liblber.*
+BUILDLINK_FILES.openldap+=	lib/libldap.*
+
+USE_PTHREAD=		native
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == SunOS
+.  include "../../databases/db/buildlink2.mk"
+.endif
+
+.include "../../mk/pthread.buildlink2.mk"
+
+.if defined(USE_SASL) && (${USE_SASL} == "YES")
+.  include "../../security/cyrus-sasl/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+=	openldap-buildlink
+
+openldap-buildlink: _BUILDLINK_USE
+
+.endif	# OPENLDAP_BUILDLINK2_MK
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index e32ffc86fbc..c67e4b3f486 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/08/19 19:29:19 mycroft Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 18:38:24 jlam Exp $
 
 SHA1 (openldap-2.0.25.tgz) = fc62147b4de1057bbd3797471a7773406a212e61
 Size (openldap-2.0.25.tgz) = 1304098 bytes
diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile
index 5b86fdef8cc..25b239c3ff2 100644
--- a/databases/postgresql-lib/Makefile
+++ b/databases/postgresql-lib/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2002/04/04 07:41:02 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 18:38:24 jlam Exp $
 
 PKGNAME=		postgresql-lib-${BASE_VERS}
 COMMENT=		PostgreSQL database headers and libraries
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../databases/postgresql/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 DIRS_TO_BUILD=		src/include src/interfaces src/pl
 
 .include "../../mk/bsd.prefs.mk"
@@ -37,5 +37,5 @@ post-install:
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz             \
 		`${SED} -e "s|^#.*||" ${FILESDIR}/man.lib`
 
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-lib/buildlink2.mk b/databases/postgresql-lib/buildlink2.mk
new file mode 100644
index 00000000000..6134cbf6e07
--- /dev/null
+++ b/databases/postgresql-lib/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:25 jlam Exp $
+
+.if !defined(POSTGRESQL_LIB_BUILDLINK2_MK)
+POSTGRESQL_LIB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			postgresql-lib
+BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-{6.5.3*,7.0*,lib-*}
+BUILDLINK_PKGSRCDIR.postgresql-lib?=	../../databases/postgresql-lib
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.postgresql-lib=postgresql-lib
+BUILDLINK_PREFIX.postgresql-lib_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.postgresql-lib=		include/pgsql/*/*/*.h
+BUILDLINK_FILES.postgresql-lib+=	include/pgsql/*/*.h
+BUILDLINK_FILES.postgresql-lib+=	include/pgsql/*.h
+BUILDLINK_FILES.postgresql-lib+=	lib/libecpg.*
+BUILDLINK_FILES.postgresql-lib+=	lib/libpgeasy.*
+BUILDLINK_FILES.postgresql-lib+=	lib/libpq++.*
+BUILDLINK_FILES.postgresql-lib+=	lib/libpq.*
+
+.include "../../security/openssl/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	postgresql-lib-buildlink
+
+postgresql-lib-buildlink: _BUILDLINK_USE
+
+.endif	# POSTGRESQL_LIB_BUILDLINK2_MK