From cc6ce411e4f62de8d96d2165acf8e1435a8726de Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Fri, 13 Apr 2001 07:00:44 +0000
Subject: [PATCH] - integrate COMMENT's - bump NEED_VERSION - use PKGNAME-foo
 instead of overriding PKGNAME - fixup INSTALL/DEINSTALL - takeover as
 MAINTAINER until Pavel has a working e-mail address that doesn't bounce.

---
 databases/postgresql/Makefile            | 21 +++++++++++----------
 databases/postgresql/pkg/COMMENT         |  1 -
 databases/postgresql/pkg/COMMENT-clients |  1 -
 databases/postgresql/pkg/COMMENT-docs    |  1 -
 databases/postgresql/pkg/DEINSTALL       |  4 ++--
 databases/postgresql/pkg/INSTALL         | 17 +++++++++--------
 6 files changed, 22 insertions(+), 23 deletions(-)
 delete mode 100644 databases/postgresql/pkg/COMMENT
 delete mode 100644 databases/postgresql/pkg/COMMENT-clients
 delete mode 100644 databases/postgresql/pkg/COMMENT-docs

diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 55693bcbe7e..94dfe65ba3d 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,15 +1,22 @@
-# $OpenBSD: Makefile,v 1.45 2001/03/10 19:27:15 brad Exp $
+# $OpenBSD: Makefile,v 1.46 2001/04/13 07:00:44 brad Exp $
 # $FreeBSD: Makefile,v 1.25 1998/04/22 08:28:07 asami Exp $
 
+COMMENT=	"PostgreSQL RDBMS"
+COMMENT-clients="PostgreSQL RDBMS clients"
+COMMENT-docs=	"PostgreSQL RDBMS documentation"
+
 VERSION=	7.0.3
 DISTNAME=	postgresql-${VERSION}
 PKGNAME=	pgsql-${VERSION}
+PKGNAME-clients=pgsql-clients-${VERSION}
+PKGNAME-docs=	pgsql-docs-${VERSION}
 CATEGORIES=	databases
-NEED_VERSION=	1.356
+NEED_VERSION=	1.384
 
 HOMEPAGE=	http://www.postgresql.org/
 
-MAINTAINER=	Pavel Korovin <pvk@openbsd.ru>
+#MAINTAINER=	Pavel Korovin <pvk@openbsd.ru>
+MAINTAINER=	Brad Smith <brad@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -73,7 +80,7 @@ MULTI_PACKAGES=	-clients -docs
 SUBPACKAGE?=
 
 ## build dependencies
-USE_GMAKE=	Yes
+USE_GMAKE= Yes
 .if ${FLAVOR:L:Mtcl}
 LIB_DEPENDS=	tk83::x11/tk/8.3
 .endif
@@ -153,12 +160,6 @@ post-install:
 
 .include <bsd.port.mk>
 
-.if ${SUBPACKAGE} == "-clients"
-PKGNAME:=	pgsql-clients-${VERSION}
-.elif ${SUBPACKAGE} == "-docs"
-PKGNAME:=	pgsql-docs-${VERSION}
-.endif
-
 .if ${FLAVOR:L:Mtcl} && !defined(NO_SHARED_LIBS)
 SED_PLIST+=-e '/%%SHARED-tcl%%/r${PKGDIR}/PFRAG.tcl.shared' -e '//d'
 .else if ${FLAVOR:L:Mtcl} && defined(NO_SHARED_LIBS) && \
diff --git a/databases/postgresql/pkg/COMMENT b/databases/postgresql/pkg/COMMENT
deleted file mode 100644
index 00ad9fcb9ac..00000000000
--- a/databases/postgresql/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-PostgreSQL RDBMS
diff --git a/databases/postgresql/pkg/COMMENT-clients b/databases/postgresql/pkg/COMMENT-clients
deleted file mode 100644
index cfec8f74ffa..00000000000
--- a/databases/postgresql/pkg/COMMENT-clients
+++ /dev/null
@@ -1 +0,0 @@
-PostgreSQL RDBMS clients
diff --git a/databases/postgresql/pkg/COMMENT-docs b/databases/postgresql/pkg/COMMENT-docs
deleted file mode 100644
index 9d068975817..00000000000
--- a/databases/postgresql/pkg/COMMENT-docs
+++ /dev/null
@@ -1 +0,0 @@
-PostgreSQL RDBMS documentation
diff --git a/databases/postgresql/pkg/DEINSTALL b/databases/postgresql/pkg/DEINSTALL
index 84d181710f4..8f8f7156d31 100644
--- a/databases/postgresql/pkg/DEINSTALL
+++ b/databases/postgresql/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.1 1999/11/11 02:13:42 kevlo Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2001/04/13 07:00:46 brad Exp $
 #
 # postgresql de-installation
 
@@ -14,7 +14,7 @@ echo "+---------------"
 echo "| To completely deinstall the $1 package you need to perform"
 echo "| these steps as root:"
 echo "|"
-echo "|           rm -rf ${PGPREFIX}"
+echo "|           rm -rf $PGPREFIX"
 echo "|           rmuser pgsql"
 echo "|"
 echo "| Do not do this if you plan on re-installing postgresql package"
diff --git a/databases/postgresql/pkg/INSTALL b/databases/postgresql/pkg/INSTALL
index 3d81cfa95f1..b700e29519e 100644
--- a/databases/postgresql/pkg/INSTALL
+++ b/databases/postgresql/pkg/INSTALL
@@ -1,7 +1,14 @@
 #!/bin/sh
 #
-# $OpenBSD: INSTALL,v 1.1 1999/11/11 02:13:43 kevlo Exp $
+# $OpenBSD: INSTALL,v 1.2 2001/04/13 07:00:46 brad Exp $
 #
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+
 # Pre/post-installation setup of postgresql
 
 # Function: tell the user what s/he needs to do to use the port just installed
@@ -11,18 +18,12 @@ do_notice()
 	echo
 	echo "+---------------"
 	echo "| The $1 package installation completed."
-	echo "| See ${PREFIX}/share/doc/pgsql/README.OpenBSD for"
+	echo "| See $PREFIX/share/doc/pgsql/README.OpenBSD for"
 	echo "| information on using PostgreSQL package in OpenBSD environment."
 	echo "+---------------"
 	echo
 }
 
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
 # verify proper execution
 #
 if [ $# -ne 2 ]; then