Import of pkgsrc-2013Q2

2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
--- a/databases/postgresql84/patches/patch-aa
+++ b/databases/postgresql84/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.2 2011/09/27 11:04:30 adam Exp $
+
+--- config/perl.m4.orig	2011-09-22 22:03:52.000000000 +0000
+++ config/perl.m4
+@@ -32,9 +32,7 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
+ AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS],
+ [AC_REQUIRE([PGAC_PATH_PERL])
+ AC_MSG_CHECKING(for flags to link embedded Perl)
+-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+ AC_SUBST(perl_embed_ldflags)dnl
+ if test -z "$perl_embed_ldflags" ; then
+ 	AC_MSG_RESULT(no)
--- a/databases/postgresql84/patches/patch-ab
+++ b/databases/postgresql84/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.3 2011/09/27 11:04:30 adam Exp $
+
+--- configure.orig	2011-09-22 22:03:52.000000000 +0000
+++ configure
+@@ -2053,6 +2053,7 @@ case $host_os in
+   darwin*) template=darwin ;;
+     dgux*) template=dgux ;;
+  freebsd*) template=freebsd ;;
+ dragonfly*) template=dragonfly ;;
+     hpux*) template=hpux ;;
+     irix*) template=irix ;;
+  linux*|gnu*|k*bsd*-gnu)
+@@ -6806,9 +6807,7 @@ echo "${ECHO_T}$perl_useshrplib" >&6; }
+ 
+ { echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5
+ echo $ECHO_N "checking for flags to link embedded Perl... $ECHO_C" >&6; }
+-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
+perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+ if test -z "$perl_embed_ldflags" ; then
+ 	{ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
--- a/databases/postgresql84/patches/patch-ac
+++ b/databases/postgresql84/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1.1.1 2009/07/29 06:26:18 adam Exp $
+
+--- src/backend/Makefile.orig	2009-01-01 18:23:34.000000000 +0100
+++ src/backend/Makefile
+@@ -14,6 +14,10 @@ subdir = src/backend
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+CFLAGS+= $(DL_CFLAGS)
+LDFLAGS+= $(DL_LDFLAGS)
+LIBS+= $(DL_LIBS)
+
+ SUBDIRS = access bootstrap catalog parser commands executor foreign lib libpq \
+ 	main nodes optimizer port postmaster regex rewrite \
+ 	storage tcop tsearch utils $(top_builddir)/src/timezone
--- a/databases/postgresql84/patches/patch-ad
+++ b/databases/postgresql84/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.3 2010/05/20 12:36:39 adam Exp $
+
+--- src/pl/plperl/GNUmakefile.orig	2010-05-20 07:51:50.000000000 +0000
+++ src/pl/plperl/GNUmakefile
+@@ -53,9 +53,7 @@ PSQLDIR = $(bindir)
+ include $(top_srcdir)/src/Makefile.shlib
+ 
+ 
+-all: all-lib
+-
+-plperl.o: plperl_opmask.h
+all: plperl_opmask.h all-lib
+ 
+ plperl_opmask.h: plperl_opmask.pl
+ 	$(PERL) $< $@
--- a/databases/postgresql84/patches/patch-af
+++ b/databases/postgresql84/patches/patch-af
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.1.1.1 2009/07/29 06:26:19 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 */
--- a/databases/postgresql84/patches/patch-ag
+++ b/databases/postgresql84/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1.1.1 2009/07/29 06:26:19 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);
--- a/databases/postgresql84/patches/patch-ah
+++ b/databases/postgresql84/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2009/07/29 06:26:19 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,
--- a/databases/postgresql84/patches/patch-ai
+++ b/databases/postgresql84/patches/patch-ai
@@ -0,0 +1,78 @@
+$NetBSD: patch-ai,v 1.2 2010/04/12 09:58: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;
--- a/databases/postgresql84/patches/patch-ao
+++ b/databases/postgresql84/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.3 2011/09/27 11:04:30 adam Exp $
+
+--- contrib/dblink/dblink.c.orig	2010-08-01 14:56:33.000000000 +0200
+++ contrib/dblink/dblink.c	2010-08-01 14:56:47.000000000 +0200
+@@ -59,7 +59,7 @@
+ #include "utils/array.h"
+ #include "utils/builtins.h"
+ #include "utils/dynahash.h"
+-#include "utils/fmgroids.h"
+#include "postgresql/server/utils/fmgroids.h"
+ #include "utils/hsearch.h"
+ #include "utils/lsyscache.h"
+ #include "utils/memutils.h"
--- a/databases/postgresql84/patches/patch-ba
+++ b/databases/postgresql84/patches/patch-ba
@@ -0,0 +1,31 @@
+$NetBSD: patch-ba,v 1.2 2012/07/16 21:17:11 asau Exp $
+
+--- src/Makefile.shlib.orig	2012-05-31 23:11:47.000000000 +0000
+++ src/Makefile.shlib
+@@ -175,19 +175,20 @@ ifeq ($(PORTNAME), bsdi)
+   endif
+ endif
+ 
+ifeq ($(PORTNAME), dragonfly)
+  LINK.shared		= $(COMPILER) -shared
+  ifdef soname
+    LINK.shared		+= -Wl,-x,-soname,$(soname)
+  endif
+endif
+
+ ifeq ($(PORTNAME), freebsd)
+   ifdef ELF_SYSTEM
+-    ifdef SO_MAJOR_VERSION
+-      shlib		= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+-    endif
+     LINK.shared		= $(COMPILER) -shared
+     ifdef soname
+       LINK.shared	+= -Wl,-x,-soname,$(soname)
+     endif
+   else
+-    ifdef SO_MAJOR_VERSION
+-      shlib		= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+-    endif
+     LINK.shared		= $(LD) -x -Bshareable -Bforcearchive
+   endif
+ endif
--- a/databases/postgresql84/patches/patch-bb
+++ b/databases/postgresql84/patches/patch-bb
@@ -0,0 +1,10 @@
+$NetBSD: patch-bb,v 1.1 2011/09/14 15:55:26 hans Exp $
+
+--- src/makefiles/Makefile.solaris.orig	2011-04-15 05:17:14.000000000 +0200
+++ src/makefiles/Makefile.solaris	2011-07-28 18:34:45.870978873 +0200
+@@ -22,5 +22,3 @@ ifeq ($(GCC), yes)
+ else
+ 	$(CC) $(CFLAGS) -G -o $@ $<
+ endif
+-
+-sqlmansect = 5sql
--- a/databases/postgresql84/patches/patch-src_pl_plperl_plperl.h
+++ b/databases/postgresql84/patches/patch-src_pl_plperl_plperl.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2011/10/12 19:44:51 hans Exp $
+
+--- src/pl/plperl/plperl.h.orig	2011-09-23 00:03:52.000000000 +0200
+++ src/pl/plperl/plperl.h	2011-10-12 20:41:41.351787708 +0200
+@@ -26,12 +26,22 @@
+ #endif
+ #endif
+ 
+#ifdef __sun
+#define list_head sun_list_head
+#define list_tail sun_list_tail
+#endif
+
+ /* required for perl API */
+ #include "EXTERN.h"
+ #include "perl.h"
+ #include "XSUB.h"
+ #include "ppport.h"
+ 
+#ifdef __sun
+#undef list_head
+#undef list_tail
+#endif
+
+ /* just in case these symbols aren't provided */
+ #ifndef pTHX_
+ #define pTHX_
--- a/databases/postgresql84/patches/patch-src_pl_plpgsql_src_Makefile
+++ b/databases/postgresql84/patches/patch-src_pl_plpgsql_src_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_pl_plpgsql_src_Makefile,v 1.1 2012/07/12 18:57:27 marino Exp $
+
+--- src/pl/plpgsql/src/Makefile.orig	2012-05-31 23:11:47.000000000 +0000
+++ src/pl/plpgsql/src/Makefile
+@@ -15,7 +15,7 @@ NAME= plpgsql
+ 
+ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+ SHLIB_LINK = $(filter -lintl, $(LIBS))
+-rpath =
+rpath = $(COMPILER_RPATH_FLAG)$(libdir)
+ 
+ OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
+