Import of pkgsrc-2014Q1

databases/postgresql92/Makefile

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

databases/postgresql92/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2013/04/04 21:08:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2014/03/27 20:57:54 adam Exp $
 #
 # used by databases/postgresql92-adminpack/Makefile
 # used by databases/postgresql92-client/Makefile
@@ -21,7 +21,7 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-DISTNAME=	postgresql-9.2.4
+DISTNAME=	postgresql-9.2.8
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -44,6 +44,7 @@ DISTINFO_FILE?=		${.CURDIR}/../../databases/postgresql92/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../../databases/postgresql92/files
 PATCHDIR?=		${.CURDIR}/../../databases/postgresql92/patches
 
+USE_GCC_RUNTIME=	yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		bison gmake lex msgfmt
 PKG_SYSCONFSUBDIR=	postgresql
@@ -52,6 +53,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
@@ -81,6 +83,11 @@ CONFIGURE_ARGS+=	--without-zlib
 CONFIGURE_ENV+=		ac_cv_header_sys_ucred_h=no
 .endif
 
+# 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/postgresql92/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2013/04/04 21:08:36 adam Exp $
+$NetBSD: distinfo,v 1.8 2014/03/27 20:57:54 adam Exp $
 
-SHA1 (postgresql-9.2.4.tar.bz2) = 75b53c884cb10ed9404747b51677358f12082152
-RMD160 (postgresql-9.2.4.tar.bz2) = 7d3f523e20e79651ca0dbfe2c8ee240da52cb404
-Size (postgresql-9.2.4.tar.bz2) = 16395184 bytes
+SHA1 (postgresql-9.2.8.tar.bz2) = 228cb1f1af47fd073d578eaad794e7ff6615812a
+RMD160 (postgresql-9.2.8.tar.bz2) = ac9fac285e6488f1b4635650e34e8eac49b5eddd
+Size (postgresql-9.2.8.tar.bz2) = 16263345 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747
@@ -13,6 +13,7 @@ SHA1 (patch-src_backend_Makefile) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 2b7448d6dd8550e2ea61f40728a2780068b93d07
 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
+SHA1 (patch-src_pl_plpython_Makefile) = d70e0cf5e20479851df3ededa50776fd04846d49
 SHA1 (patch-src_timezone_localtime.c) = 622f57bc1d10f07ab73f86765cbf587eece57085
 SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214
 SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64

databases/postgresql92/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2012/10/05 21:03:10 adam Exp $
+# $NetBSD: options.mk,v 1.3 2013/10/12 05:05:42 richard Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql92
 PKG_SUPPORTED_OPTIONS=	bonjour gssapi kerberos ldap pam xml dtrace
@@ -29,6 +29,16 @@ CONFIGURE_ARGS+=	--with-gssapi
 .if !empty(PKG_OPTIONS:Mkerberos)
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-krb5
+
+CHECK_BUILTIN.${KRB5_TYPE}:=	yes
+.include	"../../security/${KRB5_TYPE}/builtin.mk"
+CHECK_BUILTIN.${KRB5_TYPE}:=	no
+
+.	if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS]) && \
+		exists(${SH_KRB5_CONFIG})
+CFLAGS_KRB5!=	${SH_KRB5_CONFIG} --cflags
+CPPFLAGS+=	${CFLAGS_KRB5}
+.	endif
 .endif
 
 ###

databases/postgresql92/patches/patch-src_pl_plpython_Makefile

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_pl_plpython_Makefile,v 1.1 2013/12/10 22:32:57 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