Use PKGREVISION to manage the package-specific version number when it

differs from the distfile version number.  G/C some the unused variables
in postgresql/Makefile.common related to the old way of handling version
numbers.

11 files changed, 21 insertions, 35 deletions

diff --git a/databases/odbc-postgresql/Makefile b/databases/odbc-postgresql/Makefile
index f52d9900a07..364281a0982 100644
--- a/databases/odbc-postgresql/Makefile
+++ b/databases/odbc-postgresql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/06/21 21:40:07 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/12/03 08:06:24 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		odbc-postgresql-${PG_VERS}
-PG_PKG_VERS=		# empty
+PKGNAME=		odbc-postgresql-${PG_BASE_VERS}
 COMMENT=		ODBC interface to PostgreSQL
 
 MAINTAINER=		jwise@netbsd.org
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index cf396997145..ffcb1bba31a 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2001/08/20 03:55:31 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/12/03 08:06:26 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		postgresql-client-${PG_VERS}
-PG_PKG_VERS=		# empty
+PKGNAME=		postgresql-client-${PG_BASE_VERS}
 COMMENT=		PostgreSQL database client programs
 
 USE_BUILDLINK_ONLY=			# defined
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index d9da410da2a..bd86434b15c 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 14:46:22 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:06:26 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 
-PKGNAME=		postgresql-docs-${PG_VERS}
-PG_PKG_VERS=		# empty
+PKGNAME=		postgresql-docs-${PG_BASE_VERS}
 COMMENT=		PostgreSQL database system documentation
 
 DOC_DIR=		doc
diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile
index 5004ea6e3aa..bd159a3eccd 100644
--- a/databases/postgresql-lib/Makefile
+++ b/databases/postgresql-lib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/07/29 17:13:48 tron Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/03 08:06:26 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		postgresql-lib-${PG_VERS}
-PG_PKG_VERS=		# empty
+PKGNAME=		postgresql-lib-${PG_BASE_VERS}
 COMMENT=		PostgreSQL database headers and libraries
 
 USE_BUILDLINK_ONLY=	# defined
diff --git a/databases/postgresql-plperl/Makefile b/databases/postgresql-plperl/Makefile
index 636e0b27700..29d8fd10b68 100644
--- a/databases/postgresql-plperl/Makefile
+++ b/databases/postgresql-plperl/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/11/28 05:20:45 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/12/03 08:06:27 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		postgresql-plperl-${PG_VERS}
-PG_PKG_VERS=		# empty
+PKGNAME=		postgresql-plperl-${PG_BASE_VERS}
 COMMENT=		PL/Perl procedural language for the PostgreSQL backend
 
 BUILDLINK_DEPENDS.postgresql-lib=	postgresql-lib>=${PG_BASE_VERS}
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index b7643bdb969..150e056469c 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/06/23 19:26:51 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/03 08:06:27 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		postgresql-pltcl-${PG_VERS}
-PG_PKG_VERS=		# empty
+PKGNAME=		postgresql-pltcl-${PG_BASE_VERS}
 COMMENT=		PL/Tcl procedural language for the PostgreSQL backend
 
 USE_BUILDLINK_ONLY=			# defined
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 295e5fba84f..782f778f0e9 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2001/12/02 06:56:39 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/03 08:06:27 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		postgresql-server-${PG_VERS}
-PG_PKG_VERS=		# empty
+PKGNAME=		postgresql-server-${PG_BASE_VERS}
 COMMENT=		PostgreSQL database server programs
 
 USE_BUILDLINK_ONLY=			# defined
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index fe82d277d79..5ec2a774c1c 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2001/05/15 15:59:22 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2001/12/03 08:06:25 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 
-PKGNAME=	postgresql-${PG_VERS}
-PG_PKG_VERS=	# empty
+PKGNAME=	postgresql-${PG_BASE_VERS}
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql-client>=${PG_BASE_VERS}:../../databases/postgresql-client
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index 0570d7806c2..76436599629 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2001/10/06 21:41:30 veego Exp $
+# $NetBSD: Makefile.common,v 1.24 2001/12/03 08:06:25 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution.
@@ -33,13 +33,9 @@ PATCHDIR=		${.CURDIR}/../../databases/postgresql/patches
 #
 # PG_DIST_VERS		version number on the postgresql distfile
 # PG_BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
-# PG_PKG_VERS		pkgsrc revisions of postgresql (nbX, etc.)
-# PG_VERS		pkgsrc version number of package
 #
 PG_DIST_VERS=		7.1.3
 PG_BASE_VERS=		${PG_DIST_VERS}
-PG_PKG_VERS?=		# empty
-PG_VERS=		${PG_BASE_VERS}${PG_PKG_VERS}
 
 USE_GMAKE=		# defined
 GNU_CONFIGURE=		# defined
diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile
index 2153be4acbf..cf2464b57ef 100644
--- a/databases/tcl-postgresql/Makefile
+++ b/databases/tcl-postgresql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2001/06/23 19:26:52 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/12/03 08:06:28 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		tcl-postgresql-${PG_VERS}
-PG_PKG_VERS=		# empty
+PKGNAME=		tcl-postgresql-${PG_BASE_VERS}
 COMMENT=		Tcl interface to PostgreSQL
 
 USE_BUILDLINK_ONLY=			# defined
diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile
index 9f7dd8964e9..abb7cb44f08 100644
--- a/databases/tk-postgresql/Makefile
+++ b/databases/tk-postgresql/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/12/03 08:06:28 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
 
-PKGNAME=		tk-postgresql-${PG_VERS}
-PG_PKG_VERS=		# empty
+PKGNAME=		tk-postgresql-${PG_BASE_VERS}
 COMMENT=		Tk interface to PostgreSQL
 
 USE_BUILDLINK_ONLY=			# defined