Import of pkgsrc-2014Q1

databases/postgresql84/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2013/05/31 12:39:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/23 11:25:50 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql84-client>=${PKGVERSION_NOREV}:../../databases/postgresql84-client

databases/postgresql84/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2013/04/04 21:08:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.32 2014/03/27 20:57:54 adam 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.17
+DISTNAME=	postgresql-8.4.21
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -41,6 +41,7 @@ DISTINFO_FILE?=		${.CURDIR}/../postgresql84/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../postgresql84/files
 PATCHDIR?=		${.CURDIR}/../postgresql84/patches
 
+USE_GCC_RUNTIME=	yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		bison gmake lex msgfmt
 PKG_SYSCONFSUBDIR=	postgresql
@@ -49,6 +50,7 @@ PKG_SYSCONFSUBDIR=	postgresql
 
 PG_TEMPLATE.SunOS=	solaris
 PG_TEMPLATE.IRIX=	irix5
+PG_TEMPLATE.MirBSD=	openbsd
 .if !defined(PG_TEMPLATE.${OPSYS})
 PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
@@ -66,6 +68,11 @@ CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-tcl
 CONFIGURE_ARGS+=	--without-zlib
 
+# configure fails on OpenBSD and MirBSD if thread safety is enabled.
+.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
+CONFIGURE_ARGS+=	--disable-thread-safety
+.endif
+
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
 # of 2 up to 32768, and the default size is 8196.  Please don't change

databases/postgresql84/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2013/04/04 21:08:32 adam Exp $
+$NetBSD: distinfo,v 1.29 2014/03/27 20:57:54 adam Exp $
 
-SHA1 (postgresql-8.4.17.tar.bz2) = 1c8760ad7048f6e62ac8c822fee653117f5beb57
-RMD160 (postgresql-8.4.17.tar.bz2) = 122acee594551be5e42f208dfde522a0ad1ce17d
-Size (postgresql-8.4.17.tar.bz2) = 14795028 bytes
+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 (patch-aa) = 72437773d67939c8d8c8e9a99caf430590fd726f
 SHA1 (patch-ab) = aa46d88c8a72edaf95880de48474ea484d6d2bf5
 SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb
@@ -16,3 +16,4 @@ SHA1 (patch-ba) = f8de4ee18a433b65a54280d047d18b161d3e9ca8
 SHA1 (patch-bb) = 22859530d2694cf4c347f5e4c02eff0483d536d1
 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_pl_plpython_Makefile

@@ -0,0 +1,15 @@
+$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