From jhelfman@experts-exchange.com  Wed Oct 19 00:48:13 2011
Return-Path: <jhelfman@experts-exchange.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2C209106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Oct 2011 00:48:13 +0000 (UTC)
	(envelope-from jhelfman@experts-exchange.com)
Received: from mail.experts-exchange.com (mail.experts-exchange.com [72.29.183.251])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C5658FC1A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Oct 2011 00:48:12 +0000 (UTC)
Received: from mail.experts-exchange.com (localhost [127.0.0.1])
	by mail.experts-exchange.com (Postfix) with ESMTP id B63C96FF160
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Oct 2011 17:48:12 -0700 (PDT)
Received: from mail.experts-exchange.com ([127.0.0.1])
	by mail.experts-exchange.com (mail.experts-exchange.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id Zgtw7sPGvmW8 for <FreeBSD-gnats-submit@freebsd.org>;
	Tue, 18 Oct 2011 17:48:12 -0700 (PDT)
Received: from experts-exchange.com (unknown [192.168.103.122])
	by mail.experts-exchange.com (Postfix) with SMTP id 933766FF15C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Oct 2011 17:48:12 -0700 (PDT)
Received: (nullmailer pid 44612 invoked by uid 1001);
	Wed, 19 Oct 2011 00:48:12 -0000
Message-Id: <1318985292.467135.44611.nullmailer@experts-exchange.com>
Date: Tue, 18 Oct 2011 17:48:12 -0700
From: Jason Helfman <jhelfman@experts-exchange.com>
Reply-To: Jason Helfman <jhelfman@experts-exchange.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] databases/postgresql90-server: logic for PG_USER broken on server
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         161791
>Category:       ports
>Synopsis:       [patch] databases/postgresql90-server: logic for PG_USER broken on server
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 19 00:50:07 UTC 2011
>Closed-Date:    Thu Oct 20 19:46:39 UTC 2011
>Last-Modified:  Thu Oct 20 19:46:39 UTC 2011
>Originator:     Jason Helfman
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
Experts Exchange, LLC.
>Environment:
System: FreeBSD eggman.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
SUB_LIST was moved out of pkg-install-server and into postgresql.in, however SUB_LIST wasn't defined for PG_USER/PG_GROUP for postgresql.in
Add SUB_LIST and PLIST_SUB to test for only not client and not slave.
>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /home/jhelfman/ncvs/ports/databases/postgresql90-server/Makefile,v
retrieving revision 1.227
diff -u -r1.227 Makefile
--- Makefile	18 Oct 2011 09:03:32 -0000	1.227
+++ Makefile	19 Oct 2011 00:45:12 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	9.0.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -70,6 +70,10 @@
 .endif
 GROUPS?=	${PG_GROUP}
 SUB_FILES+=	502.pgsql
+SUB_LIST=	PG_GROUP=$(PG_GROUP) \
+		PG_USER=$(PG_USER) \
+		PG_UID=$(PG_UID)
+PLIST_SUB+=	PG_USER=$(PG_USER)
 .endif
 
 .if !defined(SLAVE_ONLY)
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->girgen 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Oct 19 00:50:18 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161791 

From: Jason Helfman <jhelfman@e-e.com>
To: bug-followup@freebsd.org
Cc: girgen@freebsd.org
Subject: Re: ports/161791: [patch] databases/postgresql90-server: logic for
 PG_USER broken on server
