Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.

11 files changed, 87 insertions, 83 deletions

diff --git a/databases/odbc-postgresql/Makefile b/databases/odbc-postgresql/Makefile
index c9bce9b4a8f..f52d9900a07 100644
--- a/databases/odbc-postgresql/Makefile
+++ b/databases/odbc-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/23 07:19:12 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/21 21:40:07 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -10,6 +10,8 @@ COMMENT=		ODBC interface to PostgreSQL
 MAINTAINER=		jwise@netbsd.org
 HOMEPAGE=		http://odbc.postgresql.org/
 
+USE_BUILDLINK_ONLY=	# defined
+
 CONFIGURE_ARGS+=	--with-odbc
 CONFIGURE_ARGS+=	--with-odbcinst=/etc
 
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 47526ce239d..01a1abb19ab 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,28 +1,25 @@
-# $NetBSD: Makefile,v 1.6 2001/06/11 02:05:08 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/21 21:40:08 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
-.include "../../devel/libgetopt/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
 
 PKGNAME=		postgresql-client-${PG_VERS}
 PG_PKG_VERS=		# empty
 COMMENT=		PostgreSQL database client programs
 
-DEPENDS+=		postgresql-lib>=${PG_BASE_VERS}:../../databases/postgresql-lib
+USE_BUILDLINK_ONLY=	# defined
+POSTGRESQL_LIB_REQD=	${PG_BASE_VERS}
+
+.include "../../devel/libgetopt/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
+.include "../../devel/zlib/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink.mk"
 
-MAKE_ENV+=		INSTALLED_LIBPQ=1
 CONFIGURE_ARGS+=	--enable-readline
+MAKE_ENV+=		INSTALLED_LIBPQ=1
 
 DIRS_TO_BUILD=		src/bin
 
-# The following is a hack to force ${BUILDLINK_DIR}/lib to the front of the
-# linker's library search path without having to patch a lot of Makefile.
-# It works because the PostgreSQL Makefiles invoke the linker with $(CFLAGS)
-# as well.
-#
-CFLAGS+=		-L${BUILDLINK_DIR}/lib
-
 pre-build:
 	cd ${WRKSRC}/src/bin/psql &&					\
 		${RM} -f pqsignal.h &&					\
diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile
index fbab132eb23..531652ef07d 100644
--- a/databases/postgresql-lib/Makefile
+++ b/databases/postgresql-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 14:47:30 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/21 21:40:08 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -7,6 +7,8 @@ PKGNAME=		postgresql-lib-${PG_VERS}
 PG_PKG_VERS=		# empty
 COMMENT=		PostgreSQL database headers and libraries
 
+USE_BUILDLINK_ONLY=	# defined
+
 DIRS_TO_BUILD=		src/include src/interfaces src/pl
 
 do-build:
diff --git a/databases/postgresql-plperl/Makefile b/databases/postgresql-plperl/Makefile
index 40a863dd16c..06d4810c6f3 100644
--- a/databases/postgresql-plperl/Makefile
+++ b/databases/postgresql-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 14:48:44 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/21 21:40:08 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -7,6 +7,10 @@ PKGNAME=		postgresql-plperl-${PG_VERS}
 PG_PKG_VERS=		# empty
 COMMENT=		PL/Perl procedural language for the PostgreSQL backend
 
+POSTGRESQL_LIB_REQD=	${PG_BASE_VERS}
+
+.include "../../databases/postgresql-lib/buildlink.mk"
+
 DEPENDS+=		postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server
 DEPENDS+=		libperl>=${LIBPERL5_REQD}:../../lang/libperl
 
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index 4fd0cd645a4..49c05d37807 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 14:49:38 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/21 21:40:08 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -7,17 +7,18 @@ PKGNAME=		postgresql-pltcl-${PG_VERS}
 PG_PKG_VERS=		# empty
 COMMENT=		PL/Tcl procedural language for the PostgreSQL backend
 
-DEPENDS+=		postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server
-DEPENDS+=		tcl>=8.3.2:../../lang/tcl
+USE_BUILDLINK_ONLY=	# defined
+POSTGRESQL_LIB_REQD=	${PG_BASE_VERS}
 
-TCLSH=			${LOCALBASE}/bin/tclsh
-TCL_CONFIGDIR=		${LOCALBASE}/lib
+.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../lang/tcl/buildlink.mk"
+
+DEPENDS+=		postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server
 
 CONFIGURE_ARGS+=	--with-tcl
-CONFIGURE_ARGS+=	--with-tclconfig="${TCL_CONFIGDIR}"
-CONFIGURE_ARGS+=	--with-includes="${LOCALBASE}/include"
-CONFIGURE_ARGS+=	--with-libraries="${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_DIR}/lib"
 CONFIGURE_ENV+=		TCLSH="${TCLSH}"
+TCLSH=			${LOCALBASE}/bin/tclsh
 
 DIRS_TO_BUILD=		src/pl/tcl
 
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index c267ca1753e..b42eca2a5ab 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,13 +1,18 @@
-# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/21 21:40:08 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
-.include "../../devel/libgetopt/buildlink.mk"
 
 PKGNAME=		postgresql-server-${PG_VERS}
 PG_PKG_VERS=		# empty
 COMMENT=		PostgreSQL database server programs
 
