Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

23 files changed, 226 insertions, 13 deletions

diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 0b2b48dc105..bc14183c079 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/07/22 11:17:03 grant Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 19:22:04 jlam Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	db3-3.11.2
diff --git a/databases/db3/PLIST b/databases/db3/PLIST
index 93bb3b3cd1e..4ddcf205f97 100644
--- a/databases/db3/PLIST
+++ b/databases/db3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/15 18:23:40 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:04 jlam Exp $
 bin/db3_archive
 bin/db3_checkpoint
 bin/db3_deadlock
diff --git a/databases/db3/buildlink2.mk b/databases/db3/buildlink2.mk
new file mode 100644
index 00000000000..490ca281e4f
--- /dev/null
+++ b/databases/db3/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:04 jlam Exp $
+
+.if !defined(DB3_BUILDLINK2_MK)
+DB3_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		db3
+BUILDLINK_DEPENDS.db3?=		db3>=2.9.2
+BUILDLINK_PKGSRCDIR.db3?=	../../databases/db3
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.db3=db3
+BUILDLINK_PREFIX.db3_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.db3=	include/db3/db_cxx.h
+BUILDLINK_FILES.db3+=	include/db3/db.h
+BUILDLINK_FILES.db3+=	lib/libdb3.*
+BUILDLINK_FILES.db3+=	lib/libdb3_cxx.*
+
+BUILDLINK_TARGETS+=	db3-buildlink
+
+db3-buildlink: _BUILDLINK_USE
+
+.endif	# DB3_BUILDLINK2_MK
diff --git a/databases/edb/buildlink2.mk b/databases/edb/buildlink2.mk
new file mode 100644
index 00000000000..7d42ea1c034
--- /dev/null
+++ b/databases/edb/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:05 jlam Exp $
+
+.if !defined(EDB_BUILDLINK2_MK)
+EDB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		edb
+BUILDLINK_DEPENDS.edb?=		edb>=1.0.2
+BUILDLINK_PKGSRCDIR.edb?=	../../databases/edb
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.edb=edb
+BUILDLINK_PREFIX.edb_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.edb=	include/Edb.h
+BUILDLINK_FILES.edb+=	lib/libedb.*
+
+BUILDLINK_TARGETS+=	edb-buildlink
+
+edb-buildlink: _BUILDLINK_USE
+
+.endif	# EDB_BUILDLINK2_MK
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 9e154e21ac6..09f959764f9 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/06/23 03:38:21 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 19:22:05 jlam Exp $
 
 DISTNAME=	freetds-0.53
 CATEGORIES=	databases
diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST
index 3d9648d2de4..d97fce1c96c 100644
--- a/databases/freetds/PLIST
+++ b/databases/freetds/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/23 03:38:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:05 jlam Exp $
 freetds/include/bkpublic.h
 freetds/include/common.h
 freetds/include/cspublic.h