Date: Wed, 19 Oct 2011 10:35:18 -0700

 --RYJh/3oyKhIjGcML
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Disposition: inline
 
 Here is an updated patch for all postgresql server versions. I didn't remove
 this if condition, however I believe it is no longer being used.
 
 .  if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
 SUB_FILES+=     pkg-install${PKGNAMESUFFIX}
 SUB_LIST=       PG_GROUP=$(PG_GROUP) \
                  PG_USER=$(PG_USER) \
                  PG_UID=$(PG_UID)
 PLIST_SUB+=     PG_USER=$(PG_USER)
 PKGINSTALL=     ${WRKDIR}/pkg-install${PKGNAMESUFFIX}
 .  endif
 
 -- 
 Jason Helfman
 System Administrator
 experts-exchange.com
 http://www.experts-exchange.com/M_4830110.html
 E4AD 7CF1 1396 27F6 79DD  4342 5E92 AD66 8C8C FBA5
 
 --RYJh/3oyKhIjGcML
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 Index: postgresql82-server/Makefile
 ===================================================================
 RCS file: /home/jhelfman/ncvs/ports/databases/postgresql82-server/Makefile,v
 retrieving revision 1.201
 diff -u -r1.201 Makefile
 --- postgresql82-server/Makefile	18 Oct 2011 09:03:31 -0000	1.201
 +++ postgresql82-server/Makefile	19 Oct 2011 16:09:32 -0000
 @@ -7,6 +7,7 @@
  
  PORTNAME?=	postgresql
  DISTVERSION?=	8.2.22
 +PORTREVISION= 1
  CATEGORIES?=	databases
  MASTER_SITES=	${MASTER_SITE_PGSQL}
  MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
 @@ -69,6 +70,10 @@
  .endif
  GROUPS?=	${PG_GROUP}
  SUB_FILES+=	502.pgsql
 +SUB_LIST=	PG_GROUP=$(PG_GROUP) \
 +	PG_USER=$(PG_USER) \
 +	PG_UID=$(PG_UID)
 +PLIST_SUB+=	PG_USER=$(PG_USER)
  .endif
  
  .if !defined(SLAVE_ONLY)
 Index: postgresql84-server/Makefile
 ===================================================================
 RCS file: /home/jhelfman/ncvs/ports/databases/postgresql84-server/Makefile,v
 retrieving revision 1.232
 diff -u -r1.232 Makefile
 --- postgresql84-server/Makefile	18 Oct 2011 09:03:31 -0000	1.232
 +++ postgresql84-server/Makefile	19 Oct 2011 16:10:32 -0000
 @@ -7,7 +7,7 @@
  
  PORTNAME?=	postgresql
  DISTVERSION?=	8.4.9
 -PORTREVISION?=	0
 +PORTREVISION?=	1
  CATEGORIES?=	databases
  MASTER_SITES=	${MASTER_SITE_PGSQL}
  MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
 @@ -63,6 +63,10 @@
  USE_PGSQL=	yes
  WANT_PGSQL_VER=	${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
  SUB_FILES+=	502.pgsql
 +SUB_LIST=	PG_GROUP=$(PG_GROUP) \
 +		PG_USER=$(PG_USER) \
 +		PG_UID=$(PG_UID)
 +PLIST_SUB+=	PG_USER=$(PG_USER)
  .endif
  
  .if !defined(SLAVE_ONLY)
 Index: postgresql90-server/Makefile
 ===================================================================
 RCS file: /home/jhelfman/ncvs/ports/databases/postgresql90-server/Makefile,v
 retrieving revision 1.227
 diff -u -r1.227 Makefile
 --- postgresql90-server/Makefile	18 Oct 2011 09:03:32 -0000	1.227
 +++ postgresql90-server/Makefile	19 Oct 2011 16:13:39 -0000
 @@ -7,7 +7,7 @@
  
  PORTNAME?=	postgresql
  DISTVERSION?=	9.0.5
 -PORTREVISION?=	0
 +PORTREVISION?=	1
  CATEGORIES?=	databases
  MASTER_SITES=	${MASTER_SITE_PGSQL}
  MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
 @@ -70,6 +70,10 @@
  .endif
  GROUPS?=	${PG_GROUP}
  SUB_FILES+=	502.pgsql
 +SUB_LIST=	PG_GROUP=$(PG_GROUP) \
 +		PG_USER=$(PG_USER) \
 +		PG_UID=$(PG_UID)
 +PLIST_SUB+=	PG_USER=$(PG_USER)
  .endif
  
  .if !defined(SLAVE_ONLY)
 Index: postgresql91-server/Makefile
 ===================================================================
 RCS file: /home/jhelfman/ncvs/ports/databases/postgresql91-server/Makefile,v
 retrieving revision 1.228
 diff -u -r1.228 Makefile
 --- postgresql91-server/Makefile	18 Oct 2011 09:03:32 -0000	1.228
 +++ postgresql91-server/Makefile	19 Oct 2011 16:11:41 -0000
 @@ -8,6 +8,7 @@
  PORTNAME?=	postgresql
  DISTVERSION?=	9.1.1
  DISTVERSION?=	9.1.0
 +PORTREVISION?=	1
  CATEGORIES?=	databases
  MASTER_SITES=	${MASTER_SITE_PGSQL}
  MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
 @@ -70,6 +71,10 @@
  .endif
  GROUPS?=	${PG_GROUP}
  SUB_FILES+=	502.pgsql
 +SUB_LIST=	PG_GROUP=$(PG_GROUP) \
 +		PG_USER=$(PG_USER) \
 +		PG_UID=$(PG_UID)
 +PLIST_SUB+=	PG_USER=$(PG_USER)
  .endif
  
  .if !defined(SLAVE_ONLY)
 
 --RYJh/3oyKhIjGcML--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/161791: commit references a PR
Date: Wed, 19 Oct 2011 18:21:40 +0000 (UTC)

 crees       2011-10-19 18:21:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/postgresql82-server Makefile 
     databases/postgresql83-server Makefile 
     databases/postgresql84-server Makefile 
     databases/postgresql90-server Makefile 
     databases/postgresql91-server Makefile 
   Log:
   Fix SUB_LIST issue by deconditionalising it.
   
   Temporary fix, but will stop the flurry of incoming PRs related.
   
   PR:             ports/161779 ports/161774 ports/161791 ports/161771 ports/161769
   Submitted by:   Many people, original fix suggested by Jason Helfman (jhelfman@e-e.com)
   Approved by:    portmgr (pav)
   
   Revision  Changes    Path
   1.202     +4 -3      ports/databases/postgresql82-server/Makefile
   1.215     +4 -3      ports/databases/postgresql83-server/Makefile
   1.233     +4 -3      ports/databases/postgresql84-server/Makefile
   1.228     +4 -3      ports/databases/postgresql90-server/Makefile
   1.229     +4 -3      ports/databases/postgresql91-server/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: crees 
State-Changed-When: Thu Oct 20 19:46:21 UTC 2011 
State-Changed-Why:  
Close and take-- fixed. 


Responsible-Changed-From-To: girgen->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Thu Oct 20 19:46:21 UTC 2011 
Responsible-Changed-Why:  
Close and take-- fixed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161791 
>Unformatted:
