From nobody@FreeBSD.org  Thu Jul 23 17:58:13 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2BB261065678
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Jul 2009 17:58:13 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 17B918FC1B
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Jul 2009 17:58:13 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n6NHwBkW081514
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Jul 2009 17:58:11 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n6NHwBf6081513;
	Thu, 23 Jul 2009 17:58:11 GMT
	(envelope-from nobody)
Message-Id: <200907231758.n6NHwBf6081513@www.freebsd.org>
Date: Thu, 23 Jul 2009 17:58:11 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: patch to allow databases/pgpool-II build with postgresql 8.4
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         137039
>Category:       ports
>Synopsis:       patch to allow databases/pgpool-II build with postgresql 8.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kuriyama
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 23 18:00:06 UTC 2009
>Closed-Date:    Sun Aug 02 00:35:44 UTC 2009
>Last-Modified:  Sun Aug  2 00:40:01 UTC 2009
>Originator:     Sevan Janiyan
>Release:        7.2
>Organization:
Venture 37 Ltd
>Environment:
>Description:
patch to allow v2.2.2 to build with postgresql 8.4, obtained from http://cvs.pgfoundry.org/cgi-bin/cvsweb.cgi/pgpool/pgpool-II/sql/pgpool-recovery/pgpool-recovery.c?r1=1.6&r2=1.6.2.1

tested on systems using postgresql v8.2 & v8.4
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN databases/pgpool-II.orig/Makefile databases/pgpool-II/Makefile
--- databases/pgpool-II.orig/Makefile	2009-07-23 17:34:54.000000000 +0000
+++ databases/pgpool-II/Makefile	2009-07-23 17:38:44.000000000 +0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	pgpool-II
 PORTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/2191/
 
diff -urN databases/pgpool-II.orig/files/patch-sql-pgpool-recovery_pgpool-recovery.c databases/pgpool-II/files/patch-sql-pgpool-recovery_pgpool-recovery.c
--- databases/pgpool-II.orig/files/patch-sql-pgpool-recovery_pgpool-recovery.c	1970-01-01 00:00:00.000000000 +0000
+++ databases/pgpool-II/files/patch-sql-pgpool-recovery_pgpool-recovery.c	2009-07-23 17:32:40.000000000 +0000
@@ -0,0 +1,10 @@
+--- /usr/ports/databases/pgpool-II/work/pgpool-II-2.2.2/sql/pgpool-recovery/pgpool-recovery.c.orig	2009-07-23 17:30:52.000000000 +0000
++++ /usr/ports/databases/pgpool-II/work/pgpool-II-2.2.2/sql/pgpool-recovery/pgpool-recovery.c	2009-07-23 17:31:34.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include "miscadmin.h"
+ #include "executor/spi.h"
+ #include "funcapi.h"
++#include "utils/builtins.h"	/* PostgreSQL 8.4 needs this for textout */
+ 
+ #define REMOTE_START_FILE "pgpool_remote_start"
+ 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kuriyama 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jul 23 18:00:17 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Venture37 <venture37@geeklan.co.uk>
To: bug-followup@FreeBSD.org, venture37@geeklan.co.uk
Cc:  
Subject: Re: ports/137039: patch to allow databases/pgpool-II build with postgresql
 8.4
Date: Sun, 26 Jul 2009 05:38:47 +0100

 This is a multi-part message in MIME format.
 --------------070400060109080003040808
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Sorry, correct diff attached
 
 --------------070400060109080003040808
 Content-Type: text/plain;
  name="patch-mk2.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="patch-mk2.txt"
 
 diff -urN databases/pgpool-II.orig/Makefile databases/pgpool-II/Makefile
 --- databases/pgpool-II.orig/Makefile	2009-07-25 12:59:37.000000000 +0100
 +++ databases/pgpool-II/Makefile	2009-07-25 13:01:11.000000000 +0100
 @@ -7,6 +7,7 @@
  
  PORTNAME=	pgpool-II
  PORTVERSION=	2.2.2
 +PORTREVISION=	1
  CATEGORIES=	databases
  MASTER_SITES=	http://pgfoundry.org/frs/download.php/2191/
  
 diff -urN databases/pgpool-II.orig/files/patch-sql-pgpool-recovery_pgpool-recovery.c databases/pgpool-II/files/patch-sql-pgpool-recovery_pgpool-recovery.c
 --- databases/pgpool-II.orig/files/patch-sql-pgpool-recovery_pgpool-recovery.c	1970-01-01 01:00:00.000000000 +0100
 +++ databases/pgpool-II/files/patch-sql-pgpool-recovery_pgpool-recovery.c	2009-07-25 12:53:57.000000000 +0100
 @@ -0,0 +1,10 @@
 +--- sql/pgpool-recovery/pgpool-recovery.c.orig     2009-07-23 17:30:52.000000000 +0000
 ++++ sql/pgpool-recovery/pgpool-recovery.c  2009-07-23 17:31:34.000000000 +0000
 +@@ -23,6 +23,7 @@
 + #include "miscadmin.h"
 + #include "executor/spi.h"
 + #include "funcapi.h"
 ++#include "utils/builtins.h"   /* PostgreSQL 8.4 needs this for textout */
 +
 + #define REMOTE_START_FILE "pgpool_remote_start"
 +
 
 --------------070400060109080003040808--
State-Changed-From-To: open->closed 
State-Changed-By: kuriyama 
State-Changed-When: Sun Aug 2 00:35:31 UTC 2009 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/137039: commit references a PR
Date: Sun,  2 Aug 2009 00:35:27 +0000 (UTC)

 kuriyama    2009-08-02 00:35:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/pgpool-II  Makefile 
   Added files:
     databases/pgpool-II/files patch-pgpool-recovery.c 
   Log:
   - Bandaid to build with PostgreSQL 8.4.
   
   PR:             ports/137039
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   
   Revision  Changes    Path
   1.20      +1 -0      ports/databases/pgpool-II/Makefile
   1.1       +10 -0     ports/databases/pgpool-II/files/patch-pgpool-recovery.c (new)
 _______________________________________________
 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"
 
>Unformatted:
