Import of pkgsrc-2016Q3

databases/postgresql93/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/06/12 10:48:45 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/23 06:28:15 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/93-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql93-client>=${PKGVERSION_NOREV}:../../databases/postgresql93-client

databases/postgresql93/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2015/06/18 14:46:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2016/08/23 06:28:15 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -8,22 +8,15 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 #
-# used by databases/postgresql93-adminpack/Makefile
 # used by databases/postgresql93-client/Makefile
-# used by databases/postgresql93-datatypes/Makefile
-# used by databases/postgresql93-dblink/Makefile
+# used by databases/postgresql93-contrib/Makefile
 # used by databases/postgresql93-docs/Makefile
-# used by databases/postgresql93-fuzzystrmatch/Makefile
-# used by databases/postgresql93-monitoring/Makefile
-# used by databases/postgresql93-pgcrypto/Makefile
 # used by databases/postgresql93-plperl/Makefile
 # used by databases/postgresql93-plpython/Makefile
 # used by databases/postgresql93-pltcl/Makefile
-# used by databases/postgresql93-replicationtools/Makefile
 # used by databases/postgresql93-server/Makefile
-# used by databases/postgresql93-upgrade/Makefile
 
-DISTNAME=	postgresql-9.3.9
+DISTNAME=	postgresql-9.3.14
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -80,14 +73,11 @@ CONFIGURE_ARGS+=	--without-zlib
 
 # sys/ucred.h shouldn't be included on Solaris, causes conflicts between
 # procfs and largefile.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_header_sys_ucred_h=no
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_header_sys_ucred_h=no
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
-CONFIGURE_ARGS+=	--disable-thread-safety
-.endif
+CONFIGURE_ARGS.MirBSD+=		--disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=	--disable-thread-safety
 
 # 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

databases/postgresql93/distinfo

@@ -1,23 +1,21 @@
-$NetBSD: distinfo,v 1.13 2015/06/18 14:46:14 adam Exp $
+$NetBSD: distinfo,v 1.20 2016/08/23 06:28:15 adam Exp $
 
-SHA1 (postgresql-9.3.9.tar.bz2) = 0a1ea210e12bc07ac8c528c8997b90bd5d41df6e
-RMD160 (postgresql-9.3.9.tar.bz2) = 0acc47c393b10b41d2bd98465d33335d6459c05b
-Size (postgresql-9.3.9.tar.bz2) = 16959310 bytes
+SHA1 (postgresql-9.3.14.tar.bz2) = a07cc4d1fd0fdd5ced85b75d821e1eec8eb9cb55
+RMD160 (postgresql-9.3.14.tar.bz2) = e7b6899874901d27f227524039c63823b0d23924
+SHA512 (postgresql-9.3.14.tar.bz2) = 97bd92ffdd661f7428c47a8bc87fde88a2b150e7d08bd577a7159ac65aec319d358495b883b95dff2069d24a8d15d1e7c10c3fae81fc76186bfef0127f257ac4
+Size (postgresql-9.3.14.tar.bz2) = 17042199 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9
 SHA1 (patch-contrib_dblink_Makefile) = 11620938ce93109311df90df675b1ad6f0c15212
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_postgres__fdw_Makefile) = 07feda488e3acb71405b04d0d745c9920456b32b
 SHA1 (patch-src_Makefile.global.in) = 53e29e000d7fb71e2625aacd32324e9d7001b5b2
 SHA1 (patch-src_Makefile.shlib) = 69f980184fd8dbd821221a1c6ac3a88408f2c4cf
 SHA1 (patch-src_backend_Makefile) = deba6bc07ba2e4b8ef8f04f20efb2bdd54cb917e
 SHA1 (patch-src_backend_utils_adt_datetime.c) = cb404b369b39f7e55765a490f8448b870f237511
-SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 606aeea232784ae07f4051ff93b6e352da2178b7
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 98a49b9fc6677c4c930b574249f015727391938c
 SHA1 (patch-src_interfaces_libpq_Makefile) = 0066301bc8b31b9e26c79153427537bc3865ef4d
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
-SHA1 (patch-src_timezone_localtime.c) = 622f57bc1d10f07ab73f86765cbf587eece57085
-SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214
-SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64
-SHA1 (patch-src_timezone_zic.c) = ed04d781845239ce5dc7c6fca406ce62c10a9605

databases/postgresql93/patches/patch-contrib_postgres__fdw_Makefile

