Import of pkgsrc-2015Q1

databases/postgresql84/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/02/23 11:25:50 adam Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/25 22:14:55 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-/}
 COMMENT=	Robust, next generation, object-relational DBMS

databases/postgresql84/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2014/03/27 20:57:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.34 2015/03/17 13:46:24 jperkin Exp $
 #
 # used by databases/postgresql84-adminpack/Makefile
 # used by databases/postgresql84-client/Makefile
@@ -17,7 +17,7 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-DISTNAME=	postgresql-8.4.21
+DISTNAME=	postgresql-8.4.22
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -37,9 +37,9 @@ CONFLICTS+=	postgresql8[0-35-9]-${module}-[0-9]*
 CONFLICTS+=	postgresql9[0-9]-${module}-[0-9]*
 .endif
 
-DISTINFO_FILE?=		${.CURDIR}/../postgresql84/distinfo
-COMMON_FILESDIR?=	${.CURDIR}/../postgresql84/files
-PATCHDIR?=		${.CURDIR}/../postgresql84/patches
+DISTINFO_FILE?=		${.CURDIR}/../../databases/postgresql84/distinfo
+COMMON_FILESDIR?=	${.CURDIR}/../../databases/postgresql84/files
+PATCHDIR?=		${.CURDIR}/../../databases/postgresql84/patches
 
 USE_GCC_RUNTIME=	yes
 USE_PKGLOCALEDIR=	yes

databases/postgresql84/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.29 2014/03/27 20:57:54 adam Exp $
+$NetBSD: distinfo,v 1.31 2015/01/23 15:06:00 joerg Exp $
 
-SHA1 (postgresql-8.4.21.tar.bz2) = 2669ace05665cf3f7234fdfd8c3e8bf225cbd4af
-RMD160 (postgresql-8.4.21.tar.bz2) = 5bb580b8b8aa20c463c99c3e699c3bc87e4eecc8
-Size (postgresql-8.4.21.tar.bz2) = 14645050 bytes
+SHA1 (postgresql-8.4.22.tar.bz2) = 66a1286c4983121af35b76c97b97288013edc151
+RMD160 (postgresql-8.4.22.tar.bz2) = c46d1fd3405150f0ed25012dad1ef8110d2c2d64
+Size (postgresql-8.4.22.tar.bz2) = 14651732 bytes
 SHA1 (patch-aa) = 72437773d67939c8d8c8e9a99caf430590fd726f
 SHA1 (patch-ab) = aa46d88c8a72edaf95880de48474ea484d6d2bf5
 SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb
@@ -14,6 +14,7 @@ SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
 SHA1 (patch-ao) = b098032408fc951865966710554667a249db6320
 SHA1 (patch-ba) = f8de4ee18a433b65a54280d047d18b161d3e9ca8
 SHA1 (patch-bb) = 22859530d2694cf4c347f5e4c02eff0483d536d1
+SHA1 (patch-src_backend_utils_adt_datetime.c) = a23fb1bf4c05faf818853643fcd851a9f796e13a
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 39d256ee9a429986ea4dc8b9eefff420a37d119c
 SHA1 (patch-src_pl_plperl_plperl.h) = 8d448cc8e0e0dbc4d15dad369d3ca7a796874ac2
 SHA1 (patch-src_pl_plpgsql_src_Makefile) = 1592ecb85d6ef1bd691f77b320f639b6fc822e14
-SHA1 (patch-src_pl_plpython_Makefile) = d70e0cf5e20479851df3ededa50776fd04846d49

databases/postgresql84/patches/patch-src_backend_utils_adt_datetime.c

@@ -0,0 +1,14 @@
+$NetBSD: patch-src_backend_utils_adt_datetime.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/backend/utils/adt/datetime.c.orig	2014-07-21 19:18:03.000000000 +0000
++++ src/backend/utils/adt/datetime.c
+@@ -29,6 +29,9 @@
+ #include "utils/memutils.h"
+ #include "utils/tzparser.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
+ 
+ static int DecodeNumber(int flen, char *field, bool haveTextMonth,
+ 			 int fmask, int *tmask,

databases/postgresql84/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-07-21 19:18:03.000000000 +0000
++++ src/interfaces/ecpg/pgtypeslib/interval.c
+@@ -14,6 +14,10 @@
+ #include "pgtypes_error.h"
+ #include "pgtypes_interval.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
++
+ /* copy&pasted from .../src/backend/utils/adt/datetime.c */
+ static int
+ strtoi(const char *nptr, char **endptr, int base)

databases/postgresql84/patches/patch-src_pl_plpython_Makefile

@@ -1,15 +0,0 @@
-$NetBSD: patch-src_pl_plpython_Makefile,v 1.1 2013/12/10 22:32:56 adam Exp $
-
-Don't try to use Python framework.
-
---- src/pl/plpython/Makefile.orig	2013-12-10 21:48:07.000000000 +0000
-+++ src/pl/plpython/Makefile
-@@ -24,8 +24,6 @@ endif
- # Darwin (OS X) has its own ideas about how to do this.
- ifeq ($(PORTNAME), darwin)
- shared_libpython = yes
--override python_libspec = -framework Python
--override python_additional_libs =
- endif
- 
- # If we don't have a shared library and the platform doesn't allow it