Pullup ticket 1163 - requested by Joerg Sonnenberger

mostly sync databases/postgresql74, databases/tcl-postgresql74, and databases/postgresql74-{client,contrib,docs,lib,plperl,plpython,server} with HEAD, via patch, including security fix.

7 files changed, 33 insertions, 48 deletions

diff --git a/databases/postgresql74-docs/PLIST b/databases/postgresql74-docs/PLIST
index e9bf6880d79..d3c2f096510 100644
--- a/databases/postgresql74-docs/PLIST
+++ b/databases/postgresql74-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/06/30 01:50:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4.4.1 2006/02/26 22:01:11 seb Exp $
 share/doc/postgresql/FAQ
 share/doc/postgresql/FAQ_AIX
 share/doc/postgresql/FAQ_DEV
@@ -439,6 +439,10 @@ share/doc/postgresql/release-7-2-8.html
 share/doc/postgresql/release-7-2.html
 share/doc/postgresql/release-7-3-1.html
 share/doc/postgresql/release-7-3-10.html
+share/doc/postgresql/release-7-3-11.html
+share/doc/postgresql/release-7-3-12.html
+share/doc/postgresql/release-7-3-13.html
+share/doc/postgresql/release-7-3-14.html
 share/doc/postgresql/release-7-3-2.html
 share/doc/postgresql/release-7-3-3.html
 share/doc/postgresql/release-7-3-4.html
@@ -449,12 +453,16 @@ share/doc/postgresql/release-7-3-8.html
 share/doc/postgresql/release-7-3-9.html
 share/doc/postgresql/release-7-3.html
 share/doc/postgresql/release-7-4-1.html
+share/doc/postgresql/release-7-4-10.html
+share/doc/postgresql/release-7-4-11.html
 share/doc/postgresql/release-7-4-2.html
 share/doc/postgresql/release-7-4-3.html
 share/doc/postgresql/release-7-4-4.html
 share/doc/postgresql/release-7-4-5.html
 share/doc/postgresql/release-7-4-6.html
 share/doc/postgresql/release-7-4-7.html
+share/doc/postgresql/release-7-4-8.html
+share/doc/postgresql/release-7-4-9.html
 share/doc/postgresql/release-7-4.html
 share/doc/postgresql/release.html
 share/doc/postgresql/resources.html
diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile
index 36c2d252b45..ce34f5c234c 100644
--- a/databases/postgresql74-lib/Makefile
+++ b/databases/postgresql74-lib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: Makefile,v 1.22.2.1 2006/02/26 22:01:11 seb Exp $
 
 PKGNAME=		postgresql74-lib-${BASE_VERS}
-PKGREVISION=		2
 SVR4_PKGNAME=		pstgl
 COMMENT=		PostgreSQL database headers and libraries
 
diff --git a/databases/postgresql74-plperl/Makefile b/databases/postgresql74-plperl/Makefile
index 01de59b88ec..90fbfab4d5c 100644
--- a/databases/postgresql74-plperl/Makefile
+++ b/databases/postgresql74-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2006/02/26 22:01:11 seb Exp $
 
 PKGNAME=		postgresql74-plperl-${BASE_VERS}
-PKGREVISION=		2
 COMMENT=		PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index 1726370a476..4ba5a7890ae 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2005/12/05 23:55:04 rillig Exp $
+# $NetBSD: Makefile.common,v 1.28.2.1 2006/02/26 22:01:11 seb Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -21,10 +21,10 @@ MASTER_SITES?=		\
 
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER?=		recht@NetBSD.org
+MAINTAINER?=		joerg@NetBSD.org
 HOMEPAGE?=		http://www.postgresql.org/
 
-CONFLICTS+=		postgresql-[0-9]* postgresql73-* postgresql80-*
+CONFLICTS+=	postgresql-[0-9]* postgresql73-* postgresql80-* postgresql81-*
 
 DISTINFO_FILE?=		${.CURDIR}/../postgresql74/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../postgresql74/files
@@ -36,7 +36,7 @@ PATCHDIR?=		${.CURDIR}/../postgresql74/patches
 # BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
 #
 # Note: Do not forget jdbc-postgresql when updating version
-DIST_VERS?=		7.4.8
+DIST_VERS?=		7.4.12
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_DEPENDS.postgresql74-lib?=	postgresql74-lib>=${BASE_VERS}
diff --git a/databases/postgresql74/distinfo b/databases/postgresql74/distinfo
index a079e4ebefa..cecb494ed9c 100644
--- a/databases/postgresql74/distinfo
+++ b/databases/postgresql74/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2005/11/08 16:40:38 joerg Exp $
+$NetBSD: distinfo,v 1.19.2.1 2006/02/26 22:01:11 seb Exp $
 
