From 02526271b78c18a0c07b3ea8be04d2a61b0bf8e7 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 25 Aug 2002 21:48:57 +0000
Subject: Merge packages from the buildlink2 branch back into the main trunk
 that have been converted to USE_BUILDLINK2.

---
 databases/php4-dba/Makefile                |  8 ++++----
 databases/postgresql-client/Makefile       | 12 ++++++------
 databases/postgresql-server/MESSAGE        |  2 +-
 databases/postgresql-server/Makefile       | 10 +++++-----
 databases/postgresql-server/files/pgsql.sh |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'databases')

diff --git a/databases/php4-dba/Makefile b/databases/php4-dba/Makefile
index 8995e5c6eeb..77f5500b879 100644
--- a/databases/php4-dba/Makefile
+++ b/databases/php4-dba/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2002/02/28 06:16:48 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:49:35 jlam Exp $
 
 MODNAME=		dba
 CATEGORIES+=		databases
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for DBM database access
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 .include "../../www/php4/Makefile.module"
 
@@ -20,9 +20,9 @@ CONFIGURE_ARGS+=	--without-dbm
 CONFIGURE_ARGS+=	--without-gdbm
 CONFIGURE_ARGS+=	--with-ndbm=/usr
 .else
-CONFIGURE_ARGS+=	--with-gdbm=shared,${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-gdbm=shared,${BUILDLINK_PREFIX.gdbm}
 CONFIGURE_ARGS+=	--without-ndbm
-.include "../../databases/gdbm/buildlink.mk"
+.include "../../databases/gdbm/buildlink2.mk"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 1097281592a..cbf3ccf8c63 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2002/04/04 07:41:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 21:49:36 jlam Exp $
 
 PKGNAME=		postgresql-client-${BASE_VERS}
 COMMENT=		PostgreSQL database client programs
 
-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}
 CONFIGURE_ARGS+=	--enable-readline
 MAKE_ENV+=		INSTALLED_LIBPQ=1
 
@@ -34,7 +34,7 @@ post-install:
 	${SED} -e "s|^#.*||" ${FILESDIR}/exclude			\
 		| ${GTAR} zxCXf ${PREFIX}/man - ${WRKSRC}/doc/man.tar.gz
 
-.include "../../databases/postgresql-lib/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../devel/zlib/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-server/MESSAGE b/databases/postgresql-server/MESSAGE
index 10f69ad6deb..98446b823db 100644
--- a/databases/postgresql-server/MESSAGE
+++ b/databases/postgresql-server/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/08/22 22:36:26 hubertf Exp $
+$NetBSD: MESSAGE,v 1.3 2002/08/25 21:49:36 jlam Exp $
 
 To enable this package, put the following into your /etc/rc.conf:
 
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 20142078ebc..4eb75307abc 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/08/07 07:28:35 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/25 21:49:37 jlam Exp $
 
 PKGNAME=		postgresql-server-${BASE_VERS}
 COMMENT=		PostgreSQL database server programs
@@ -8,15 +8,15 @@ DEPENDS+=		postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
 # mips has no TAS implementation
 NOT_FOR_PLATFORM=	*-*-mips
 
-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/backend
 
 .if defined(USE_PAM)
-.include "../../security/PAM/buildlink.mk"
+.  include "../../security/PAM/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-pam
 .endif
 
@@ -78,6 +78,6 @@ post-install:
 		`${SED} -e "s|^#.*||" ${FILESDIR}/man.server`
 	${INSTALL_SCRIPT} ${WRKDIR}/pgsql.sh ${PREFIX}/etc/rc.d/pgsql
 
-.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-server/files/pgsql.sh b/databases/postgresql-server/files/pgsql.sh
index f3b3c5c64f7..ff74cc74a78 100644
--- a/databases/postgresql-server/files/pgsql.sh
+++ b/databases/postgresql-server/files/pgsql.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pgsql.sh,v 1.10 2002/07/18 01:40:07 cjs Exp $
+# $NetBSD: pgsql.sh,v 1.11 2002/08/25 21:49:37 jlam Exp $
 #
 # PostgreSQL database rc.d control script
 #
-- 
cgit v1.2.3