[Midnightbsd-cvs] mports [16720] trunk/databases/postgresql90-server: postgresql 9.0.18

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 30 10:54:03 EDT 2014


Revision: 16720
          http://svnweb.midnightbsd.org/mports/?rev=16720
Author:   laffer1
Date:     2014-08-30 10:54:02 -0400 (Sat, 30 Aug 2014)
Log Message:
-----------
postgresql 9.0.18

Modified Paths:
--------------
    trunk/databases/postgresql90-server/Makefile
    trunk/databases/postgresql90-server/distinfo
    trunk/databases/postgresql90-server/files/pkg-message-client.in
    trunk/databases/postgresql90-server/pkg-plist-client
    trunk/databases/postgresql90-server/pkg-plist-server

Added Paths:
-----------
    trunk/databases/postgresql90-server/files/patch-contrib-uuid
    trunk/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile

Modified: trunk/databases/postgresql90-server/Makefile
===================================================================
--- trunk/databases/postgresql90-server/Makefile	2014-08-30 14:31:08 UTC (rev 16719)
+++ trunk/databases/postgresql90-server/Makefile	2014-08-30 14:54:02 UTC (rev 16720)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.0.13
+DISTVERSION?=	9.0.18
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -10,6 +10,7 @@
 
 MAINTAINER?=	ports at MidnightBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
+
 LICENSE=	mit
 
 CONFLICTS?=	${PORTNAME}-client-[78]* \
@@ -208,90 +209,6 @@
 
 .endif # !SLAVE_ONLY
 
