3 files changed, 40 insertions, 16 deletions
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 7568f82dbe2..55d9e674598 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,28 +1,33 @@
-# $NetBSD: Makefile,v 1.16 2002/10/24 16:25:32 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/05 20:12:21 jlam Exp $
 
 PKGNAME=		postgresql-client-${BASE_VERS}
 COMMENT=		PostgreSQL database client programs
 
-USE_BUILDLINK2=		# defined
-
-.include "../../databases/postgresql/Makefile.common"
+.include "../postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
-CONFIGURE_ARGS+=	--enable-readline
+CONFIGURE_ARGS+=	--with-zlib
+CONFIGURE_ARGS+=	--with-readline
 MAKE_ENV+=		INSTALLED_LIBPQ=1
 
 BUILD_DIRS=		${WRKSRC}/src/bin
 
 pre-build:
 	cd ${WRKSRC}/src/bin/psql &&					\
-		${RM} -f pqsignal.h &&					\
-		${LN} -sf ../../interfaces/libpq/pqsignal.h pqsignal.h
+	${RM} -f pqsignal.h &&						\
+	${LN} -sf ${BUILDLINK_DIR}/include/postgresql/server/libpq/pqsignal.h pqsignal.h
+	for file in parser/parse.h utils/fmgroids.h; do			\
+		src="${BUILDLINK_DIR}/include/postgresql/server/$$file"; \
+		dest="${WRKSRC}/src/include/$$file";			\
+		${RM} -f $$dest;					\
+		${LN} -sf $$src $$dest;					\
+	done
 
 post-install:
 	cd ${PREFIX}/man && 						\
 	${PAX} -crzf ${WRKSRC}/doc/man.tar.gz `${GREP} -v ^# ${FILESDIR}/exclude`
 
-.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../postgresql-lib/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 
diff --git a/databases/postgresql-client/PLIST b/databases/postgresql-client/PLIST
index 4769e6ef0b5..5e6084d4860 100644
--- a/databases/postgresql-client/PLIST
+++ b/databases/postgresql-client/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/04 07:41:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/05 20:12:21 jlam Exp $
+bin/clusterdb
 bin/createdb
 bin/createlang
 bin/createuser
@@ -9,15 +10,17 @@ bin/initdb
 bin/initlocation
 bin/ipcclean
 bin/pg_config
+bin/pg_controldata
 bin/pg_ctl
 bin/pg_dump
 bin/pg_dumpall
 bin/pg_encoding
 bin/pg_id
-bin/pg_passwd
+bin/pg_resetxlog
 bin/pg_restore
 bin/psql
 bin/vacuumdb
+man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
 man/man1/createuser.1
@@ -28,16 +31,19 @@ man/man1/initdb.1
 man/man1/initlocation.1
 man/man1/ipcclean.1
 man/man1/pg_config.1
+man/man1/pg_controldata.1
 man/man1/pg_ctl.1
 man/man1/pg_dump.1
 man/man1/pg_dumpall.1
-man/man1/pg_passwd.1
+man/man1/pg_resetxlog.1
 man/man1/pg_restore.1
 man/man1/psql.1
 man/man1/vacuumdb.1
 man/manl/abort.l
+man/manl/alter_database.l
 man/manl/alter_group.l
 man/manl/alter_table.l
+man/manl/alter_trigger.l
 man/manl/alter_user.l
 man/manl/analyze.l
 man/manl/begin.l
@@ -48,31 +54,42 @@ man/manl/comment.l
 man/manl/commit.l
 man/manl/copy.l
 man/manl/create_aggregate.l
+man/manl/create_cast.l
 man/manl/create_constraint_trigger.l
+man/manl/create_conversion.l
 man/manl/create_database.l
+man/manl/create_domain.l
 man/manl/create_function.l
 man/manl/create_group.l
 man/manl/create_index.l
 man/manl/create_language.l
 man/manl/create_operator.l
+man/manl/create_operator_class.l
 man/manl/create_rule.l
+man/manl/create_schema.l
 man/manl/create_sequence.l
-man/manl/create_table_as.l
 man/manl/create_table.l
+man/manl/create_table_as.l
 man/manl/create_trigger.l
 man/manl/create_type.l
 man/manl/create_user.l
 man/manl/create_view.l
+man/manl/deallocate.l
 man/manl/declare.l
 man/manl/delete.l
 man/manl/drop_aggregate.l
+man/manl/drop_cast.l
+man/manl/drop_conversion.l
 man/manl/drop_database.l
+man/manl/drop_domain.l
 man/manl/drop_function.l
 man/manl/drop_group.l
 man/manl/drop_index.l
 man/manl/drop_language.l
 man/manl/drop_operator.l
+man/manl/drop_operator_class.l
 man/manl/drop_rule.l
+man/manl/drop_schema.l
 man/manl/drop_sequence.l
 man/manl/drop_table.l
 man/manl/drop_trigger.l
@@ -80,6 +97,7 @@ man/manl/drop_type.l
 man/manl/drop_user.l
 man/manl/drop_view.l
 man/manl/end.l
+man/manl/execute.l
 man/manl/explain.l
 man/manl/fetch.l
 man/manl/grant.l
@@ -89,17 +107,19 @@ man/manl/load.l
 man/manl/lock.l
 man/manl/move.l
 man/manl/notify.l
+man/manl/prepare.l
 man/manl/reindex.l
 man/manl/reset.l
 man/manl/revoke.l
 man/manl/rollback.l
-man/manl/select_into.l
 man/manl/select.l
+man/manl/select_into.l
+man/manl/set.l
 man/manl/set_constraints.l
 man/manl/set_session_authorization.l
-man/manl/set.l
 man/manl/set_transaction.l
 man/manl/show.l
+man/manl/start_transaction.l
 man/manl/truncate.l
 man/manl/unlisten.l
 man/manl/update.l
diff --git a/databases/postgresql-client/files/exclude b/databases/postgresql-client/files/exclude
index eeeb5d5a96b..01293b119f4 100644
--- a/databases/postgresql-client/files/exclude
+++ b/databases/postgresql-client/files/exclude
@@ -1,7 +1,6 @@
-# $NetBSD: exclude,v 1.1.1.1 2001/05/14 14:45:36 jlam Exp $
+# $NetBSD: exclude,v 1.2 2003/01/05 20:12:22 jlam Exp $
 #
 man1/ecpg.1
-man1/pgaccess.1
 man1/pgtclsh.1
 man1/pgtksh.1
 man1/postgres.1