From b87d91953b580215802af967a245bcfdcb82bb24 Mon Sep 17 00:00:00 2001
From: gdt <gdt>
Date: Wed, 13 Mar 2013 23:30:42 +0000
Subject: Update to 0.45.

Add a patch from upstream to avoid segfaulting on null PQ options.

- 0.45 | 2013-03-10

  - support for "make installcheck"

	This does "make check" at its core, so the same env vars apply.
	Obviously, you should do "make install" first for sane results.

  - bootstrap tools upgraded
    - GNU Autoconf 2.69
    - GNU Automake 1.13.1
    - Guile-BAUX 20121120.1242.e233fad
    - SNUGGLE 0.2
    - GNU Texinfo 5.0
---
 databases/guile-pg/Makefile                  |  4 ++--
 databases/guile-pg/distinfo                  |  9 +++++----
 databases/guile-pg/patches/patch-src_libpq.c | 21 +++++++++++++++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 databases/guile-pg/patches/patch-src_libpq.c

(limited to 'databases/guile-pg')

diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index 10481adbd57..f030a94a3fe 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2012/11/07 13:45:35 gdt Exp $
+# $NetBSD: Makefile,v 1.46 2013/03/13 23:30:42 gdt Exp $
 #
 
-DISTNAME=	guile-pg-0.44
+DISTNAME=	guile-pg-0.45
 CATEGORIES=	databases
 MASTER_SITES=	http://download.savannah.nongnu.org/releases/guile-pg/
 EXTRACT_SUFX=	.tar.xz
diff --git a/databases/guile-pg/distinfo b/databases/guile-pg/distinfo
index 7592f7e3f25..7ebe30f4a5f 100644
--- a/databases/guile-pg/distinfo
+++ b/databases/guile-pg/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2012/11/07 13:45:35 gdt Exp $
+$NetBSD: distinfo,v 1.12 2013/03/13 23:30:42 gdt Exp $
 
-SHA1 (guile-pg-0.44.tar.xz) = a6b48b9dd46fea3994a038107a256fafb1f828e1
-RMD160 (guile-pg-0.44.tar.xz) = a712467aa5a23e8dc9a9025b0ba4f33b4bb7b206
-Size (guile-pg-0.44.tar.xz) = 504316 bytes
+SHA1 (guile-pg-0.45.tar.xz) = 40f885d25fb8364fb038b5b83fd3d7f2a0582df8
+RMD160 (guile-pg-0.45.tar.xz) = ef7d82b8847cbac042836daecfd0fd2df198e60f
+Size (guile-pg-0.45.tar.xz) = 514144 bytes
+SHA1 (patch-src_libpq.c) = 078666d3cc7788a278d7455a700b81fbd8973b2c
diff --git a/databases/guile-pg/patches/patch-src_libpq.c b/databases/guile-pg/patches/patch-src_libpq.c
new file mode 100644
index 00000000000..79d97e6c050
--- /dev/null
+++ b/databases/guile-pg/patches/patch-src_libpq.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_libpq.c,v 1.1 2013/03/13 23:30:42 gdt Exp $
+
+Patch from upstream author to address segfault when a member of
+PQconndefaults() does not have an envvar.  Expected in next upstream
+release.
+
+--- src/libpq.c.orig	2012-04-29 11:50:08.000000000 +0000
++++ src/libpq.c
+@@ -1174,11 +1174,11 @@ presenting this option in the first plac
+   for (head = opt = PQconndefaults (); opt && opt->keyword; opt++)
+     rv = CONS
+       (PCHAIN (scm_c_make_keyword (opt->keyword),
+-               PAIRX (envvar,   STRING (opt->envvar)),
++               PAIRM (envvar,   STRING (opt->envvar)),
+                PAIRM (compiled, STRING (opt->compiled)),
+                PAIRM (val,      STRING (opt->val)),
+                PAIRM (label,    STRING (opt->label)),
+                PAIRM (dispchar, CHARACTER (opt->dispchar[0])),
+                PAIRX (dispsize, NUM_INT (opt->dispsize))),
+        rv);
+ 
-- 
cgit v1.2.3