Import of pkgsrc-2016Q3

databases/postgresql91/Makefile

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

databases/postgresql91/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2015/06/18 14:46:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.34 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/postgresql91-adminpack/Makefile
 # used by databases/postgresql91-client/Makefile
-# used by databases/postgresql91-datatypes/Makefile
-# used by databases/postgresql91-dblink/Makefile
+# used by databases/postgresql91-contrib/Makefile
 # used by databases/postgresql91-docs/Makefile
-# used by databases/postgresql91-fuzzystrmatch/Makefile
-# used by databases/postgresql91-monitoring/Makefile
-# used by databases/postgresql91-pgcrypto/Makefile
 # used by databases/postgresql91-plperl/Makefile
 # used by databases/postgresql91-plpython/Makefile
 # used by databases/postgresql91-pltcl/Makefile
-# used by databases/postgresql91-replicationtools/Makefile
 # used by databases/postgresql91-server/Makefile
-# used by databases/postgresql91-upgrade/Makefile
 
-DISTNAME=	postgresql-9.1.18
+DISTNAME=	postgresql-9.1.23
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -81,14 +74,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/postgresql91/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.24 2015/06/18 14:46:14 adam Exp $
+$NetBSD: distinfo,v 1.30 2016/08/23 06:28:15 adam Exp $
 
-SHA1 (postgresql-9.1.18.tar.bz2) = f17aa02514bb1a079179e9ca555ac0c19e21c14c
-RMD160 (postgresql-9.1.18.tar.bz2) = 4c1b75903149a47e18995a5fe9f87c14bf0e22dc
-Size (postgresql-9.1.18.tar.bz2) = 15822081 bytes
+SHA1 (postgresql-9.1.23.tar.bz2) = 9b3c51c4b40d69e6d84c1a0ac464828b559f7362
+RMD160 (postgresql-9.1.23.tar.bz2) = 5ec47504950f42d7f6fa07059e5e5daa7caef1c3
+SHA512 (postgresql-9.1.23.tar.bz2) = 192f48ed8db510663c85c217afee8eff732d467fe10f600c9be834371ccb6a788acd380c582d80f0096a0b7d7ee0daa378d1fb8177281bf4e6e2fcc39fffdc67
+Size (postgresql-9.1.23.tar.bz2) = 15856178 bytes
 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-configure) = dab79533dac06a79a5aa8439d6b15830d8d2fba7
 SHA1 (patch-contrib_dblink_Makefile) = 4960ad57d42465fae203870548e4c53f8a32ce04
@@ -10,11 +11,7 @@ SHA1 (patch-contrib_dblink_dblink.c) = 4d7c40d107d4c13c63ef2908d9a02be319863657
 SHA1 (patch-src_Makefile.shlib) = 2370e3c4260ba7f947b0c15b9bdc43e4820e01a4
 SHA1 (patch-src_backend_Makefile) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5
 SHA1 (patch-src_backend_utils_adt_datetime.c) = 9d3c6c23b5af92c17ea643ed986b5648f3381cb4
-SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = b9c340552b0a0838229cffdada2efad12ba51d56
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 1d3760f2d170837a395cfacffaa08373ea54ba53
 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_timezone_localtime.c) = a73769cf05223d2ee06249c9e69c85038c2cd936
-SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214
-SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64
-SHA1 (patch-src_timezone_zic.c) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc

databases/postgresql91/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/23 15:06:01 joerg 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:14:13.000000000 +0000
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2016-05-23 13:15:10.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/23 15:06:
 +
  /* 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/postgresql91/patches/patch-src_timezone_localtime.c

@@ -1,31 +0,0 @@
-$NetBSD: patch-src_timezone_localtime.c,v 1.1.1.1 2011/09/15 08:27:39 adam Exp $
-
---- src/timezone/localtime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/localtime.c
-@@ -80,20 +80,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/postgresql91/patches/patch-src_timezone_private.h

@@ -1,15 +0,0 @@
-$NetBSD: patch-src_timezone_private.h,v 1.1.1.1 2011/09/15 08:27:39 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/postgresql91/patches/patch-src_timezone_strftime.c

@@ -1,13 +0,0 @@
-$NetBSD: patch-src_timezone_strftime.c,v 1.1.1.1 2011/09/15 08:27:39 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/postgresql91/patches/patch-src_timezone_zic.c

@@ -1,78 +0,0 @@
-$NetBSD: patch-src_timezone_zic.c,v 1.1.1.1 2011/09/15 08:27:39 adam Exp $
-
---- src/timezone/zic.c.orig	2010-03-16 07:17:04.000000000 +0000
-+++ src/timezone/zic.c
-@@ -120,51 +120,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;