diff options
author | gdt <gdt@pkgsrc.org> | 2014-03-12 17:01:57 +0000 |
---|---|---|
committer | gdt <gdt@pkgsrc.org> | 2014-03-12 17:01:57 +0000 |
commit | add8f4dce17ed9d27b9d6acd886866e70e1eec13 (patch) | |
tree | fb9913182ae4fa72dfd2292df5014fb2e1a97ea7 /databases | |
parent | a51497377288c885429435ec057caa184c7fc986 (diff) | |
download | pkgsrc-add8f4dce17ed9d27b9d6acd886866e70e1eec13.tar.gz |
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 (limited to 'databases')
-rw-r--r-- | databases/postgresql84-server/Makefile | 5 | ||||
-rw-r--r-- | databases/postgresql90-server/Makefile | 5 | ||||
-rw-r--r-- | databases/postgresql91-server/Makefile | 5 | ||||
-rw-r--r-- | databases/postgresql92-server/Makefile | 5 | ||||
-rw-r--r-- | databases/postgresql93-server/Makefile | 5 |
5 files changed, 5 insertions, 20 deletions
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 1ad7212cdef..efbf887342e 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -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 @@ DL_LIBS+= -lltdl # 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 --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index f6e49923837..f9a3dc20f05 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -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 @@ DL_LIBS+= -lltdl # 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 --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index e4d18fbfb2e..366c11fada3 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -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 @@ DL_LIBS+= -lltdl # 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 --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 7943ee44eaa..c79e582ac4b 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -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 @@ DL_LIBS+= -lltdl # 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 --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile index 0e330f2d6d7..b92db225ee0 100644 --- a/databases/postgresql93-server/Makefile +++ b/databases/postgresql93-server/Makefile @@ -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 @@ DL_LIBS+= -lltdl # 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} |