-.if defined(CLIENT_ONLY)
-MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
-		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
-		pg_config.1 pg_controldata.1 pg_ctl.1   \
-		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
-		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
-
-MAN3=		SPI_connect.3 SPI_copytuple.3 SPI_cursor_close.3 SPI_cursor_fetch.3 \
-		SPI_cursor_find.3 SPI_cursor_move.3 SPI_cursor_open.3 \
-		SPI_cursor_open_with_args.3 SPI_cursor_open_with_paramlist.3 \
-		SPI_exec.3 SPI_execp.3 SPI_execute.3 SPI_execute_plan.3 \
-		SPI_execute_plan_with_paramlist.3 SPI_execute_with_args.3 \
-		SPI_finish.3 SPI_fname.3 SPI_fnumber.3 SPI_freeplan.3 \
-		SPI_freetuple.3 SPI_freetuptable.3 SPI_getargcount.3 \
-		SPI_getargtypeid.3 SPI_getbinval.3 SPI_getnspname.3 \
-		SPI_getrelname.3 SPI_gettype.3 SPI_gettypeid.3 \
-		SPI_getvalue.3 SPI_is_cursor_plan.3 SPI_modifytuple.3 \
-		SPI_palloc.3 SPI_pfree.3 SPI_pop.3 SPI_prepare.3 \
-		SPI_prepare_cursor.3 SPI_prepare_params.3 SPI_push.3 \
-		SPI_repalloc.3 SPI_returntuple.3 SPI_saveplan.3 \
-		SPI_scroll_cursor_fetch.3 SPI_scroll_cursor_move.3 \
-		dblink.3 dblink_build_sql_delete.3 dblink_build_sql_insert.3 \
-		dblink_build_sql_update.3 dblink_cancel_query.3 \
-		dblink_close.3 dblink_connect.3 dblink_connect_u.3 \
-		dblink_disconnect.3 dblink_error_message.3 dblink_exec.3 \
-		dblink_fetch.3 dblink_get_connections.3 dblink_get_notify.3 \
-		dblink_get_pkey.3 dblink_get_result.3 dblink_is_busy.3 \
-		dblink_open.3 dblink_send_query.3
-
-MAN7=		ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.7 \
-		ALTER_DEFAULT_PRIVILEGES.7 \
-		ALTER_DOMAIN.7 ALTER_FOREIGN_DATA_WRAPPER.7 ALTER_FUNCTION.7 ALTER_GROUP.7 \
-		ALTER_LARGE_OBJECT.7 ALTER_SERVER.7 \
-		ALTER_USER_MAPPING.7		ALTER_INDEX.7 ALTER_LANGUAGE.7 ALTER_OPERATOR_CLASS.7	      \
-		ALTER_OPERATOR_FAMILY.7 				      \
-		ALTER_ROLE.7						      \
-		ALTER_SCHEMA.7 ALTER_SEQUENCE.7 ALTER_TABLE.7		      \
-		ALTER_TEXT_SEARCH_CONFIGURATION.7			      \
-		ALTER_TEXT_SEARCH_DICTIONARY.7				      \
-		ALTER_TEXT_SEARCH_PARSER.7				      \
-		ALTER_TEXT_SEARCH_TEMPLATE.7				      \
-		ALTER_TRIGGER.7 ALTER_USER.7 ALTER_VIEW.7 ANALYZE.7 BEGIN.7   \
-		CHECKPOINT.7 CLOSE.7 CLUSTER.7 COMMENT.7 COMMIT.7	      \
-		COMMIT_PREPARED.7					      \
-		COPY.7 CREATE_AGGREGATE.7 CREATE_CAST.7			      \
-		CREATE_CONSTRAINT_TRIGGER.7 CREATE_CONVERSION.7		      \
-		CREATE_DATABASE.7 CREATE_DOMAIN.7 CREATE_FOREIGN_DATA_WRAPPER.7 \
-		CREATE_FUNCTION.7	      \
-		CREATE_GROUP.7 CREATE_INDEX.7 CREATE_LANGUAGE.7		      \
-		CREATE_OPERATOR.7 CREATE_OPERATOR_CLASS.7		      \
-		CREATE_OPERATOR_FAMILY.7 CREATE_ROLE.7			      \
-		CREATE_RULE.7 CREATE_SCHEMA.7 CREATE_SEQUENCE.7		      \
-		CREATE_SERVER.7 CREATE_TABLE.7 CREATE_TABLE_AS.7			      \
-		CREATE_TEXT_SEARCH_CONFIGURATION.7			      \
-		CREATE_TEXT_SEARCH_DICTIONARY.7				      \
-		CREATE_TEXT_SEARCH_PARSER.7				      \
-		CREATE_TEXT_SEARCH_TEMPLATE.7 CREATE_TRIGGER.7		      \
-		CREATE_TYPE.7 CREATE_USER.7 CREATE_USER_MAPPING.7 CREATE_VIEW.7 DEALLOCATE.7	      \
-		DECLARE.7 DELETE.7 DISCARD.7				      \
-		DO.7 DROP_AGGREGATE.7 DROP_CAST.7 DROP_CONVERSION.7		      \
-		DROP_DATABASE.7 DROP_DOMAIN.7 DROP_FOREIGN_DATA_WRAPPER.7 DROP_FUNCTION.7		      \
-		DROP_GROUP.7 DROP_INDEX.7 DROP_LANGUAGE.7		      \
-		DROP_OPERATOR.7 DROP_OPERATOR_CLASS.7 DROP_OPERATOR_FAMILY.7  \
-		DROP_OWNED.7 DROP_ROLE.7 DROP_RULE.7			      \
-		DROP_SCHEMA.7 DROP_SEQUENCE.7 DROP_SERVER.7 DROP_TABLE.7		      \
-		DROP_TEXT_SEARCH_CONFIGURATION.7			      \
-		DROP_TEXT_SEARCH_DICTIONARY.7				      \
-		DROP_TEXT_SEARCH_PARSER.7				      \
-		DROP_TEXT_SEARCH_TEMPLATE.7 DROP_TRIGGER.7		      \
-		DROP_TYPE.7 DROP_USER.7 DROP_USER_MAPPING.7 DROP_VIEW.7 END.7 EXECUTE.7	      \
-		EXPLAIN.7 FETCH.7 GRANT.7 INSERT.7 LISTEN.7 LOAD.7	      \
-		LOCK.7 MOVE.7 NOTIFY.7 PREPARE.7 PREPARE_TRANSACTION.7	      \
-		REASSIGN_OWNED.7 REINDEX.7 RESET.7			      \
-		REVOKE.7 ROLLBACK.7 ROLLBACK_PREPARED.7 SELECT.7	      \
-		SELECT_INTO.7 SET.7					      \
-		SET_CONSTRAINTS.7 SET_ROLE.7 SET_TRANSACTION.7 SHOW.7	      \
-		SET_SESSION_AUTHORIZATION.7 START_TRANSACTION.7		      \
-		TABLE.7 TRUNCATE.7 UNLISTEN.7 UPDATE.7 VACUUM.7			      \
-		ALTER_OPERATOR.7 ALTER_TABLESPACE.7 ALTER_TYPE.7	      \
-		CREATE_TABLESPACE.7 DROP_TABLESPACE.7			      \
-		RELEASE_SAVEPOINT.7 ROLLBACK_TO_SAVEPOINT.7		      \
-		SAVEPOINT.7 VALUES.7 WITH.7
-.endif
-
 PLIST_SUB+=	PG_USER=$(PG_USER)
 SUB_LIST+=	PG_GROUP=$(PG_GROUP) \
 		PG_USER=$(PG_USER) \

Modified: trunk/databases/postgresql90-server/distinfo
===================================================================
--- trunk/databases/postgresql90-server/distinfo	2014-08-30 14:31:08 UTC (rev 16719)
+++ trunk/databases/postgresql90-server/distinfo	2014-08-30 14:54:02 UTC (rev 16720)
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.0.13.tar.bz2) = 51aea4d099defaee307ec3b9900837446931d1aa0c6717070fa25ed033af9977
-SIZE (postgresql/postgresql-9.0.13.tar.bz2) = 15139873
-SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9
-SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349
+SHA256 (postgresql/postgresql-9.0.18.tar.bz2) = 7c8a07d0ab78fe39522c6bb268a7b357f456d9d4796f57d7b43a004e4a9d3003
+SIZE (postgresql/postgresql-9.0.18.tar.bz2) = 14984096
+SHA256 (postgresql/pg-9017-icu-2014-06-09.diff.gz) = a28988885b532e73c2d6e67c6d2d9593f34d4360f2b4c9f6c419a373e16f149f
+SIZE (postgresql/pg-9017-icu-2014-06-09.diff.gz) = 4395

