 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2008/03/04 12:41:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2008/04/05 16:39:26 adam Exp $
+#
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
+#
 # The PostgreSQL package naming scheme, aside from the obvious piecewise
 # packages, is as follows:
+#
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 .include "../../databases/postgresql83/Makefile.mirrors"
 DISTNAME?=	postgresql-${DIST_VERS}
 @@ -27,27 +27,27 @@ CONFLICTS+=	postgresql81-*
 CONFLICTS+=	postgresql82-*
 DISTINFO_FILE?=		${.CURDIR}/../postgresql83/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../postgresql83/files
 PATCHDIR?=		${.CURDIR}/../postgresql83/patches
 # Version numbering scheme:
+#
 # DIST_VERS		version number on the postgresql distfile
 # BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
+#
 # Note: Do not forget jdbc-postgresql83 when updating version
+#
-DIST_VERS?=		8.3.0
+DIST_VERS?=		8.3.1
 BASE_VERS?=		${DIST_VERS}
 BUILDLINK_API_DEPENDS.postgresql83-client+=	postgresql83-client>=${BASE_VERS}
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		bison gmake lex msgfmt
 PKG_SYSCONFSUBDIR=	postgresql
 # in 7.4.x/8.0.x, this is done by autoconf stuff which has leading whitespace
 USE_PKGLOCALEDIR=	yes
 SUBST_CLASSES+=		pglocale
 SUBST_FILES.pglocale=	configure config/programs.m4
 SUBST_STAGE.pglocale=	pre-configure

 @@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/04 12:41:36 adam Exp $
+$NetBSD: distinfo,v 1.2 2008/04/05 16:39:27 adam Exp $
-SHA1 (postgresql-8.3.0.tar.bz2) = b221e9a82fdb10af1a2b527551a4e30b7ccb958d
+SHA1 (postgresql-8.3.1.tar.bz2) = 7397e0d8fd3c420ee845d9ae4995ae347bfaea1d
-RMD160 (postgresql-8.3.0.tar.bz2) = 99f48d26d9b0fb0cfda0de7156ad6a9554017d9e
+RMD160 (postgresql-8.3.1.tar.bz2) = 075efb67126f2b308d2a5fe4f9097fdbfbe94c89
-Size (postgresql-8.3.0.tar.bz2) = 13923051 bytes
+Size (postgresql-8.3.1.tar.bz2) = 13995572 bytes
 SHA1 (patch-aa) = a7112ce2e9fc28f638afcf2e196d3cdc0f4c254d
-SHA1 (patch-ab) = 205e4540767f91c6ce6d509bf71516989feef93d
+SHA1 (patch-ab) = 8bc81e1f95cf8933a4da2e557539764054b51f5f
 SHA1 (patch-ac) = 8e3a7021fdd01810d4ebcbd20002b28164b22279
-SHA1 (patch-ad) = 471ebd457a3e560766321eefdcd7df26b6e2d4b9
+SHA1 (patch-ad) = 5612e447bbb76e81f72d39ad0153b9f77d47f653
 SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6
 SHA1 (patch-af) = fcb43276c1f3349f62acfc37ac0bd6ccaae96f29
 SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
 SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
 SHA1 (patch-ai) = a2364b8e1e8a3094e1c5bfb0cad2d0babe0a8841
 SHA1 (patch-aj) = 8fa23bf8e3aebe86025d4d17bb484d30166f4bd5
 SHA1 (patch-an) = a1e7f421a101cf9ccddcaf3ce17aa1847cf76310

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/04 12:42:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/05 16:39:27 adam Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
 ${PG_SUBPREFIX}bin/createuser
 ${PG_SUBPREFIX}bin/dropdb
 ${PG_SUBPREFIX}bin/droplang
 ${PG_SUBPREFIX}bin/dropuser
 ${PG_SUBPREFIX}bin/ecpg
 ${PG_SUBPREFIX}bin/initdb
 ${PG_SUBPREFIX}bin/ipcclean
 ${PG_SUBPREFIX}bin/pg_config
 ${PG_SUBPREFIX}bin/pg_controldata
 ${PG_SUBPREFIX}bin/pg_ctl
 @@ -1228,27 +1228,29 @@ ${PG_SUBPREFIX}share/doc/postgresql/html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-5.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-6.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-7.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-8.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-9.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-5.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-6.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-7.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/resources.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/role-attributes.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/role-membership.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/routine-reindex.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/routine-vacuuming.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/row-estimation-examples.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/rowtypes.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/rsync.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/rule-system.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/rules-privileges.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/rules-status.html

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/04 12:43:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/05 16:39:27 adam Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
 ${PG_SUBPREFIX}lib/postgresql/cyrillic_and_mic.la
 ${PG_SUBPREFIX}lib/postgresql/euc_cn_and_mic.la
 ${PG_SUBPREFIX}lib/postgresql/euc_jis_2004_and_shift_jis_2004.la
 ${PG_SUBPREFIX}lib/postgresql/euc_jp_and_sjis.la
 ${PG_SUBPREFIX}lib/postgresql/euc_kr_and_mic.la
 ${PG_SUBPREFIX}lib/postgresql/euc_tw_and_big5.la
 ${PG_SUBPREFIX}lib/postgresql/latin2_and_win1250.la
 ${PG_SUBPREFIX}lib/postgresql/latin_and_mic.la
 ${PG_SUBPREFIX}lib/postgresql/libdict_snowball.la
 ${PG_SUBPREFIX}lib/postgresql/plpgsql.la
 @@ -31,26 +31,27 @@ ${PG_SUBPREFIX}lib/postgresql/utf8_and_u
 ${PG_SUBPREFIX}lib/postgresql/utf8_and_win.la
 ${PG_SUBPREFIX}share/examples/rc.d/pgsql
 ${PG_SUBPREFIX}share/locale/af/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/hr/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/hu/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/nb/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/nl/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/sk/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/sl/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/postgresql/conversion_create.sql
 ${PG_SUBPREFIX}share/postgresql/information_schema.sql
 ${PG_SUBPREFIX}share/postgresql/pg_hba.conf.sample
 ${PG_SUBPREFIX}share/postgresql/pg_ident.conf.sample

 @@ -1,57 +1,57 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
