Update odbc-postgresql to 7.1.1. There don't appear to be any functional

changes from version 7.0.3, only that this package is now built from sources
found in the PostgreSQL-7.1.1 sources.

4 files changed, 35 insertions, 17 deletions

diff --git a/databases/odbc-postgresql/Makefile b/databases/odbc-postgresql/Makefile
index 37a9163ed89..895535f1f6f 100644
--- a/databases/odbc-postgresql/Makefile
+++ b/databases/odbc-postgresql/Makefile
@@ -1,30 +1,28 @@
-# $NetBSD: Makefile,v 1.2 2001/04/06 23:48:49 jwise Exp $
+# $NetBSD: Makefile,v 1.3 2001/05/14 14:52:06 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		odbc-${DISTNAME}
-
+PKGNAME=		odbc-postgresql-${PG_VERS}
+PG_PKG_VERS=		# empty
 COMMENT=		ODBC interface to PostgreSQL
-MAINTAINER=		jwise@netbsd.org
 
-DEPENDS+=		postgresql-${PG_VERS}:../../databases/postgresql
-
-MAKE_ENV+=		INSTALLED_LIBPQ=1
+MAINTAINER=		jwise@netbsd.org
 
-CONFIGURE_ARGS+=	--without-perl --without-tcl
-CONFIGURE_ARGS+=	--with-odbc --with-odbcinst=/etc
+CONFIGURE_ARGS+=	--with-odbc
+CONFIGURE_ARGS+=	--with-odbcinst=/etc
 
-DIRS_TO_BUILD=		interfaces/odbc
+DIRS_TO_BUILD=		src/interfaces/odbc
 
 do-build:
 .for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
+	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
 .endfor
 
 do-install:
 .for DIR in ${DIRS_TO_BUILD}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
+	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
 .endfor
 
diff --git a/databases/odbc-postgresql/pkg/DESCR b/databases/odbc-postgresql/pkg/DESCR
index d4699473487..6ab0931900d 100644
--- a/databases/odbc-postgresql/pkg/DESCR
+++ b/databases/odbc-postgresql/pkg/DESCR
@@ -1,2 +1,2 @@
-ODBC interface to PostgreSQL, including library objects and
-C language header files.
+ODBC interface to PostgreSQL, including library objects and C language
+header files.
diff --git a/databases/odbc-postgresql/pkg/MESSAGE b/databases/odbc-postgresql/pkg/MESSAGE
index 9eb9877eebd..2cb8738394d 100644
--- a/databases/odbc-postgresql/pkg/MESSAGE
+++ b/databases/odbc-postgresql/pkg/MESSAGE
@@ -1,2 +1,17 @@
-Please see Chapter 22 of the PostgreSQL Programmer's Guide for information
-on configuring and using odbc-postgresql.
+===========================================================================
+$NetBSD: MESSAGE,v 1.2 2001/05/14 14:52:06 jlam Exp $
+
+Please see the ODBC interface section of the PostgreSQL Programmer's Guide
+(databases/postgresql-docs) for information on configuring and using
+${PKGNAME}.
+
+In summary, you will need to create the following configuration file:
+
+	/etc/odbcinst.ini
+
+and add the ODBC compliance functions in
+
+	${PREFIX}/share/postgresql/odbc.sql
+
+to any databases you wish to be ODBC-accessible.
+===========================================================================
diff --git a/databases/odbc-postgresql/pkg/PLIST b/databases/odbc-postgresql/pkg/PLIST
index dc745fd13a8..76344879bda 100644
--- a/databases/odbc-postgresql/pkg/PLIST
+++ b/databases/odbc-postgresql/pkg/PLIST
@@ -1,6 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/04/06 21:59:59 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/14 14:52:06 jlam Exp $
 include/pgsql/iodbc/iodbc.h
 include/pgsql/iodbc/isql.h
 include/pgsql/iodbc/isqlext.h
 lib/libpsqlodbc.a
+lib/libpsqlodbc.so
+lib/libpsqlodbc.so.0
 lib/libpsqlodbc.so.0.26
+share/postgresql/odbc.sql
+@unexec rmdir -p %D/share/postgresql 2>/dev/null || true
+@unexec rmdir -p %D/include/pgsql/iodbc 2>/dev/null || true