Added: trunk/databases/postgresql90-server/files/patch-contrib-uuid
===================================================================
--- trunk/databases/postgresql90-server/files/patch-contrib-uuid	                        (rev 0)
+++ trunk/databases/postgresql90-server/files/patch-contrib-uuid	2014-08-30 14:54:02 UTC (rev 16720)
@@ -0,0 +1,384 @@
+--- contrib/Makefile.orig	2014-07-21 20:16:01.000000000 +0100
++++ contrib/Makefile	2014-07-30 17:59:54.904934814 +0100
+@@ -43,6 +43,7 @@
+ 		tablefunc	\
+ 		test_parser	\
+ 		tsearch2	\
++		uuid-ossp	\
+ 		unaccent	\
+ 		vacuumlo
+ 
+--- contrib/uuid-ossp/uuid-ossp.c.orig	2014-07-21 20:16:01.000000000 +0100
++++ contrib/uuid-ossp/uuid-ossp.c	2014-07-30 18:00:21.427935273 +0100
+@@ -6,6 +6,10 @@
+  *
+  * $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.12 2010/01/02 16:57:33 momjian Exp $
+  *
++ * Modified to use FreeBSD's built in uuid instead of ossp:
++ * Copyright (c) 2009 Andrew Gierth
++ *
++ * URL: http://pgfoundry.org/projects/uuid-freebsd
+  *-------------------------------------------------------------------------
+  */
+ 
+@@ -14,27 +18,14 @@
+ #include "utils/builtins.h"
+ #include "utils/uuid.h"
+ 
+-/*
+- * There's some confusion over the location of the uuid.h header file.
+- * On Debian, it's installed as ossp/uuid.h, while on Fedora, or if you
+- * install ossp-uuid from a tarball, it's installed as uuid.h. Don't know
+- * what other systems do.
+- */
+-#ifdef HAVE_OSSP_UUID_H
+-#include <ossp/uuid.h>
+-#else
+-#ifdef HAVE_UUID_H
+-#include <uuid.h>
+-#else
+-#error OSSP uuid.h not found
+-#endif
+-#endif
+-
+-/* better both be 16 */
+-#if (UUID_LEN != UUID_LEN_BIN)
+-#error UUID length mismatch
+-#endif
++/* OS has a uuid_hash that conflicts with ours; kill it*/
++/* explicit path since we do _not_ want to get any other version */
++#define uuid_hash freebsd_uuid_hash
++#include "/usr/include/uuid.h"
++#undef uuid_hash
+ 
++#include <md5.h>
++#include <sha.h>
+ 
+ PG_MODULE_MAGIC;
+ 
+@@ -64,177 +55,175 @@
+ PG_FUNCTION_INFO_V1(uuid_generate_v4);
+ PG_FUNCTION_INFO_V1(uuid_generate_v5);
+ 
+-static void
+-pguuid_complain(uuid_rc_t rc)
+-{
+-	char	   *err = uuid_error(rc);
+-
+-	if (err != NULL)
+-		ereport(ERROR,
+-				(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
+-				 errmsg("OSSP uuid library failure: %s", err)));
+-	else
+-		ereport(ERROR,
+-				(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
+-				 errmsg("OSSP uuid library failure: error code %d", rc)));
+-}
++/* we assume that the string representation is portable and that the
++ * native binary representation might not be. But for *ns, we assume
++ * that pg's internal storage of uuids is the simple byte-oriented
++ * binary format. */
+ 
+-/*
+- * We create a uuid_t object just once per session and re-use it for all
+- * operations in this module.  OSSP UUID caches the system MAC address and
+- * other state in this object.  Reusing the object has a number of benefits:
+- * saving the cycles needed to fetch the system MAC address over and over,
+- * reducing the amount of entropy we draw from /dev/urandom, and providing a
+- * positive guarantee that successive generated V1-style UUIDs don't collide.
+- * (On a machine fast enough to generate multiple UUIDs per microsecond,
+- * or whatever the system's wall-clock resolution is, we'd otherwise risk
+- * collisions whenever random initialization of the uuid_t's clock sequence
+- * value chanced to produce duplicates.)
+- *
+- * However: when we're doing V3 or V5 UUID creation, uuid_make needs two
+- * uuid_t objects, one holding the namespace UUID and one for the result.
+- * It's unspecified whether it's safe to use the same uuid_t for both cases,
+- * so let's cache a second uuid_t for use as the namespace holder object.
+- */
+-static uuid_t *
+-get_cached_uuid_t(int which)
++static Datum
++internal_uuid_create(int v, unsigned char *ns, char *ptr, int len)
+ {
+-	static uuid_t *cached_uuid[2] = {NULL, NULL};
++	char strbuf[40];
+ 
+-	if (cached_uuid[which] == NULL)
++	switch (v)
+ 	{
+-		uuid_rc_t	rc;
++	case 0:	 /* constant-value uuids: nil, or namespace uuids */
++		strlcpy(strbuf, ptr, 37);
++		break;
+ 
+-		rc = uuid_create(&cached_uuid[which]);
+-		if (rc != UUID_RC_OK)
+-		{
+-			cached_uuid[which] = NULL;
+-			pguuid_complain(rc);
+-		}
++	case 4: default:   /* random uuid */
++	{
++		sprintf(strbuf, "%08lx-%04x-%04x-%04x-%04x%08lx",
++			(unsigned long) arc4random(),
++			(unsigned) (arc4random() & 0xffff),
++			(unsigned) ((arc4random() & 0xfff) | 0x4000),
++			(unsigned) ((arc4random() & 0x3fff) | 0x8000),
++			(unsigned) (arc4random() & 0xffff),
++			(unsigned long) arc4random());
++		break;
+ 	}
+-	return cached_uuid[which];
+-}
++		
++	case 1:	 /* time/node-based uuids */
++	{
++		uuid_t uu;
++		uint32_t status = uuid_s_ok;
++		char *str = NULL;
+ 
+-static char *
+-uuid_to_string(const uuid_t *uuid)
+-{
+-	char	   *buf = palloc(UUID_LEN_STR + 1);
+-	void	   *ptr = buf;
+-	size_t		len = UUID_LEN_STR + 1;
+-	uuid_rc_t	rc;
++		uuid_create(&uu, &status);
+ 
+-	rc = uuid_export(uuid, UUID_FMT_STR, &ptr, &len);
+-	if (rc != UUID_RC_OK)
+-		pguuid_complain(rc);
++		if (status == uuid_s_ok)
++		{
++		uuid_to_string(&uu, &str, &status);
++		if (status == uuid_s_ok)
++		{
++			strlcpy(strbuf, str, 37);
+ 
+-	return buf;
+-}
++			/* PTR, if set, replaces the trailing characters of the uuid;
++			 * this is to support v1mc, where a random multicast MAC is
++			 * used instead of the physical one
++			 */
++			
++			if (ptr && len <= 36)
++			strcpy(strbuf + (36 - len), ptr);
++		}
++		if (str)
++			free(str);
++		}
+ 
++		if (status != uuid_s_ok)
++		{
++		ereport(ERROR,
++			(errcode(ERRCODE_EXTERNAL_ROUTINE_EXCEPTION),
++			 errmsg("FreeBSD uuid library failure: %d", (int) status)));
++		}
++		
++		break;
++	}
+ 
+-static void
+-string_to_uuid(const char *str, uuid_t *uuid)
+-{
+-	uuid_rc_t	rc;
++	case 3:	 /* namespace-based MD5 uuids */
++	{
++		/* we could use pg's md5(), but we're already pulling in libmd */
++		MD5_CTX ctx;
++		unsigned char buf[16];
++
++		MD5Init(&ctx);
++		MD5Update(&ctx, ns, 16);
++		MD5Update(&ctx, (unsigned char *)ptr, len);
++		MD5Final(buf, &ctx);
++
++		sprintf(strbuf,
++			"%02x%02x%02x%02x-"
++			"%02x%02x-%02x%02x-%02x%02x-"
++			"%02x%02x%02x%02x%02x%02x",
++			buf[0], buf[1], buf[2], buf[3],
++			buf[4], buf[5], ((buf[6] & 0xf) | 0x30), buf[7],
++			((buf[8] & 0x3F) | 0x80), buf[9], buf[10], buf[11],
++			buf[12], buf[13], buf[14], buf[15]);
+ 
+-	rc = uuid_import(uuid, UUID_FMT_STR, str, UUID_LEN_STR + 1);
+-	if (rc != UUID_RC_OK)
+-		pguuid_complain(rc);
+-}
++		break;
++	}
++
++	case 5:	 /* namespace-based SHA1 uuids */
++	{
++		SHA_CTX ctx;
++		unsigned char buf[20];
+ 
++		SHA1_Init(&ctx);
++		SHA1_Update(&ctx, ns, 16);
++		SHA1_Update(&ctx, (unsigned char *)ptr, len);
++		SHA1_Final(buf, &ctx);
++
++		sprintf(strbuf,
++			"%02x%02x%02x%02x-"
++			"%02x%02x-%02x%02x-%02x%02x-"
++			"%02x%02x%02x%02x%02x%02x",
++			buf[0], buf[1], buf[2], buf[3],
++			buf[4], buf[5], ((buf[6] & 0xf) | 0x30), buf[7],
++			((buf[8] & 0x3F) | 0x80), buf[9], buf[10], buf[11],
++			buf[12], buf[13], buf[14], buf[15]);
+ 
+-static Datum
+-special_uuid_value(const char *name)
+-{
+-	uuid_t	   *uuid = get_cached_uuid_t(0);
+-	char	   *str;
+-	uuid_rc_t	rc;
+-
+-	rc = uuid_load(uuid, name);
+-	if (rc != UUID_RC_OK)
+-		pguuid_complain(rc);
+-	str = uuid_to_string(uuid);
++			break;
++		}
++	}
+ 
+-	return DirectFunctionCall1(uuid_in, CStringGetDatum(str));
++	return DirectFunctionCall1(uuid_in, CStringGetDatum(strbuf));
+ }
+ 
+ 
+ Datum
+ uuid_nil(PG_FUNCTION_ARGS)
+ {
+-	return special_uuid_value("nil");
++	return internal_uuid_create(0, NULL, "00000000-0000-0000-0000-000000000000", 36);
+ }
+ 
+ 
+ Datum
+ uuid_ns_dns(PG_FUNCTION_ARGS)
+ {
+-	return special_uuid_value("ns:DNS");
++	return internal_uuid_create(0, NULL, "6ba7b810-9dad-11d1-80b4-00c04fd430c8", 36);
+ }
+ 
+ 
+ Datum
+ uuid_ns_url(PG_FUNCTION_ARGS)
+ {
+-	return special_uuid_value("ns:URL");
++	return internal_uuid_create(0, NULL, "6ba7b811-9dad-11d1-80b4-00c04fd430c8", 36);
+ }
+ 
+ 
+ Datum
+ uuid_ns_oid(PG_FUNCTION_ARGS)
+ {
+-	return special_uuid_value("ns:OID");
++	return internal_uuid_create(0, NULL, "6ba7b812-9dad-11d1-80b4-00c04fd430c8", 36);
+ }
+ 
+ 
+ Datum
+ uuid_ns_x500(PG_FUNCTION_ARGS)
+ {
+-	return special_uuid_value("ns:X500");
+-}
+-
+-
+-static Datum
+-uuid_generate_internal(int mode, const uuid_t *ns, const char *name)
+-{
+-	uuid_t	   *uuid = get_cached_uuid_t(0);
+-	char	   *str;
+-	uuid_rc_t	rc;
+-
+-	rc = uuid_make(uuid, mode, ns, name);
+-	if (rc != UUID_RC_OK)
+-		pguuid_complain(rc);
+-	str = uuid_to_string(uuid);
+-
+-	return DirectFunctionCall1(uuid_in, CStringGetDatum(str));
++	return internal_uuid_create(0, NULL, "6ba7b814-9dad-11d1-80b4-00c04fd430c8", 36);
+ }
+ 
+ 
+ Datum
+ uuid_generate_v1(PG_FUNCTION_ARGS)
+ {
+-	return uuid_generate_internal(UUID_MAKE_V1, NULL, NULL);
++	return internal_uuid_create(1, NULL, NULL, 0);
+ }
+ 
+ 
+ Datum
+ uuid_generate_v1mc(PG_FUNCTION_ARGS)
+ {
+-	return uuid_generate_internal(UUID_MAKE_V1 | UUID_MAKE_MC, NULL, NULL);
+-}
+-
+-
+-static Datum
+-uuid_generate_v35_internal(int mode, pg_uuid_t *ns, text *name)
+-{
+-	uuid_t	   *ns_uuid = get_cached_uuid_t(1);
+-
+-	string_to_uuid(DatumGetCString(DirectFunctionCall1(uuid_out,
+-													   UUIDPGetDatum(ns))),
+-				   ns_uuid);
++	char buf[20];
+ 
+-	return uuid_generate_internal(mode,
+-								  ns_uuid,
+-								  text_to_cstring(name));
++	sprintf(buf, "-%04x-%04x%08lx",
++		(unsigned)((arc4random() & 0x3FFF) | 0x8000),
++		/* set IEEE802 multicast and local-admin bits */
++		(unsigned)((arc4random() & 0xffff) | 0x0300),
++		(unsigned long) arc4random());
++		
++	return internal_uuid_create(1, NULL, buf, 18);
+ }
+ 
+ 
+@@ -244,14 +233,15 @@
+ 	pg_uuid_t  *ns = PG_GETARG_UUID_P(0);
+ 	text	   *name = PG_GETARG_TEXT_P(1);
+ 
+-	return uuid_generate_v35_internal(UUID_MAKE_V3, ns, name);
++	return internal_uuid_create(3, (unsigned char *)ns,
++				VARDATA(name), VARSIZE(name) - VARHDRSZ);
+ }
+ 
+ 
+ Datum
+ uuid_generate_v4(PG_FUNCTION_ARGS)
+ {
+-	return uuid_generate_internal(UUID_MAKE_V4, NULL, NULL);
++	return internal_uuid_create(4, NULL, NULL, 0);
+ }
+ 
+ 
+@@ -261,5 +251,6 @@
+ 	pg_uuid_t  *ns = PG_GETARG_UUID_P(0);
+ 	text	   *name = PG_GETARG_TEXT_P(1);
+ 
+-	return uuid_generate_v35_internal(UUID_MAKE_V5, ns, name);
++	return internal_uuid_create(5, (unsigned char *)ns,
++				VARDATA(name), VARSIZE(name) - VARHDRSZ);
+ }
+--- contrib/uuid-ossp/Makefile.orig	2014-07-21 20:16:01.000000000 +0100
++++ contrib/uuid-ossp/Makefile	2014-07-30 18:00:13.141935988 +0100
+@@ -5,7 +5,7 @@
+ DATA_built = uuid-ossp.sql
+ DATA = uninstall_uuid-ossp.sql
+ 
+-SHLIB_LINK += $(OSSP_UUID_LIBS)
++SHLIB_LINK += -lmd
+ 
+ ifdef USE_PGXS
+ PG_CONFIG = pg_config