@@ -0,0 +1,22 @@
+$NetBSD: patch-contrib_postgres__fdw_Makefile,v 1.1 2016/06/19 20:40:10 fhajny Exp $
+
+Backport PGXS build fix from newer branches.
+
+--- contrib/postgres_fdw/Makefile.orig	2016-05-09 20:53:56.000000000 +0000
++++ contrib/postgres_fdw/Makefile
+@@ -5,7 +5,6 @@ OBJS = postgres_fdw.o option.o deparse.o
+ 
+ PG_CPPFLAGS = -I$(libpq_srcdir)
+ SHLIB_LINK = $(libpq)
+-SHLIB_PREREQS = submake-libpq
+ 
+ EXTENSION = postgres_fdw
+ DATA = postgres_fdw--1.0.sql
+@@ -20,6 +19,7 @@ PG_CONFIG = pg_config
+ PGXS := $(shell $(PG_CONFIG) --pgxs)
+ include $(PGXS)
+ else
++SHLIB_PREREQS = submake-libpq
+ subdir = contrib/postgres_fdw
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global

databases/postgresql93/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c

@@ -1,6 +1,6 @@
-$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/20 13:16:02 ryoon Exp $
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.2 2016/05/23 14:27:34 adam Exp $
 
---- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-07-21 19:10:42.000000000 +0000
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2016-05-23 11:09:27.000000000 +0000
 +++ src/interfaces/ecpg/pgtypeslib/interval.c
 @@ -14,6 +14,10 @@
  #include "pgtypes_error.h"
@@ -12,4 +12,4 @@ $NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/20 13:16:
 +
  /* copy&pasted from .../src/backend/utils/adt/datetime.c */
  static int
- strtoi(const char *nptr, char **endptr, int base)
+ strtoint(const char *nptr, char **endptr, int base)

databases/postgresql93/patches/patch-src_timezone_localtime.c

