pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases Drop redundant variable setting from postgre...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7496acd038a2
branches:  trunk
changeset: 631710:7496acd038a2
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Mar 12 17:01:57 2014 +0000

description:
Drop redundant variable setting from postgresql*-server.

PGUSER, PGGROUP, and PGHOME are all in mk/defaults/mk.conf.  They are
also set (?=) in each server Makefile.  Worse, PGHOME is set to
varying values.  However, the versions in defaults prevail.
Therefore, remove the extra/confusing settings, leaving this as a
user-settable variable with a default.  pkg_info -B before and after
shows no related changes, so no PKGREVISION++.

Pointed out by Richard Palo, and ok adam@.

There's a related issue lurking, which is that PGHOME ends up being
/usr/pkg/pgsql, which is not under VARBASE, but I'm letting that be
because a change would be disruptive.

diffstat:

 databases/postgresql84-server/Makefile |  5 +----
 databases/postgresql90-server/Makefile |  5 +----
 databases/postgresql91-server/Makefile |  5 +----
 databases/postgresql92-server/Makefile |  5 +----
 databases/postgresql93-server/Makefile |  5 +----
 5 files changed, 5 insertions(+), 20 deletions(-)

diffs (95 lines):

diff -r 3b447b76bfff -r 7496acd038a2 databases/postgresql84-server/Makefile
--- a/databases/postgresql84-server/Makefile    Wed Mar 12 16:16:27 2014 +0000
+++ b/databases/postgresql84-server/Makefile    Wed Mar 12 17:01:57 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2014/03/11 14:34:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2014/03/12 17:01:57 gdt Exp $
 
 PKGNAME=       ${DISTNAME:C/-/84-server-/}
 COMMENT=       PostgreSQL database server programs
@@ -43,9 +43,6 @@
 # PGGROUP      group of the database administrator
 # PGHOME       home directory of the database administrator and location of
 #              the databases
-PGUSER?=               pgsql
-PGGROUP?=              pgsql
-PGHOME?=               ${VARBASE}/${PGUSER}
 FILES_SUBST+=          PGUSER=${PGUSER}
 FILES_SUBST+=          PGGROUP=${PGGROUP}
 FILES_SUBST+=          PGHOME=${PGHOME}
diff -r 3b447b76bfff -r 7496acd038a2 databases/postgresql90-server/Makefile
--- a/databases/postgresql90-server/Makefile    Wed Mar 12 16:16:27 2014 +0000
+++ b/databases/postgresql90-server/Makefile    Wed Mar 12 17:01:57 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/03/11 14:34:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2014/03/12 17:01:57 gdt Exp $
 
 PKGNAME=       ${DISTNAME:C/-/90-server-/}
 COMMENT=       PostgreSQL database server programs
@@ -44,9 +44,6 @@
 # PGGROUP      group of the database administrator
 # PGHOME       home directory of the database administrator and location of
 #              the databases
-PGUSER?=               pgsql
-PGGROUP?=              pgsql
-PGHOME?=               ${VARBASE}/${PGUSER}
 FILES_SUBST+=          PGUSER=${PGUSER}
 FILES_SUBST+=          PGGROUP=${PGGROUP}
 FILES_SUBST+=          PGHOME=${PGHOME}
diff -r 3b447b76bfff -r 7496acd038a2 databases/postgresql91-server/Makefile
--- a/databases/postgresql91-server/Makefile    Wed Mar 12 16:16:27 2014 +0000
+++ b/databases/postgresql91-server/Makefile    Wed Mar 12 17:01:57 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/03/11 14:34:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/12 17:01:57 gdt Exp $
 
 PKGNAME=       ${DISTNAME:C/-/91-server-/}
 COMMENT=       PostgreSQL database server programs
@@ -44,9 +44,6 @@
 # PGGROUP      group of the database administrator
 # PGHOME       home directory of the database administrator and location of
 #              the databases
-PGUSER?=               pgsql
-PGGROUP?=              pgsql
-PGHOME?=               ${PREFIX}/${PGUSER}
 FILES_SUBST+=          PGUSER=${PGUSER}
 FILES_SUBST+=          PGGROUP=${PGGROUP}
 FILES_SUBST+=          PGHOME=${PGHOME}
diff -r 3b447b76bfff -r 7496acd038a2 databases/postgresql92-server/Makefile
--- a/databases/postgresql92-server/Makefile    Wed Mar 12 16:16:27 2014 +0000
+++ b/databases/postgresql92-server/Makefile    Wed Mar 12 17:01:57 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/03/11 14:34:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2014/03/12 17:01:57 gdt Exp $
 
 PKGNAME=       ${DISTNAME:C/-/92-server-/}
 COMMENT=       PostgreSQL database server programs
@@ -44,9 +44,6 @@
 # PGGROUP      group of the database administrator
 # PGHOME       home directory of the database administrator and location of
 #              the databases
-PGUSER?=               pgsql
-PGGROUP?=              pgsql
-PGHOME?=               ${VARBASE}/${PGUSER}
 FILES_SUBST+=          PGUSER=${PGUSER}
 FILES_SUBST+=          PGGROUP=${PGGROUP}
 FILES_SUBST+=          PGHOME=${PGHOME}
diff -r 3b447b76bfff -r 7496acd038a2 databases/postgresql93-server/Makefile
--- a/databases/postgresql93-server/Makefile    Wed Mar 12 16:16:27 2014 +0000
+++ b/databases/postgresql93-server/Makefile    Wed Mar 12 17:01:57 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/03/11 14:34:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/12 17:01:57 gdt Exp $
 
 PKGNAME=       ${DISTNAME:C/-/93-server-/}
 COMMENT=       PostgreSQL database server programs
@@ -44,9 +44,6 @@
 # PGGROUP      group of the database administrator
 # PGHOME       home directory of the database administrator and location of
 #              the databases
-PGUSER?=               pgsql
-PGGROUP?=              pgsql
-PGHOME?=               ${VARBASE}/${PGUSER}
 FILES_SUBST+=          PGUSER=${PGUSER}
 FILES_SUBST+=          PGGROUP=${PGGROUP}
 FILES_SUBST+=          PGHOME=${PGHOME}



Home | Main Index | Thread Index | Old Index