Update postgresql94 & related to PostGreSQL 9.4.9

4 files changed, 14 insertions, 125 deletions

diff --git a/databases/postgresql94/patches/patch-src_timezone_localtime.c b/databases/postgresql94/patches/patch-src_timezone_localtime.c
index fc627cd9d2d..05e08e875d7 100644
--- a/databases/postgresql94/patches/patch-src_timezone_localtime.c
+++ b/databases/postgresql94/patches/patch-src_timezone_localtime.c
@@ -1,31 +1,13 @@
-$NetBSD: patch-src_timezone_localtime.c,v 1.1 2015/01/14 21:01:18 adam Exp $
+$NetBSD: patch-src_timezone_localtime.c,v 1.2 2016/08/14 16:56:29 is Exp $
 
---- src/timezone/localtime.c.orig	2009-06-11 16:49:15.000000000 +0200
+--- src/timezone/localtime.c.orig	2016-08-08 20:29:39.000000000 +0000
 +++ 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);
+@@ -84,7 +84,7 @@ struct rule
+  * Prototypes for static functions.
+  */
  
- /* GMT timezone */
+-static struct pg_tm *gmtsub(pg_time_t const *, int32, struct pg_tm *);
++static struct pg_tm *gmtsub(pg_time_t const *, const int32, struct pg_tm *);
+ static bool increment_overflow(int *, int);
+ static bool increment_overflow_time(pg_time_t *, int32);
+ static struct pg_tm *timesub(pg_time_t const *, int32, struct state const *,
diff --git a/databases/postgresql94/patches/patch-src_timezone_private.h b/databases/postgresql94/patches/patch-src_timezone_private.h
deleted file mode 100644
index 0bccc131f20..00000000000
--- a/databases/postgresql94/patches/patch-src_timezone_private.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_timezone_private.h,v 1.1 2015/01/14 21:01:18 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);
diff --git a/databases/postgresql94/patches/patch-src_timezone_strftime.c b/databases/postgresql94/patches/patch-src_timezone_strftime.c
index 2cb1a503ac1..e121af05701 100644
--- a/databases/postgresql94/patches/patch-src_timezone_strftime.c
+++ b/databases/postgresql94/patches/patch-src_timezone_strftime.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_timezone_strftime.c,v 1.1 2015/01/14 21:01:18 adam Exp $
+$NetBSD: patch-src_timezone_strftime.c,v 1.2 2016/08/14 16:56:29 is Exp $
 
---- src/timezone/strftime.c.orig	2009-06-11 16:49:15.000000000 +0200
+--- src/timezone/strftime.c.orig	2016-08-08 20:29:39.000000000 +0000
 +++ src/timezone/strftime.c
-@@ -89,7 +89,7 @@ static const struct lc_time_T C_time_loc
+@@ -109,7 +109,7 @@ static const struct lc_time_T C_time_loc
  };
  
  static char *_add(const char *, char *, const char *);
@@ -10,4 +10,4 @@ $NetBSD: patch-src_timezone_strftime.c,v 1.1 2015/01/14 21:01:18 adam Exp $
 +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,
+ static char *_yconv(int, int, bool, bool, char *, const char *);
diff --git a/databases/postgresql94/patches/patch-src_timezone_zic.c b/databases/postgresql94/patches/patch-src_timezone_zic.c
deleted file mode 100644
index 1f6af7f4c09..00000000000
--- a/databases/postgresql94/patches/patch-src_timezone_zic.c
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-src_timezone_zic.c,v 1.1 2015/01/14 21:01:18 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;