diff --git a/databases/freetds/buildlink2.mk b/databases/freetds/buildlink2.mk
new file mode 100644
index 00000000000..ab35eff2f81
--- /dev/null
+++ b/databases/freetds/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:06 jlam Exp $
+
+.if !defined(FREETDS_BUILDLINK2_MK)
+FREETDS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		freetds
+BUILDLINK_DEPENDS.freetds?=	freetds>=0.53
+BUILDLINK_PKGSRCDIR.freetds?=	../../databases/freetds
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.freetds=freetds
+BUILDLINK_PREFIX.freetds_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.freetds=	freetds/include/*
+BUILDLINK_FILES.freetds+=	freetds/lib/*
+
+BUILDLINK_TARGETS+=	freetds-buildlink
+
+freetds-buildlink: _BUILDLINK_USE
+
+.endif	# FREETDS_BUILDLINK2_MK
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index fcd9409c53a..4885fd73fcc 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/23 03:38:21 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:22:06 jlam Exp $
 
 SHA1 (freetds-0.53.tgz) = 7ae8e843ad91c357e9fa91e28176775737584af3
 Size (freetds-0.53.tgz) = 312692 bytes
diff --git a/databases/freetds/patches/patch-aa b/databases/freetds/patches/patch-aa
index 46650fc65dd..2cdc96dd329 100644
--- a/databases/freetds/patches/patch-aa
+++ b/databases/freetds/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2002/06/23 03:38:21 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:22:06 jlam Exp $
 
 --- Makefile.in.orig	Sun Dec 16 10:40:25 2001
 +++ Makefile.in
diff --git a/databases/gnome-mime-types/Makefile b/databases/gnome-mime-types/Makefile
index 9125d2b2c23..c512abfeac3 100644
--- a/databases/gnome-mime-types/Makefile
+++ b/databases/gnome-mime-types/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/07 12:16:30 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:22:07 jlam Exp $
 #
 
 DISTNAME=		gnome-mime-data-1.0.7
diff --git a/databases/gnome-mime-types/buildlink.mk b/databases/gnome-mime-types/buildlink.mk
index a341d34c5bf..2fac3c286cd 100644
--- a/databases/gnome-mime-types/buildlink.mk
+++ b/databases/gnome-mime-types/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/05/12 01:09:02 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:22:07 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-mime-data.
 #
diff --git a/databases/gnome-mime-types/buildlink2.mk b/databases/gnome-mime-types/buildlink2.mk
new file mode 100644
index 00000000000..b7d17b77f0f
--- /dev/null
+++ b/databases/gnome-mime-types/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:07 jlam Exp $
+
+.if !defined(GNOME_MIME_DATA_BUILDLINK2_MK)
+GNOME_MIME_DATA_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			gnome-mime-data
+BUILDLINK_DEPENDS.gnome-mime-data?=	gnome-mime-data>=1.0.7
+BUILDLINK_PKGSRCDIR.gnome-mime-data?=	../../databases/gnome-mime-data
+#BUILDLINK_DEPMETHOD.gnome-mime-data?=	build
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-mime-data=gnome-mime-data
+BUILDLINK_PREFIX.gnome-mime-data_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.gnome-mime-data+=	lib/pkgconfig/gnome-mime-data-2.0.pc
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gnome-mime-data-buildlink
+
+gnome-mime-data-buildlink: _BUILDLINK_USE
+
+.endif	# GNOME_MIME_DATA_BUILDLINK2_MK
diff --git a/databases/java-db3/buildlink2.mk b/databases/java-db3/buildlink2.mk
new file mode 100644
index 00000000000..6a1f5cd2c84
--- /dev/null
+++ b/databases/java-db3/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:08 jlam Exp $
+
+.if !defined(JAVA_DB3_BUILDLINK2_MK)
+JAVA_DB3_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		java-db3
+BUILDLINK_DEPENDS.java-db3?=	java-db3>=2.9
+BUILDLINK_PKGSRCDIR.java-db3?=	../../databases/java-db3
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.java-db3=java-db3
+BUILDLINK_PREFIX.java-db3_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.java-db3=	lib/db3.jar
+BUILDLINK_FILES.java-db3+=	lib/libdb3_java.*
+
+.include "../../databases/db3/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	java-db3-buildlink
+
+java-db3-buildlink: _BUILDLINK_USE
+
+.endif	# JAVA_DB3_BUILDLINK2_MK
diff --git a/databases/openldap1/Makefile b/databases/openldap1/Makefile
index c5493fd4bb5..600f50a20d8 100644
--- a/databases/openldap1/Makefile
+++ b/databases/openldap1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/06/15 21:20:00 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 19:22:08 jlam Exp $
 #
 
 DISTNAME=	openldap-1.2.13
diff --git a/databases/openldap1/buildlink.mk b/databases/openldap1/buildlink.mk
index 2dde634dbac..6f3e8f2c99a 100644
--- a/databases/openldap1/buildlink.mk
+++ b/databases/openldap1/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/20 08:50:16 kent Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:09 jlam Exp $
 #
 # This Makefile fragment is included by packages that use openldap.
 #
diff --git a/databases/openldap1/buildlink2.mk b/databases/openldap1/buildlink2.mk
new file mode 100644
index 00000000000..cd169b76283
--- /dev/null
+++ b/databases/openldap1/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:09 jlam Exp $
+
+.if !defined(OPENLDAP_BUILDLINK2_MK)
+OPENLDAP_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		openldap
+BUILDLINK_DEPENDS.openldap?=	openldap-1.2.*
+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/ldap.h
+BUILDLINK_FILES.openldap+=	include/ldap_cdefs.h
+BUILDLINK_FILES.openldap+=	include/srchpref.h
+BUILDLINK_FILES.openldap+=	lib/liblber.*
+BUILDLINK_FILES.openldap+=	lib/libldap.*
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == SunOS
+.  include "../../databases/db/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+=	openldap-buildlink
+
+openldap-buildlink: _BUILDLINK_USE
+
+.endif	# OPENLDAP_BUILDLINK2_MK
diff --git a/databases/py-mysqldb/buildlink2.mk b/databases/py-mysqldb/buildlink2.mk
new file mode 100644
index 00000000000..b2a5eed67f1
--- /dev/null
+++ b/databases/py-mysqldb/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:10 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+=		pymysqldb
+BUILDLINK_DEPENDS.pymysqldb?=	${PYPKGPREFIX}-mysqldb-*
+BUILDLINK_PKGSRCDIR.pymysqldb?=	../../databases/py-mysqldb
diff --git a/databases/sqlite/buildlink2.mk b/databases/sqlite/buildlink2.mk
new file mode 100644
index 00000000000..a33bd9094f9
--- /dev/null
+++ b/databases/sqlite/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:11 jlam Exp $
+
+.if !defined(SQLITE_BUILDLINK2_MK)
+SQLITE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		sqlite
+BUILDLINK_DEPENDS.sqlite?=	sqlite>=2.0.5
+BUILDLINK_PKGSRCDIR.sqlite?=	../../databases/sqlite
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.sqlite=sqlite
+BUILDLINK_PREFIX.sqlite_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.sqlite=			include/sqlite.h
+BUILDLINK_FILES.sqlite+=		lib/libsqlite.*
+
+BUILDLINK_TARGETS+=	sqlite-buildlink
+
+sqlite-buildlink: _BUILDLINK_USE
+
+.endif	# SQLITE_BUILDLINK2_MK
diff --git a/databases/tcl-postgresql/buildlink2.mk b/databases/tcl-postgresql/buildlink2.mk
new file mode 100644
index 00000000000..e93e70613d3
--- /dev/null
+++ b/databases/tcl-postgresql/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:12 jlam Exp $
+
+.if !defined(TCL_POSTGRESQL_BUILDLINK2_MK)
+TCL_POSTGRESQL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			tcl-postgresql
+BUILDLINK_DEPENDS.tcl-postgresql?=	tcl-postgresql>=7.0
+BUILDLINK_PKGSRCDIR.tcl-postgresql?=	../../databases/tcl-postgresql
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.tcl-postgresql=tcl-postgresql
+BUILDLINK_PREFIX.tcl-postgresql_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.tcl-postgresql=		include/pgsql/libpgtcl.h
+BUILDLINK_FILES.tcl-postgresql+=	lib/libpgtcl.*
+
+.include "../../lang/tcl/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	tcl-postgresql-buildlink
+
+tcl-postgresql-buildlink: _BUILDLINK_USE
+
+.endif	# TCL_POSTGRESQL_BUILDLINK2_MK
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 24f9b140e92..f6ad5c16ed6 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/08/08 16:17:06 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 19:22:12 jlam Exp $
 
 PKGNAME=		unixodbc-${ODBC_BASE_VERS}
 PKGREVISION=		1
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common
index bc9992f52c3..98ac647daf4 100644
--- a/databases/unixodbc/Makefile.common
+++ b/databases/unixodbc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2002/08/01 06:40:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2002/08/25 19:22:13 jlam Exp $
 
 DISTNAME=	unixODBC-${ODBC_DIST_VERS}
 CATEGORIES=	databases
diff --git a/databases/unixodbc/buildlink.mk b/databases/unixodbc/buildlink.mk
index 1c383b3fb79..4c66d3d4cab 100644
--- a/databases/unixodbc/buildlink.mk
+++ b/databases/unixodbc/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/08/01 06:40:52 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:13 jlam Exp $
 #
 # This Makefile fragment is included by packages that use unixodbc.
 #
diff --git a/databases/unixodbc/buildlink2.mk b/databases/unixodbc/buildlink2.mk
new file mode 100644
index 00000000000..a1984b92165
--- /dev/null
+++ b/databases/unixodbc/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:13 jlam Exp $
+
+.if !defined(UNIXODBC_BUILDLINK2_MK)
+UNIXODBC_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		unixodbc
+BUILDLINK_DEPENDS.unixodbc?=	unixodbc>=2.0.11
+BUILDLINK_PKGSRCDIR.unixodbc?=	../../databases/unixodbc
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.unixodbc=unixodbc
+BUILDLINK_PREFIX.unixodbc_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.unixodbc=		include/autotest.h
+BUILDLINK_FILES.unixodbc+=		include/odbcinst.h
+BUILDLINK_FILES.unixodbc+=		include/odbcinstext.h
+BUILDLINK_FILES.unixodbc+=		include/sql.h
+BUILDLINK_FILES.unixodbc+=		include/sqlext.h
+BUILDLINK_FILES.unixodbc+=		include/sqltypes.h
+BUILDLINK_FILES.unixodbc+=		include/sqlucode.h
+BUILDLINK_FILES.unixodbc+=		include/uodbc_stats.h
+BUILDLINK_FILES.unixodbc+=		lib/libboundparam.*
+BUILDLINK_FILES.unixodbc+=		lib/libgtrtst.*
+BUILDLINK_FILES.unixodbc+=		lib/libodbc.*
+BUILDLINK_FILES.unixodbc+=		lib/libodbccr.*
+BUILDLINK_FILES.unixodbc+=		lib/libodbcextras.*
+BUILDLINK_FILES.unixodbc+=		lib/libodbcinst.*
+
+.include "../../devel/libtool/buildlink2.mk"
+.include "../../devel/pth/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	unixodbc-buildlink
+
+unixodbc-buildlink: _BUILDLINK_USE
+
+.endif	# UNIXODBC_BUILDLINK2_MK