Added: trunk/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile
===================================================================
--- trunk/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile	                        (rev 0)
+++ trunk/databases/postgresql90-server/files/patch-doc-src-sgml-Makefile	2014-08-30 14:54:02 UTC (rev 16720)
@@ -0,0 +1,20 @@
+--- doc/src/sgml/Makefile.orig	2011-10-13 15:05:32.000000000 +0200
++++ doc/src/sgml/Makefile	2011-10-13 15:41:10.000000000 +0200
+@@ -75,8 +75,6 @@
+ ## Man pages
+ ##
+ 
+-man distprep-man: man-stamp
+-
+ man-stamp: stylesheet-man.xsl postgres.xml
+ 	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
+ 	touch $@
+@@ -292,7 +290,7 @@
+ endif
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
++	$(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
+ 
+ uninstall:
+ 	rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix  '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*)

Modified: trunk/databases/postgresql90-server/files/pkg-message-client.in
===================================================================
--- trunk/databases/postgresql90-server/files/pkg-message-client.in	2014-08-30 14:31:08 UTC (rev 16719)
+++ trunk/databases/postgresql90-server/files/pkg-message-client.in	2014-08-30 14:54:02 UTC (rev 16720)
@@ -21,7 +21,7 @@
   For client access to PostgreSQL databases using the ruby & python
   languages.
 
-p5-postgresql-plperl, postgresql-pltcl & postgresql-plruby
+postgresql-plperl, postgresql-pltcl & postgresql-plruby
   For using perl5, tcl & ruby as procedural languages.
 
 postgresql-contrib

Modified: trunk/databases/postgresql90-server/pkg-plist-client
===================================================================
--- trunk/databases/postgresql90-server/pkg-plist-client	2014-08-30 14:31:08 UTC (rev 16719)
+++ trunk/databases/postgresql90-server/pkg-plist-client	2014-08-30 14:54:02 UTC (rev 16720)
@@ -564,6 +564,232 @@
 @dirrm lib/postgresql/pgxs/src
 @dirrm lib/postgresql/pgxs
 @dirrm lib/postgresql
+man/man1/clusterdb.1.gz
+man/man1/createdb.1.gz
+man/man1/createlang.1.gz
+man/man1/createuser.1.gz
+man/man1/dropdb.1.gz
+man/man1/droplang.1.gz
+man/man1/dropuser.1.gz
+man/man1/ecpg.1.gz
+man/man1/initdb.1.gz
+man/man1/pg_config.1.gz
+man/man1/pg_controldata.1.gz
+man/man1/pg_ctl.1.gz
+man/man1/pg_dump.1.gz
+man/man1/pg_dumpall.1.gz
+man/man1/pg_resetxlog.1.gz
+man/man1/pg_restore.1.gz
+man/man1/postgres.1.gz
+man/man1/postmaster.1.gz
+man/man1/psql.1.gz
+man/man1/reindexdb.1.gz
+man/man1/vacuumdb.1.gz
+man/man3/SPI_connect.3.gz
+man/man3/SPI_copytuple.3.gz
+man/man3/SPI_cursor_close.3.gz
+man/man3/SPI_cursor_fetch.3.gz
+man/man3/SPI_cursor_find.3.gz
+man/man3/SPI_cursor_move.3.gz
+man/man3/SPI_cursor_open.3.gz
+man/man3/SPI_cursor_open_with_args.3.gz
+man/man3/SPI_cursor_open_with_paramlist.3.gz
+man/man3/SPI_exec.3.gz
+man/man3/SPI_execp.3.gz
+man/man3/SPI_execute.3.gz
+man/man3/SPI_execute_plan.3.gz
+man/man3/SPI_execute_plan_with_paramlist.3.gz
+man/man3/SPI_execute_with_args.3.gz
+man/man3/SPI_finish.3.gz
+man/man3/SPI_fname.3.gz
+man/man3/SPI_fnumber.3.gz
+man/man3/SPI_freeplan.3.gz
+man/man3/SPI_freetuple.3.gz
+man/man3/SPI_freetuptable.3.gz
+man/man3/SPI_getargcount.3.gz
+man/man3/SPI_getargtypeid.3.gz
+man/man3/SPI_getbinval.3.gz
+man/man3/SPI_getnspname.3.gz
+man/man3/SPI_getrelname.3.gz
+man/man3/SPI_gettype.3.gz
+man/man3/SPI_gettypeid.3.gz
+man/man3/SPI_getvalue.3.gz
+man/man3/SPI_is_cursor_plan.3.gz
+man/man3/SPI_modifytuple.3.gz
+man/man3/SPI_palloc.3.gz
+man/man3/SPI_pfree.3.gz
+man/man3/SPI_pop.3.gz
+man/man3/SPI_prepare.3.gz
+man/man3/SPI_prepare_cursor.3.gz
+man/man3/SPI_prepare_params.3.gz
+man/man3/SPI_push.3.gz
+man/man3/SPI_repalloc.3.gz
+man/man3/SPI_returntuple.3.gz
+man/man3/SPI_saveplan.3.gz
+man/man3/SPI_scroll_cursor_fetch.3.gz
+man/man3/SPI_scroll_cursor_move.3.gz
+man/man3/dblink.3.gz
+man/man3/dblink_build_sql_delete.3.gz
+man/man3/dblink_build_sql_insert.3.gz
+man/man3/dblink_build_sql_update.3.gz
+man/man3/dblink_cancel_query.3.gz
+man/man3/dblink_close.3.gz
+man/man3/dblink_connect.3.gz
+man/man3/dblink_connect_u.3.gz
+man/man3/dblink_disconnect.3.gz
+man/man3/dblink_error_message.3.gz
+man/man3/dblink_exec.3.gz
+man/man3/dblink_fetch.3.gz
+man/man3/dblink_get_connections.3.gz
+man/man3/dblink_get_notify.3.gz
+man/man3/dblink_get_pkey.3.gz
+man/man3/dblink_get_result.3.gz
+man/man3/dblink_is_busy.3.gz
+man/man3/dblink_open.3.gz
+man/man3/dblink_send_query.3.gz
+man/man7/ABORT.7.gz
+man/man7/ALTER_AGGREGATE.7.gz
+man/man7/ALTER_CONVERSION.7.gz
+man/man7/ALTER_DATABASE.7.gz
+man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
+man/man7/ALTER_DOMAIN.7.gz
+man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
+man/man7/ALTER_FUNCTION.7.gz
+man/man7/ALTER_GROUP.7.gz
+man/man7/ALTER_INDEX.7.gz
+man/man7/ALTER_LANGUAGE.7.gz
+man/man7/ALTER_LARGE_OBJECT.7.gz
+man/man7/ALTER_OPERATOR.7.gz
+man/man7/ALTER_OPERATOR_CLASS.7.gz
+man/man7/ALTER_OPERATOR_FAMILY.7.gz
+man/man7/ALTER_ROLE.7.gz
+man/man7/ALTER_SCHEMA.7.gz
+man/man7/ALTER_SEQUENCE.7.gz
+man/man7/ALTER_SERVER.7.gz
+man/man7/ALTER_TABLE.7.gz
+man/man7/ALTER_TABLESPACE.7.gz
+man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
+man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
+man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
+man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
+man/man7/ALTER_TRIGGER.7.gz
+man/man7/ALTER_TYPE.7.gz
+man/man7/ALTER_USER.7.gz
+man/man7/ALTER_USER_MAPPING.7.gz
+man/man7/ALTER_VIEW.7.gz
+man/man7/ANALYZE.7.gz
+man/man7/BEGIN.7.gz
+man/man7/CHECKPOINT.7.gz
+man/man7/CLOSE.7.gz
+man/man7/CLUSTER.7.gz
+man/man7/COMMENT.7.gz
+man/man7/COMMIT.7.gz
+man/man7/COMMIT_PREPARED.7.gz
+man/man7/COPY.7.gz
+man/man7/CREATE_AGGREGATE.7.gz
+man/man7/CREATE_CAST.7.gz
+man/man7/CREATE_CONSTRAINT_TRIGGER.7.gz
+man/man7/CREATE_CONVERSION.7.gz
+man/man7/CREATE_DATABASE.7.gz
+man/man7/CREATE_DOMAIN.7.gz
+man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
+man/man7/CREATE_FUNCTION.7.gz
+man/man7/CREATE_GROUP.7.gz
+man/man7/CREATE_INDEX.7.gz
+man/man7/CREATE_LANGUAGE.7.gz
+man/man7/CREATE_OPERATOR.7.gz
+man/man7/CREATE_OPERATOR_CLASS.7.gz
+man/man7/CREATE_OPERATOR_FAMILY.7.gz
+man/man7/CREATE_ROLE.7.gz
+man/man7/CREATE_RULE.7.gz
+man/man7/CREATE_SCHEMA.7.gz
+man/man7/CREATE_SEQUENCE.7.gz
+man/man7/CREATE_SERVER.7.gz
+man/man7/CREATE_TABLE.7.gz
+man/man7/CREATE_TABLESPACE.7.gz
+man/man7/CREATE_TABLE_AS.7.gz
+man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
+man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
+man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
+man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
+man/man7/CREATE_TRIGGER.7.gz
+man/man7/CREATE_TYPE.7.gz
+man/man7/CREATE_USER.7.gz
+man/man7/CREATE_USER_MAPPING.7.gz
+man/man7/CREATE_VIEW.7.gz
+man/man7/DEALLOCATE.7.gz
+man/man7/DECLARE.7.gz
+man/man7/DELETE.7.gz
+man/man7/DISCARD.7.gz
+man/man7/DO.7.gz
+man/man7/DROP_AGGREGATE.7.gz
+man/man7/DROP_CAST.7.gz
+man/man7/DROP_CONVERSION.7.gz
+man/man7/DROP_DATABASE.7.gz
+man/man7/DROP_DOMAIN.7.gz
+man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
+man/man7/DROP_FUNCTION.7.gz
+man/man7/DROP_GROUP.7.gz
+man/man7/DROP_INDEX.7.gz
+man/man7/DROP_LANGUAGE.7.gz
+man/man7/DROP_OPERATOR.7.gz
+man/man7/DROP_OPERATOR_CLASS.7.gz
+man/man7/DROP_OPERATOR_FAMILY.7.gz
+man/man7/DROP_OWNED.7.gz
+man/man7/DROP_ROLE.7.gz
+man/man7/DROP_RULE.7.gz
+man/man7/DROP_SCHEMA.7.gz
+man/man7/DROP_SEQUENCE.7.gz
+man/man7/DROP_SERVER.7.gz
+man/man7/DROP_TABLE.7.gz
+man/man7/DROP_TABLESPACE.7.gz
+man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
+man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
+man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
+man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
+man/man7/DROP_TRIGGER.7.gz
+man/man7/DROP_TYPE.7.gz
+man/man7/DROP_USER.7.gz
+man/man7/DROP_USER_MAPPING.7.gz
+man/man7/DROP_VIEW.7.gz
+man/man7/END.7.gz
+man/man7/EXECUTE.7.gz
+man/man7/EXPLAIN.7.gz
+man/man7/FETCH.7.gz
+man/man7/GRANT.7.gz
+man/man7/INSERT.7.gz
+man/man7/LISTEN.7.gz
+man/man7/LOAD.7.gz
+man/man7/LOCK.7.gz
+man/man7/MOVE.7.gz
+man/man7/NOTIFY.7.gz
+man/man7/PREPARE.7.gz
+man/man7/PREPARE_TRANSACTION.7.gz
+man/man7/REASSIGN_OWNED.7.gz
+man/man7/REINDEX.7.gz
+man/man7/RELEASE_SAVEPOINT.7.gz
+man/man7/RESET.7.gz
+man/man7/REVOKE.7.gz
+man/man7/ROLLBACK.7.gz
+man/man7/ROLLBACK_PREPARED.7.gz
+man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
+man/man7/SAVEPOINT.7.gz
+man/man7/SELECT.7.gz
+man/man7/SELECT_INTO.7.gz
+man/man7/SET.7.gz
+man/man7/SET_CONSTRAINTS.7.gz
+man/man7/SET_ROLE.7.gz
+man/man7/SET_SESSION_AUTHORIZATION.7.gz
+man/man7/SET_TRANSACTION.7.gz
+man/man7/SHOW.7.gz
+man/man7/START_TRANSACTION.7.gz
+man/man7/TABLE.7.gz
+man/man7/TRUNCATE.7.gz
+man/man7/UNLISTEN.7.gz
+man/man7/UPDATE.7.gz
+man/man7/VACUUM.7.gz
+man/man7/VALUES.7.gz
+man/man7/WITH.7.gz
 %%DOCSDIR%%/README-client
 @dirrmtry %%DOCSDIR%%
 share/postgresql/pg_service.conf.sample
@@ -603,6 +829,7 @@
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_config-9.0.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump-9.0.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/psql-9.0.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpg-9.0.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpglib6-9.0.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/libpq5-9.0.mo
@@ -634,8 +861,13 @@
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql-9.0.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config-9.0.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/ecpglib6-9.0.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq5-9.0.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql-9.0.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq5-9.0.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config-9.0.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump-9.0.mo

Modified: trunk/databases/postgresql90-server/pkg-plist-server
===================================================================
--- trunk/databases/postgresql90-server/pkg-plist-server	2014-08-30 14:31:08 UTC (rev 16719)
+++ trunk/databases/postgresql90-server/pkg-plist-server	2014-08-30 14:54:02 UTC (rev 16720)
@@ -365,6 +365,7 @@
 %%TZDATA%%share/postgresql/timezone/Antarctica/Rothera
 %%TZDATA%%share/postgresql/timezone/Antarctica/South_Pole
 %%TZDATA%%share/postgresql/timezone/Antarctica/Syowa
+%%TZDATA%%share/postgresql/timezone/Antarctica/Troll
 %%TZDATA%%share/postgresql/timezone/Antarctica/Vostok
 %%TZDATA%%share/postgresql/timezone/Arctic/Longyearbyen
 %%TZDATA%%share/postgresql/timezone/Asia/Aden
@@ -434,9 +435,6 @@
 %%TZDATA%%share/postgresql/timezone/Asia/Qyzylorda
 %%TZDATA%%share/postgresql/timezone/Asia/Rangoon
 %%TZDATA%%share/postgresql/timezone/Asia/Riyadh
-%%TZDATA%%share/postgresql/timezone/Asia/Riyadh87
-%%TZDATA%%share/postgresql/timezone/Asia/Riyadh88
-%%TZDATA%%share/postgresql/timezone/Asia/Riyadh89
 %%TZDATA%%share/postgresql/timezone/Asia/Saigon
 %%TZDATA%%share/postgresql/timezone/Asia/Sakhalin
 %%TZDATA%%share/postgresql/timezone/Asia/Samarkand
@@ -647,9 +645,6 @@
 %%TZDATA%%share/postgresql/timezone/Mexico/BajaNorte
 %%TZDATA%%share/postgresql/timezone/Mexico/BajaSur
 %%TZDATA%%share/postgresql/timezone/Mexico/General
-%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh87
-%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh88
-%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh89
 %%TZDATA%%share/postgresql/timezone/NZ
 %%TZDATA%%share/postgresql/timezone/NZ-CHAT
 %%TZDATA%%share/postgresql/timezone/Navajo
@@ -754,7 +749,6 @@
 %%TZDATA%%@dirrm share/postgresql/timezone/Europe
 %%TZDATA%%@dirrm share/postgresql/timezone/Indian
 %%TZDATA%%@dirrm share/postgresql/timezone/Mexico
-%%TZDATA%%@dirrm share/postgresql/timezone/Mideast
 %%TZDATA%%@dirrm share/postgresql/timezone/Pacific
 %%TZDATA%%@dirrm share/postgresql/timezone/US
 %%TZDATA%%@dirrm share/postgresql/timezone



More information about the Midnightbsd-cvs mailing list