-SHA1 (postgresql-7.4.8.tar.bz2) = a565ff14e1a3b58a151b219bcffcf53dfc62ec41
-RMD160 (postgresql-7.4.8.tar.bz2) = 3ee8c70e0506e2a49bae20bc2282391513ee9d65
-Size (postgresql-7.4.8.tar.bz2) = 10235413 bytes
-SHA1 (patch-aa) = a7d3a63bbef3ae0ad5086fe6a8915be67731deb9
+SHA1 (postgresql-7.4.12.tar.bz2) = fd4e1db4fa3bf1a22d0596337cb1456389ca03e0
+RMD160 (postgresql-7.4.12.tar.bz2) = 9a156c571383d666551439b49fd09ca3a96bed6e
+Size (postgresql-7.4.12.tar.bz2) = 10246537 bytes
+SHA1 (patch-aa) = 830a0789195aacd10094e35e7d0d79c5e201491f
 SHA1 (patch-ab) = f44a544c56452bad197a88cb827e88624c54656c
 SHA1 (patch-ac) = 8104ac7631dd8566eb455e479dd59da058b68c8f
 SHA1 (patch-ad) = fae5e82e0943ea982c9d3aace290b56c6a7629f9
@@ -14,4 +14,3 @@ SHA1 (patch-ah) = 1a9b565bf3a004da5fa33081bc3675cb938e7e5f
 SHA1 (patch-ai) = 158382638ee3380930d6c9fd9b6381e973ccedc2
 SHA1 (patch-aj) = 629e38a0ca475834fb0bf1e03cc4efdfca4fb6ce
 SHA1 (patch-ak) = 12b4227149ebe4a3516b342c0931de78e3498b2e
-SHA1 (patch-al) = 9c4b963c9f727c78c364f76e5146a4eeb1412638
diff --git a/databases/postgresql74/patches/patch-aa b/databases/postgresql74/patches/patch-aa
index 2bb40e263df..dd2c845a14d 100644
--- a/databases/postgresql74/patches/patch-aa
+++ b/databases/postgresql74/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2005/11/08 16:40:38 joerg Exp $
+$NetBSD: patch-aa,v 1.3.2.1 2006/02/26 22:01:11 seb Exp $
 
 --- src/Makefile.shlib.orig	2003-10-19 21:34:33.000000000 -0400
 +++ src/Makefile.shlib
-@@ -108,7 +108,7 @@ endif
+@@ -66,7 +66,7 @@ LINK.static = $(AR) $(AROPT)
+ ifeq ($(enable_shared), yes)
+ 
+ # Insert -L from LDFLAGS after any -L already present in SHLIB_LINK
+-SHLIB_LINK := $(filter -L%, $(SHLIB_LINK)) $(filter -L%, $(LDFLAGS)) $(filter-out -L%, $(SHLIB_LINK))
++SHLIB_LINK := $(LDFLAGS) $(SHLIB_LINK)
+ 
+ # Need a -L-free version of LDFLAGS to use in combination with SHLIB_LINK
+ LDFLAGS_NO_L := $(filter-out -L%, $(LDFLAGS))
+@@ -114,7 +114,7 @@ endif
  
  ifeq ($(PORTNAME), freebsd)
    ifdef ELF_SYSTEM
@@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/08 16:40:38 joerg Exp $
      LINK.shared		= $(COMPILER) -shared -Wl,-x,-soname,$(soname)
    else
      shlib		:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-@@ -125,8 +125,13 @@ ifeq ($(PORTNAME), netbsd)
+@@ -131,8 +131,13 @@ ifeq ($(PORTNAME), netbsd)
    endif
  endif
  
@@ -26,7 +35,7 @@ $NetBSD: patch-aa,v 1.3 2005/11/08 16:40:38 joerg Exp $
    LINK.shared		= $(LD) +h $(soname) -b +b $(libdir)
    ifeq ($(GCC), yes)
      SHLIB_LINK		+= `$(CC) -print-libgcc-file-name`
-@@ -134,7 +139,7 @@ ifeq ($(PORTNAME), hpux)
+@@ -140,7 +145,7 @@ ifeq ($(PORTNAME), hpux)
  endif
  
  ifeq ($(PORTNAME), irix5)
@@ -35,12 +44,3 @@ $NetBSD: patch-aa,v 1.3 2005/11/08 16:40:38 joerg Exp $
    LINK.shared		= $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
  endif
  
-@@ -207,7 +212,7 @@ ifeq ($(PORTNAME), beos)
-   SHLIB_LINK		+= -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
- endif
- 
--SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK)
-+SHLIB_LINK := $(LDFLAGS) $(SHLIB_LINK)
- ifeq ($(enable_rpath), yes)
- SHLIB_LINK += $(rpath)
- endif
diff --git a/databases/postgresql74/patches/patch-al b/databases/postgresql74/patches/patch-al
deleted file mode 100644
index 35459d7a8ec..00000000000
--- a/databases/postgresql74/patches/patch-al
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/11/08 16:40:38 joerg Exp $
-
---- contrib/seg/segparse.y.orig	2005-11-08 15:18:52.000000000 +0000
-+++ contrib/seg/segparse.y
-@@ -3,6 +3,7 @@
-   
- #include "postgres.h"
- 
-+#include <errno.h>
- #include <math.h>
- 
- #include "segdata.h"
-@@ -14,7 +15,6 @@
- #undef yylex                  /* falure to redefine yylex will result in calling the */
- #define yylex seg_yylex       /* wrong scanner when running inside postgres backend  */
- 
--  extern int errno;
-   extern int yylex();           /* defined as seg_yylex in segscan.c */
-   extern int significant_digits( char *str );    /* defined in seg.c */
-