From 8dc45652d46a220002347a3b36987cfcc6720ea4 Mon Sep 17 00:00:00 2001
From: recht <recht@pkgsrc.org>
Date: Sat, 24 Jul 2004 22:45:14 +0000
Subject: Use the new mk/pgsql.buildlink3.mk to select the correct PostgreSQL
 version.

---
 net/flow-tools/Makefile       | 6 +++---
 net/netsaint-plugins/Makefile | 8 ++++----
 net/pure-ftpd/Makefile        | 4 ++--
 net/snort-pgsql/Makefile      | 7 +++----
 4 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'net')

diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index b98147db8b9..17ba4107020 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/22 15:33:35 seb Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/24 22:45:15 recht Exp $
 
 DISTNAME=	flow-tools-0.67
 CATEGORIES=	net
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
 
 # Postgresql support
 .if defined(FLOW_TOOLS_USE_POSTGRESQL) && !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS])
-.include "../../databases/postgresql-lib/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
+.include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pgsql=${PGSQL_PREFIX}
 .endif
 
 # To avoid providing more patch files we do the following...
diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile
index 01c78b6e6e6..03a205b5388 100644
--- a/net/netsaint-plugins/Makefile
+++ b/net/netsaint-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/05/31 22:13:16 kristerw Exp $
+# $NetBSD: Makefile,v 1.19 2004/07/24 22:45:15 recht Exp $
 #
 
 DISTNAME=		netsaint-plugins-1.2.9-4
@@ -17,8 +17,8 @@ DEPENDS+=		{ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh
 .endif
 
 USE_BUILDLINK3=		YES
-CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
+CONFIGURE_ARGS+=	--with-pgsql=${PGSQL_PREFIX}
+CPPFLAGS+=		-I${PGSQL_PREFIX}/include/postgresql
 
 .include "../../net/netsaint-base/Makefile.common"
 .include "../../mk/bsd.prefs.mk"
@@ -27,6 +27,6 @@ CPPFLAGS+=		-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
 CONFIGURE_ARGS+=      --with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc"
 .endif
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 4a1e8db2989..e7ed6a146cd 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/20 22:04:15 recht Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/24 22:45:15 recht Exp $
 
 DISTNAME=	pure-ftpd-1.0.19
 CATEGORIES=	net
@@ -33,7 +33,7 @@ BUILD_DEFS+=		PURE_FTPD_USE_MYSQL
 .endif
 
 .if !empty(PURE_FTPD_USE_PGSQL:M[Yy][Ee][Ss])
-.  include "../../databases/postgresql-lib/buildlink3.mk"
+.  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pgsql
 BUILD_DEFS+=		PURE_FTPD_USE_PGSQL
 .endif
diff --git a/net/snort-pgsql/Makefile b/net/snort-pgsql/Makefile
index 3becf56497b..355d44eab31 100644
--- a/net/snort-pgsql/Makefile
+++ b/net/snort-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/07/01 17:10:22 adrianp Exp $
+# $NetBSD: Makefile,v 1.16 2004/07/24 22:45:15 recht Exp $
 
 .include "../../net/snort/Makefile.common"
 
@@ -14,8 +14,7 @@ FILESDIR=	${PKGDIR}/files
 PATCHDIR=	${PKGDIR}/patches
 DISTINFO_FILE=	${PKGDIR}/distinfo
 
-CONFIGURE_ARGS+=	--with-postgresql=${BUILDLINK_PREFIX.postgresql-lib}
-
-.include "../../databases/postgresql-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-postgresql=${PGSQL_PREFIX}
 
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3