[pkgsrc/trunk]: pkgsrc/databases/postgresql74-lib Move the pg_config binary f...

[darcy <darcy%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c8cbc49aaaf
branches:  trunk
changeset: 485651:2c8cbc49aaaf
user:      darcy <darcy%pkgsrc.org@localhost>
date:      Sat Dec 18 14:26:15 2004 +0000

description:
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.

diffstat:

 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(-)

diffs (88 lines):

diff -r 8a90d2063adc -r 2c8cbc49aaaf databases/postgresql74-client/Makefile
--- a/databases/postgresql74-client/Makefile    Sat Dec 18 13:59:00 2004 +0000
+++ b/databases/postgresql74-client/Makefile    Sat Dec 18 14:26:15 2004 +0000
@@ -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 -r 8a90d2063adc -r 2c8cbc49aaaf databases/postgresql74-client/PLIST
--- a/databases/postgresql74-client/PLIST       Sat Dec 18 13:59:00 2004 +0000
+++ b/databases/postgresql74-client/PLIST       Sat Dec 18 14:26:15 2004 +0000
@@ -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/initdb
 bin/initlocation
 bin/ipcclean
-bin/pg_config
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_dump
diff -r 8a90d2063adc -r 2c8cbc49aaaf databases/postgresql74-lib/Makefile
--- a/databases/postgresql74-lib/Makefile       Sat Dec 18 13:59:00 2004 +0000
+++ b/databases/postgresql74-lib/Makefile       Sat Dec 18 14:26:15 2004 +0000
@@ -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 @@
 
 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)
@@ -48,6 +49,8 @@
        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}       \
                ${MAKE_PROGRAM} install-all-headers
diff -r 8a90d2063adc -r 2c8cbc49aaaf databases/postgresql74-lib/PLIST
--- a/databases/postgresql74-lib/PLIST  Sat Dec 18 13:59:00 2004 +0000
+++ b/databases/postgresql74-lib/PLIST  Sat Dec 18 14:26:15 2004 +0000
@@ -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 -r 8a90d2063adc -r 2c8cbc49aaaf databases/postgresql74/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/postgresql74/patches/patch-af   Sat Dec 18 14:26:15 2004 +0000
@@ -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)