+USE_BUILDLINK_ONLY=	# defined
+POSTGRESQL_LIB_REQD=	${PG_BASE_VERS}
+
+.include "../../devel/libgetopt/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink.mk"
+
 DEPENDS+=		postgresql-client>=${PG_BASE_VERS}:../../databases/postgresql-client
 
 # mips has no TAS implementation
@@ -15,13 +20,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 DIRS_TO_BUILD=		src/backend
 
-# The following is a hack to force ${BUILDLINK_DIR}/lib to the front of the
-# linker's library search path without having to patch a lot of Makefile.
-# It works because the PostgreSQL Makefiles invoke the linker with $(CFLAGS)
-# as well.
-#
-CFLAGS+=		-L${BUILDLINK_DIR}/lib
-
 # PGUSER	username of the database administrator
 # PGGROUP	group of the database administrator
 # PGHOME	home directory of the database administrator and location of
@@ -49,6 +47,24 @@ ADDGROUP=		groupadd
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
+FILES_SUBST=		PREFIX=${PREFIX}
+FILES_SUBST+=		PGUSER=${PGUSER}
+FILES_SUBST+=		PGGROUP=${PGGROUP}
+FILES_SUBST+=		PGHOME=${PGHOME}
+
+FILES_SUBST+=		ADDUSER=${ADDUSER:Q}
+FILES_SUBST+=		ADDGROUP=${ADDGROUP:Q}
+FILES_SUBST+=		CAT=${CAT:Q}
+FILES_SUBST+=		CHGRP=${CHGRP:Q}
+FILES_SUBST+=		CHOWN=${CHOWN:Q}
+FILES_SUBST+=		GREP=${GREP:Q}
+FILES_SUBST+=		MKDIR=${MKDIR:Q}
+FILES_SUBST+=		RM=${RM:Q}
+FILES_SUBST+=		SU=${SU:Q}
+FILES_SUBST+=		TOUCH=${TOUCH:Q}
+
+FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+
 do-build:
 .for DIR in ${DIRS_TO_BUILD}
 	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
@@ -68,30 +84,9 @@ pre-install:
 		;;							\
 	esac
 
