From da501169749f37e42bf4ebe96ce56b651091c490 Mon Sep 17 00:00:00 2001
From: darcy <darcy>
Date: Sat, 18 Dec 2004 14:26:15 +0000
Subject: Move the pg_config binary from -client to -lib.  This fixes PR
 pkg/28685 as well as the bulk build for py-postgresql.

Note that the man page is still built and installed by -client.  That's
a trickier problem.
---
 databases/postgresql74-client/Makefile  |  4 ++--
 databases/postgresql74-client/PLIST     |  3 +--
 databases/postgresql74-lib/Makefile     |  7 +++++--
 databases/postgresql74-lib/PLIST        |  3 ++-
 databases/postgresql74/patches/patch-af | 13 +++++++++++++
 5 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 databases/postgresql74/patches/patch-af

(limited to 'databases')

diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile
index 24697017de1..b780b7b6d28 100644
--- a/databases/postgresql74-client/Makefile
+++ b/databases/postgresql74-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/10/10 07:30:23 jdolecek Exp $
+# $NetBSD: Makefile,v 1.9 2004/12/18 14:26:15 darcy Exp $
 
 PKGNAME=		postgresql74-client-${BASE_VERS}
-PKGREVISION=		# empty
+PKGREVISION=	1
 SVR4_PKGNAME=		pstgc
 COMMENT=		PostgreSQL database client programs
 
diff --git a/databases/postgresql74-client/PLIST b/databases/postgresql74-client/PLIST
index 4d632cf181a..9d59f4ce450 100644
--- a/databases/postgresql74-client/PLIST
+++ b/databases/postgresql74-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/27 16:38:32 recht Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/12/18 14:26:15 darcy Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -9,7 +9,6 @@ bin/dropuser
 bin/initdb
 bin/initlocation
 bin/ipcclean
-bin/pg_config
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_dump
diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile
index f7ef71c4e15..688c4c75b54 100644
--- a/databases/postgresql74-lib/Makefile
+++ b/databases/postgresql74-lib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/11/28 19:19:51 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/18 14:26:15 darcy Exp $
 
 PKGNAME=		postgresql74-lib-${BASE_VERS}
-PKGREVISION=		# empty
+PKGREVISION=	1
 SVR4_PKGNAME=		pstgl
 COMMENT=		PostgreSQL database headers and libraries
 
@@ -13,6 +13,7 @@ CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 
 BUILD_DIRS+=		${WRKSRC}/src/include
 BUILD_DIRS+=		${WRKSRC}/src/interfaces
+BUILD_DIRS+=		${WRKSRC}/src/bin/pg_config
 
 # without this the Darwin build fails
 # (-bundle_loader related)
@@ -47,6 +48,8 @@ do-install:
 		${MAKE_PROGRAM} -C src/include install
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
 		${MAKE_PROGRAM} -C src/interfaces install
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
+		${MAKE_PROGRAM} -C src/bin/pg_config install
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
 		${MAKE_PROGRAM} -C src/pl install
 	cd ${WRKSRC}/src/include && ${SETENV} ${MAKE_ENV}	\
diff --git a/databases/postgresql74-lib/PLIST b/databases/postgresql74-lib/PLIST
index 4a56d9eee80..9bac0a7cf77 100644
--- a/databases/postgresql74-lib/PLIST
+++ b/databases/postgresql74-lib/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/04 20:10:13 recht Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/12/18 14:26:15 darcy Exp $
 bin/ecpg
+bin/pg_config
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
diff --git a/databases/postgresql74/patches/patch-af b/databases/postgresql74/patches/patch-af
new file mode 100644
index 00000000000..62bf747f65e
--- /dev/null
+++ b/databases/postgresql74/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/12/18 14:26:15 darcy Exp $
+
+--- src/bin/Makefile.orig	2002-09-03 17:45:43.000000000 -0400
++++ src/bin/Makefile	2004-12-18 08:21:43.000000000 -0500
+@@ -14,7 +14,7 @@
+ include $(top_builddir)/src/Makefile.global
+ 
+ DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
+-	psql scripts pg_config pg_controldata pg_resetxlog \
++	psql scripts pg_controldata pg_resetxlog \
+ 	pg_encoding
+ 
+ ifeq ($(with_tcl), yes)
-- 
cgit v1.2.3