@@ -1,31 +0,0 @@
-$NetBSD: patch-src_timezone_localtime.c,v 1.1 2013/09/10 15:32:32 adam Exp $
-
---- src/timezone/localtime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/localtime.c
-@@ -81,20 +81,20 @@ static pg_time_t detzcode64(const char *
- static int	differ_by_repeat(pg_time_t t1, pg_time_t t0);
- static const char *getzname(const char *strp);
- static const char *getqzname(const char *strp, int delim);
--static const char *getnum(const char *strp, int *nump, int min, int max);
-+static const char *getnum(const char *strp, int *nump, const int min, const int max);
- static const char *getsecs(const char *strp, long *secsp);
- static const char *getoffset(const char *strp, long *offsetp);
- static const char *getrule(const char *strp, struct rule * rulep);
- static void gmtload(struct state * sp);
--static struct pg_tm *gmtsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *gmtsub(const pg_time_t *timep, const long offset,
- 	   struct pg_tm * tmp);
--static struct pg_tm *localsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *localsub(const pg_time_t *timep, const long offset,
- 		 struct pg_tm * tmp, const pg_tz *tz);
- static int	increment_overflow(int *number, int delta);
--static pg_time_t transtime(pg_time_t janfirst, int year,
--		  const struct rule * rulep, long offset);
-+static pg_time_t transtime(pg_time_t janfirst, const int year,
-+		  const struct rule * rulep, const long offset);
- static int	typesequiv(const struct state * sp, int a, int b);
--static struct pg_tm *timesub(const pg_time_t *timep, long offset,
-+static struct pg_tm *timesub(const pg_time_t *timep, const long offset,
- 		const struct state * sp, struct pg_tm * tmp);
- 
- /* GMT timezone */

databases/postgresql93/patches/patch-src_timezone_private.h

@@ -1,15 +0,0 @@
-$NetBSD: patch-src_timezone_private.h,v 1.1 2013/09/10 15:32:32 adam Exp $
-
---- src/timezone/private.h.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/private.h
-@@ -51,8 +51,8 @@ extern int	unlink(const char *filename);
- extern char *icalloc(int nelem, int elsize);
- extern char *icatalloc(char *old, const char *new);
- extern char *icpyalloc(const char *string);
--extern char *imalloc(int n);
--extern void *irealloc(void *pointer, int size);
-+extern char *imalloc(const int n);
-+extern void *irealloc(void *pointer, const int size);
- extern void icfree(char *pointer);
- extern void ifree(char *pointer);
- extern const char *scheck(const char *string, const char *format);

databases/postgresql93/patches/patch-src_timezone_strftime.c

@@ -1,13 +0,0 @@
-$NetBSD: patch-src_timezone_strftime.c,v 1.1 2013/09/10 15:32:32 adam Exp $
-
---- src/timezone/strftime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/strftime.c
-@@ -89,7 +89,7 @@ static const struct lc_time_T C_time_loc
- };
- 
- static char *_add(const char *, char *, const char *);
--static char *_conv(int, const char *, char *, const char *);
-+static char *_conv(const int, const char *, char *, const char *);
- static char *_fmt(const char *, const struct pg_tm *, char *,
- 	 const char *, int *);
- static char *_yconv(const int, const int, const int, const int,

databases/postgresql93/patches/patch-src_timezone_zic.c

@@ -1,78 +0,0 @@
-$NetBSD: patch-src_timezone_zic.c,v 1.1 2013/09/10 15:32:32 adam Exp $
-
---- src/timezone/zic.c.orig	2010-03-16 07:17:04.000000000 +0000
-+++ src/timezone/zic.c
-@@ -121,51 +121,51 @@ struct zone
- 
- extern int	link(const char *fromname, const char *toname);
- static void addtt(const pg_time_t starttime, int type);
--static int addtype(long gmtoff, const char *abbr, int isdst,
--		int ttisstd, int ttisgmt);
--static void leapadd(const pg_time_t t, int positive, int rolling, int count);
-+static int addtype(const long gmtoff, const char *abbr, const int isdst,
-+		const int ttisstd, const int ttisgmt);
-+static void leapadd(const pg_time_t t, const int positive, const int rolling, int count);
- static void adjleap(void);
- static void associate(void);
- static int	ciequal(const char *ap, const char *bp);
--static void convert(long val, char *buf);
-+static void convert(const long val, char *buf);
- static void dolink(const char *fromfile, const char *tofile);
- static void doabbr(char *abbr, const char *format,
--	   const char *letters, int isdst, int doquotes);
--static void eat(const char *name, int num);
--static void eats(const char *name, int num,
--	 const char *rname, int rnum);
--static long eitol(int i);
-+	   const char *letters, const int isdst, int doquotes);
-+static void eat(const char *name, const int num);
-+static void eats(const char *name, const int num,
-+	 const char *rname, const int rnum);
-+static long eitol(const int i);
- static void error(const char *message);
- static char **getfields(char *buf);
- static long gethms(const char *string, const char *errstrng,
--	   int signable);
-+	   const int signable);
- static void infile(const char *filename);
--static void inleap(char **fields, int nfields);
--static void inlink(char **fields, int nfields);
--static void inrule(char **fields, int nfields);
--static int	inzcont(char **fields, int nfields);
--static int	inzone(char **fields, int nfields);
--static int	inzsub(char **fields, int nfields, int iscont);
-+static void inleap(char **fields, const int nfields);
-+static void inlink(char **fields, const int nfields);
-+static void inrule(char **fields, const int nfields);
-+static int	inzcont(char **fields, const int nfields);
-+static int	inzone(char **fields, const int nfields);
-+static int	inzsub(char **fields, const int nfields, const int iscont);
- static int	itsabbr(const char *abbr, const char *word);
- static int	itsdir(const char *name);
- static int	lowerit(int c);
- static char *memcheck(char *tocheck);
- static int	mkdirs(char *filename);
- static void newabbr(const char *abbr);
--static long oadd(long t1, long t2);
--static void outzone(const struct zone * zp, int ntzones);
--static void puttzcode(long code, FILE *fp);
-+static long oadd(const long t1, const long t2);
-+static void outzone(const struct zone * zp, const int ntzones);
-+static void puttzcode(const long code, FILE *fp);
- static int	rcomp(const void *leftp, const void *rightp);
--static pg_time_t rpytime(const struct rule * rp, int wantedy);
-+static pg_time_t rpytime(const struct rule * rp, const int wantedy);
- static void rulesub(struct rule * rp,
- 		const char *loyearp, const char *hiyearp,
- 		const char *typep, const char *monthp,
- 		const char *dayp, const char *timep);
- static void setboundaries(void);
--static pg_time_t tadd(const pg_time_t t1, long t2);
-+static pg_time_t tadd(const pg_time_t t1, const long t2);
- static void usage(FILE *stream, int status);
- static void writezone(const char *name, const char *string);
--static int	yearistype(int year, const char *type);
-+static int	yearistype(const int year, const char *type);
- 
- static int	charcnt;
- static int	errors;