-	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
-		-e "s|@PGUSER@|${PGUSER}|g"				\
-		-e "s|@PGHOME@|${PGHOME}|g"				\
-		-e "s|@SU@|${SU}|g"					\
-		${FILESDIR}/pgsql.sh > ${WRKDIR}/pgsql.sh
-	${SED}	-e "s|@PGUSER@|${PGUSER}|g"				\
-		-e "s|@PGGROUP@|${PGGROUP}|g"				\
-		-e "s|@PGHOME@|${PGHOME}|g"				\
-		-e "s|@CAT@|${CAT}|g"					\
-		-e "s|@RM@|${RM}|g"					\
-		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED}	-e "s|@PGUSER@|${PGUSER}|g"				\
-		-e "s|@PGGROUP@|${PGGROUP}|g"				\
-		-e "s|@PGHOME@|${PGHOME}|g"				\
-		-e "s|@ADDUSER@|${ADDUSER}|g"				\
-		-e "s|@ADDGROUP@|${ADDGROUP}|g"				\
-		-e "s|@CHGRP@|${CHGRP}|g"				\
-		-e "s|@CHOWN@|${CHOWN}|g"				\
-		-e "s|@GREP@|${GREP}|g"					\
-		-e "s|@MKDIR@|${MKDIR}|g"				\
-		-e "s|@RM@|${RM}|g"					\
-		-e "s|@SU@|${SU}|g"					\
-		-e "s|@TOUCH@|${TOUCH}|g"				\
-		${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	${SED} ${FILES_SUBST_SED} ${FILESDIR}/pgsql.sh > ${WRKDIR}/pgsql.sh
+	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
diff --git a/databases/postgresql/Makefile.ssl b/databases/postgresql/Makefile.ssl
index 1d98eeafdd8..774b6a3f891 100644
--- a/databases/postgresql/Makefile.ssl
+++ b/databases/postgresql/Makefile.ssl
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.ssl,v 1.1 2001/05/14 14:52:36 jlam Exp $
+# $NetBSD: Makefile.ssl,v 1.2 2001/06/21 21:40:07 jlam Exp $
 #
 # This Makefile fragment *must* be included by PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution that use the PostgreSQL
 # libraries.
 
 USE_SSL=		# defined
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
+
+.include "../../security/openssl/buildlink.mk"
diff --git a/databases/postgresql/files/Makefile.custom b/databases/postgresql/files/Makefile.custom
index 476480288cd..663e8f2e61f 100644
--- a/databases/postgresql/files/Makefile.custom
+++ b/databases/postgresql/files/Makefile.custom
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.custom,v 1.6 2001/05/16 15:41:03 jlam Exp $
+# $NetBSD: Makefile.custom,v 1.7 2001/06/21 21:40:07 jlam Exp $
 #
 # This file is included by Makefile.global, which is included by every
 # sub-Makefile in the build tree.  Makefiles for shared libraries include
 # Makefile.global then Makefile.shlib.
 
 ifdef INSTALLED_LIBPQ
-libpq = -L$(libdir) -lpq
+libpq = -lpq
 endif
 
 ifdef INSTALLED_LIBPGTCL
-libpgtcl = -L$(libdir) -lpgtcl
+libpgtcl = -lpgtcl
 endif
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index 1db5cc746f3..616d7abf0d3 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/05/14 14:53:28 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/21 21:40:09 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -8,10 +8,14 @@ COMMENT=		Python interface to PostgreSQL
 
 MAINTAINER=		darcy@netbsd.org
 
-DEPENDS+=		postgresql-lib>=${PG_BASE_VERS}:../../databases/postgresql-lib
 DEPENDS+=		python>=2.0:../../lang/python
 DEPENDS+=		py-mxDateTime-[0-9]*:../../time/py-mxDateTime
 
+USE_BUILDLINK_ONLY=	# defined
+POSTGRESQL_LIB_REQD=	${PG_BASE_VERS}
+
+.include "../../databases/postgresql-lib/buildlink.mk"
+
 PYTHON=			${LOCALBASE}/bin/python
 
 .if exists(${PYTHON})
diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile
index 8ae4fbfa451..b4e955a4e7f 100644
--- a/databases/tcl-postgresql/Makefile
+++ b/databases/tcl-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/05/24 03:02:54 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/21 21:40:09 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -7,19 +7,18 @@ PKGNAME=		tcl-postgresql-${PG_VERS}
 PG_PKG_VERS=		# empty
 COMMENT=		Tcl interface to PostgreSQL
 
-DEPENDS+=		postgresql-lib>=${PG_BASE_VERS}:../../databases/postgresql-lib
-DEPENDS+=		tcl>=8.3.2nb2:../../lang/tcl
+USE_BUILDLINK_ONLY=	# defined
+POSTGRESQL_LIB_REQD=	${PG_BASE_VERS}
 
-TCLSH=			${LOCALBASE}/bin/tclsh
-TCL_CONFIGDIR=		${LOCALBASE}/lib
+.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../lang/tcl/buildlink.mk"
 
 MAKE_ENV+=		INSTALLED_LIBPQ=1
 
 CONFIGURE_ARGS+=	--with-tcl
-CONFIGURE_ARGS+=	--with-tclconfig="${TCL_CONFIGDIR}"
-CONFIGURE_ARGS+=	--with-includes="${LOCALBASE}/include"
-CONFIGURE_ARGS+=	--with-libraries="${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_DIR}/lib"
 CONFIGURE_ENV+=		TCLSH="${TCLSH}"
+TCLSH=			${LOCALBASE}/bin/tclsh
 
 DIRS_TO_BUILD=		src/interfaces/libpgtcl src/bin/pgtclsh
 
diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile
index 15333ad79e6..a7a52ddcf52 100644
--- a/databases/tk-postgresql/Makefile
+++ b/databases/tk-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/14 14:54:16 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/21 21:40:09 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -7,25 +7,23 @@ PKGNAME=		tk-postgresql-${PG_VERS}
 PG_PKG_VERS=		# empty
 COMMENT=		Tk interface to PostgreSQL
 
-DEPENDS+=		postgresql-lib>=${PG_BASE_VERS}:../../databases/postgresql-lib
-DEPENDS+=		tcl-postgresql>=${PG_BASE_VERS}:../../databases/tcl-postgresql
-DEPENDS+=		tk>=8.3.2:../../x11/tk
+USE_BUILDLINK_ONLY=	# defined
+POSTGRESQL_LIB_REQD=	${PG_BASE_VERS}
+TCL_POSTGRESQL_REQD=	${PG_BASE_VERS}
 
-TCLSH=			${LOCALBASE}/bin/tclsh
-TCL_CONFIGDIR=		${LOCALBASE}/lib
-TK_CONFIGDIR=		${LOCALBASE}/lib
+.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../databases/tcl-postgresql/buildlink.mk"
+.include "../../x11/tk/buildlink.mk"
 
 USE_X11=		# defined
-
 MAKE_ENV+=		INSTALLED_LIBPQ=1 INSTALLED_LIBPGTCL=1
 
 CONFIGURE_ARGS+=	--with-tcl
 CONFIGURE_ARGS+=	--with-tk
-CONFIGURE_ARGS+=	--with-tclconfig="${TCL_CONFIGDIR}"
-CONFIGURE_ARGS+=	--with-tkconfig="${TK_CONFIGDIR}"
-CONFIGURE_ARGS+=	--with-includes="${LOCALBASE}/include"
-CONFIGURE_ARGS+=	--with-libraries="${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_DIR}/lib"
+CONFIGURE_ARGS+=	--with-tkconfig="${BUILDLINK_DIR}/lib"
 CONFIGURE_ENV+=		TCLSH="${TCLSH}"
+TCLSH=			${LOCALBASE}/bin/tclsh
 
 DIRS_TO_BUILD=		src/bin/pgtclsh
 ALL_TARGET=		pgtksh