+$NetBSD: patch-ab,v 1.2 2008/04/05 16:39:27 adam Exp $
---- configure.orig	2008-02-01 05:16:29.000000000 +0100
+--- configure.orig	2008-03-14 04:23:21.000000000 +0100
 +++ configure
 @@ -1510,6 +1510,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)
-@@ -5280,9 +5281,7 @@ echo "${ECHO_T}$perl_useshrplib" >&6
+@@ -5334,9 +5335,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 "s/^X//;s%$pgac_tmp2%%"`
 +perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
  echo "${ECHO_T}$perl_embed_ldflags" >&6
  fi
-@@ -24190,16 +24189,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24263,16 +24262,12 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
 -char gettext ();
 +#include <libintl.h>
++
  int
  main ()
+ {
 -gettext ();
 +gettext ("");
+   ;
    return 0;
+ }
-@@ -24245,16 +24240,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24318,16 +24313,12 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
 -char gettext ();
 +#include <libintl.h>
++
  int
  main ()

 @@ -1,79 +1,78 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
+$NetBSD: patch-ad,v 1.2 2008/04/05 16:39:27 adam Exp $
---- src/backend/port/dynloader/netbsd.c.orig	2007-03-26 23:44:11.000000000 +0200
+--- src/backend/port/dynloader/netbsd.c.orig	2008-04-05 10:45:52.000000000 +0200
 +++ src/backend/port/dynloader/netbsd.c
-@@ -42,65 +42,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
+@@ -42,64 +42,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
  #include "dynloader.h"
 -static char error_message[BUFSIZ];
 +#ifndef HAVE_DLOPEN
  char *
 -BSD44_derived_dlerror(void)
 +pg_dlerror(void)
+ {
 -	static char ret[BUFSIZ];
+-
 -	strcpy(ret, error_message);
 -	error_message[0] = 0;
 -	return (ret[0] == 0) ? NULL : ret;
 +	return "dynaloader unsupported";
+ }
  void *
 -BSD44_derived_dlopen(const char *file, int num)
 +pg_dlopen(const char *file, int num)
+ {
--#if defined(__mips__)
+-#if !defined(HAVE_DLOPEN)
 -	snprintf(error_message, sizeof(error_message),
 -			 "dlopen (%s) not supported", file);
 +	elog(ERROR, "dynamic load not supported");
  	return NULL;
 -#else
 -	void	   *vp;
+-
 -	if ((vp = dlopen((char *) file, num)) == NULL)
 -		snprintf(error_message, sizeof(error_message),
 -				 "dlopen (%s) failed: %s", file, dlerror());
 -	return vp;
 -#endif
+ }
  void *
 -BSD44_derived_dlsym(void *handle, const char *name)
 +pg_dlsym(void *handle, const char *name)
+ {
--#if defined(__mips__)
+-#if !defined(HAVE_DLOPEN)
 -	snprintf(error_message, sizeof(error_message),
 -			 "dlsym (%s) failed", name);
  	return NULL;
 -#elif defined(__ELF__)
 -	return dlsym(handle, name);
 -#else
 -	void	   *vp;
 -	char		buf[BUFSIZ];
+-
 -	if (*name != '_')
 -	{
 -		snprintf(buf, sizeof(buf), "_%s", name);
 -		name = buf;
 -	}
 -	if ((vp = dlsym(handle, (char *) name)) == NULL)
 -		snprintf(error_message, sizeof(error_message),
 -				 "dlsym (%s) failed", name);
 -	return vp;
 -#endif
+ }
  void
 -BSD44_derived_dlclose(void *handle)
 +pg_dlclose(void *handle)
+ {
--#if defined(__mips__)
+-#if defined(HAVE_DLOPEN)
 -#else
 -	dlclose(handle);
 -#endif
+ }
++
 +#endif /* ! HAVE_DLOPEN */