Changes 7.4.14:

* Fix core dump when an untyped literal is taken as ANYARRAY
* Fix string_to_array() to handle overlapping matches for the
  separator string
  For example, string_to_array('123xx456xxx789', 'xx').
* Fix corner cases in pattern matching for psql's \d commands
* Fix index-corrupting bugs in /contrib/ltree (Teodor)
* Fix backslash escaping in /contrib/dbmirror
* Adjust regression tests for recent changes in US DST laws

9 files changed, 66 insertions, 69 deletions

diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile
index f717be6de49..770661007e7 100644
--- a/databases/postgresql74-client/Makefile
+++ b/databases/postgresql74-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/21 20:23:49 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/10/18 19:24:07 adam Exp $
 
 PKGNAME=		postgresql74-client-${BASE_VERS}
 SVR4_PKGNAME=		pstgc
@@ -15,16 +15,16 @@ CONFIGURE_ARGS+=	--with-zlib
 CONFIGURE_ARGS+=	--with-readline
 MAKE_ENV+=		INSTALLED_LIBPQ=1
 
-BUILD_DIRS=		${WRKSRC}/src/bin
+BUILD_DIRS=		src/bin
 
 pre-build:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC}/src/backend && \
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
 		../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 
 post-install:
-	${EGREP} -v "^#" ${FILESDIR}/man.client > ${WRKDIR}/man_tar_files
-	cd ${PREFIX}/man && ${TAR} -zxm -T ${WRKDIR}/man_tar_files	\
+	egrep -v "^#" ${FILESDIR}/man.client > ${WRKDIR}/man_tar_files
+	cd ${PREFIX}/man && tar -zxm -T ${WRKDIR}/man_tar_files	\
 		-f ${WRKSRC}/doc/man.tar.gz
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/databases/postgresql74-contrib/Makefile b/databases/postgresql74-contrib/Makefile
index 8cd5c0d831a..94bebc044c4 100644
--- a/databases/postgresql74-contrib/Makefile
+++ b/databases/postgresql74-contrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/21 20:23:49 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/18 19:24:07 adam Exp $
 
 PKGNAME=		postgresql74-contrib-${BASE_VERS}
 SVR4_PKGNAME=		pstgc
@@ -11,14 +11,14 @@ CONFIGURE_ARGS+=	--with-zlib
 CONFIGURE_ARGS+=	--with-readline
 MAKE_ENV+=		INSTALLED_LIBPQ=1
 
-BUILD_DIRS=		${WRKSRC}/contrib
+BUILD_DIRS=		contrib
 
 pre-build:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC}/src/backend && \
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
 		../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC}/src/port && \
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "FreeBSD" && ${LOWER_OPSYS_VERSUFFIX} == "4"
diff --git a/databases/postgresql74-docs/Makefile b/databases/postgresql74-docs/Makefile
index 2cf3d581a15..3f49a50fedc 100644
--- a/databases/postgresql74-docs/Makefile
+++ b/databases/postgresql74-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/21 20:23:49 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/18 19:24:07 adam Exp $
 
 PKGNAME=		postgresql74-docs-${BASE_VERS}
 SVR4_PKGNAME=		pstgd
@@ -15,7 +15,7 @@ DOCDIR=		${PREFIX}/share/doc/postgresql
 
 # The manpage documentation is installed with the relevant packages.
 #pre-build:
-#	cd ${WRKSRC}/doc && ${RM} -f man.tar.gz
+#	cd ${WRKSRC}/doc && rm -f man.tar.gz
 
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
@@ -26,8 +26,7 @@ do-install:
 	do								\
 		${INSTALL_DATA}	$${file} ${DOCDIR}/$${file};		\
 	done
-	cd ${WRKSRC}/doc/TODO.detail && \
-		${PAX} -rwppm . ${DOCDIR}/TODO.detail
-	${TAR} -zxm -C ${DOCDIR} -f ${WRKSRC}/doc/postgres.tar.gz
+	cd ${WRKSRC}/doc/TODO.detail && pax -rwppm . ${DOCDIR}/TODO.detail
+	tar -zxm -C ${DOCDIR} -f ${WRKSRC}/doc/postgres.tar.gz
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql74-docs/PLIST b/databases/postgresql74-docs/PLIST
index 07ef65803fd..c63f1c522cd 100644
--- a/databases/postgresql74-docs/PLIST
+++ b/databases/postgresql74-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/05/26 17:47:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/10/18 19:24:07 adam Exp $
 share/doc/postgresql/FAQ
 share/doc/postgresql/FAQ_AIX
 share/doc/postgresql/FAQ_DEV
@@ -444,6 +444,7 @@ 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-15.html
+share/doc/postgresql/release-7-3-16.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
@@ -457,6 +458,7 @@ 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-12.html
+share/doc/postgresql/release-7-4-13.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
diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile
index 3bd3fc1ab6c..d00923e8c62 100644
--- a/databases/postgresql74-lib/Makefile
+++ b/databases/postgresql74-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/07/17 17:32:30 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/10/18 19:24:07 adam Exp $
 
 PKGNAME=		postgresql74-lib-${BASE_VERS}
 SVR4_PKGNAME=		pstgl
@@ -11,15 +11,15 @@ CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DIRS+=		${WRKSRC}/src/include
-BUILD_DIRS+=		${WRKSRC}/src/interfaces
-BUILD_DIRS+=		${WRKSRC}/src/bin/pg_config
+BUILD_DIRS+=		src/include
+BUILD_DIRS+=		src/interfaces
+BUILD_DIRS+=		src/bin/pg_config
 
 # without this the Darwin build fails
 # (-bundle_loader related)
-BUILD_DIRS+=		${WRKSRC}/src/backend
+BUILD_DIRS+=		src/backend
 
-BUILD_DIRS+=		${WRKSRC}/src/pl
+BUILD_DIRS+=		src/pl
 
 # As told by Josh Berkus
 .include "../../mk/pthread.buildlink3.mk"
@@ -41,24 +41,20 @@ post-wrapper:
 # "/usr/include/crypt.h" -- we want the definitions in the former.
 #
 .if (${OPSYS} == "SunOS")
-	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
+	touch ${BUILDLINK_DIR}/include/crypt.h
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
-		${MAKE_PROGRAM} -C src/include install
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
-		${MAKE_PROGRAM} -C src/interfaces install
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
-		${MAKE_PROGRAM} -C src/bin/pg_config install
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}		\
-		${MAKE_PROGRAM} -C src/pl install
-	cd ${WRKSRC}/src/include && ${SETENV} ${MAKE_ENV}	\
+	cd ${WRKSRC} && env ${MAKE_ENV} ${MAKE_PROGRAM} -C src/include install
+	cd ${WRKSRC} && env ${MAKE_ENV} ${MAKE_PROGRAM} -C src/interfaces install
+	cd ${WRKSRC} && env ${MAKE_ENV} ${MAKE_PROGRAM} -C src/bin/pg_config install
+	cd ${WRKSRC} && env ${MAKE_ENV} ${MAKE_PROGRAM} -C src/pl install
+	cd ${WRKSRC}/src/include && env ${MAKE_ENV} \
 		${MAKE_PROGRAM} install-all-headers
 
 post-install:
-	${EGREP} -v "^#" ${FILESDIR}/man.lib > ${WRKDIR}/man_tar
-	cd ${PREFIX}/${PKGMANDIR} && ${TAR} -zxm -T ${WRKDIR}/man_tar  		\
+	egrep -v "^#" ${FILESDIR}/man.lib > ${WRKDIR}/man_tar
+	cd ${PREFIX}/${PKGMANDIR} && tar -zxm -T ${WRKDIR}/man_tar  		\
 		-f ${WRKSRC}/doc/man.tar.gz
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index a890abe4534..019e8935f8d 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/04/23 00:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/10/18 19:24:07 adam Exp $
 
 PKGNAME=		postgresql74-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
@@ -58,15 +58,15 @@ post-wrapper:
 # "/usr/include/crypt.h" -- we want the definitions in the former.
 #
 .if (${OPSYS} == "SunOS")
-	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
+	touch ${BUILDLINK_DIR}/include/crypt.h
 .endif
 
 pre-build:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC}/src/backend && \
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
 		../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC}/src/port && \
-       	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
+       	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
 pre-install:
 	@case "X${PGUSER}" in						\
@@ -82,8 +82,8 @@ pre-install:
 	esac
 
 post-install:
-	${EGREP} -v "^#" ${FILESDIR}/man.server > ${WRKDIR}/man_tar
-	cd ${PREFIX}/man && ${TAR} -zxm -T ${WRKDIR}/man_tar  		\
+	egrep -v "^#" ${FILESDIR}/man.server > ${WRKDIR}/man_tar
+	cd ${PREFIX}/man && tar -zxm -T ${WRKDIR}/man_tar  		\
 		-f ${WRKSRC}/doc/man.tar.gz
 
 .include "../../databases/postgresql74-lib/buildlink3.mk"
diff --git a/databases/postgresql74-server/PLIST b/databases/postgresql74-server/PLIST
index 36a8eb20662..7d4a226d0c7 100644
--- a/databases/postgresql74-server/PLIST
+++ b/databases/postgresql74-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/10/18 19:24:07 adam Exp $
 bin/postgres
 bin/postmaster
 lib/postgresql/ascii_and_mic.so
@@ -29,6 +29,7 @@ lib/postgresql/utf8_and_win1256.so
 lib/postgresql/utf8_and_win874.so
 man/man1/postgres.1
 man/man1/postmaster.1
+share/examples/rc.d/pgsql
 share/locale/cs/LC_MESSAGES/postgres.mo
 share/locale/de/LC_MESSAGES/postgres.mo
 share/locale/es/LC_MESSAGES/postgres.mo
@@ -43,7 +44,6 @@ share/locale/sv/LC_MESSAGES/postgres.mo
 share/locale/tr/LC_MESSAGES/postgres.mo
 share/locale/zh_CN/LC_MESSAGES/postgres.mo
 share/locale/zh_TW/LC_MESSAGES/postgres.mo
-share/examples/rc.d/pgsql
 share/postgresql/conversion_create.sql
 share/postgresql/information_schema.sql
 share/postgresql/pg_hba.conf.sample
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index 6d92f48a22e..5c1f3313ffb 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2006/05/26 17:47:58 joerg Exp $
+# $NetBSD: Makefile.common,v 1.37 2006/10/18 19:24:07 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -9,9 +9,9 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-DISTNAME?=		postgresql-${DIST_VERS}
-CATEGORIES+=		databases
-MASTER_SITES?=  ${MASTER_SITE_PGSQL:=source/v${DIST_VERS}/}
+DISTNAME?=	postgresql-${DIST_VERS}
+CATEGORIES+=	databases
+MASTER_SITES?=	${MASTER_SITE_PGSQL:=source/v${DIST_VERS}/}
 
 # Craft a MASTER_SORT_REGEX that understands the location of the country
 # code in the FTP server name for the PostgreSQL mirror sites.
@@ -35,7 +35,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.13
+DIST_VERS?=		7.4.14
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql74-lib?=	postgresql74-lib>=${BASE_VERS}
@@ -87,8 +87,8 @@ CFLAGS:=		${CFLAGS:S/-ffast-math//}
 
 post-extract:
 	if [ -d ${WRKSRC}/src ]; then					\
-		${RM} -f ${WRKSRC}/src/Makefile.custom;			\
-		${CP} -f ${COMMON_FILESDIR}/Makefile.custom		\
+		rm -f ${WRKSRC}/src/Makefile.custom;			\
+		cp -f ${COMMON_FILESDIR}/Makefile.custom		\
 			${WRKSRC}/src/Makefile.custom;			\
 	fi
 .for platform in irix5
@@ -101,51 +101,51 @@ post-extract:
 .endfor
 .for platform in interix3
 	if [ -d ${WRKSRC}/src/template ]; then				\
-		${RM} -f ${WRKSRC}/src/template/${platform};		\
-		${CP} -f ${COMMON_FILESDIR}/${platform}.template	\
+		rm -f ${WRKSRC}/src/template/${platform};		\
+		cp -f ${COMMON_FILESDIR}/${platform}.template	\
 			${WRKSRC}/src/template/${platform};		\
 	fi
 .endfor
 .for platform in interix3
 	if [ -d ${WRKSRC}/src/backend/port/dynloader ]; then		\
-		${RM} -f ${WRKSRC}/src/backend/port/dynloader/${platform}.h; \
-		${CP} -f ${COMMON_FILESDIR}/dynloader-ltdl.h		\
+		rm -f ${WRKSRC}/src/backend/port/dynloader/${platform}.h; \
+		cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h		\
 			${WRKSRC}/src/backend/port/dynloader/${platform}.h; \
-		${TOUCH} ${WRKSRC}/src/backend/port/dynloader/${platform}.c; \
+		touch ${WRKSRC}/src/backend/port/dynloader/${platform}.c; \
 	fi
 .endfor
 	if [ -d ${WRKSRC}/src/interfaces/libpq ]; then			\
-		${RM} -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
-		${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpq		\
+		rm -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
+		cp -f ${COMMON_FILESDIR}/GNUmakefile.libpq		\
 			${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
 	fi
 	if [ -d ${WRKSRC}/src/interfaces/libpgtcl ]; then		\
-		${RM} -f ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
-		${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpgtcl	\
+		rm -f ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
+		cp -f ${COMMON_FILESDIR}/GNUmakefile.libpgtcl	\
 			${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
 	fi
 	if [ -d ${WRKSRC}/src/backend/port/dynloader ]; then		\
-		${RM} -f ${WRKSRC}/src/backend/port/dynloader/netbsd.[ch]; \
-		${CP} -f ${COMMON_FILESDIR}/netbsd.[ch]			\
+		rm -f ${WRKSRC}/src/backend/port/dynloader/netbsd.[ch]; \
+		cp -f ${COMMON_FILESDIR}/netbsd.[ch]			\
 			${WRKSRC}/src/backend/port/dynloader/;		\
 	fi
 	if [ -d ${WRKSRC}/src/backend/port/dynloader ]; then		\
-		${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
+		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
 			${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \
-		${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
+		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
 			${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \
-		${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
+		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
 			${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \
 	fi
 	if [ -d ${WRKSRC}/src/template ]; then				\
-		${TOUCH} ${WRKSRC}/src/template/dragonfly;		\
+		touch ${WRKSRC}/src/template/dragonfly;		\
 	fi
 	if [ -d ${WRKSRC}/src/include/port ]; then			\
-		${CP} ${WRKSRC}/src/include/port/freebsd.h		\
+		cp ${WRKSRC}/src/include/port/freebsd.h		\
 			${WRKSRC}/src/include/port/dragonfly.h;		\
 	fi
 	if [ -d ${WRKSRC}/src/makefiles ]; then				\
-		${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd		\
+		cp ${WRKSRC}/src/makefiles/Makefile.freebsd		\
 			${WRKSRC}/src/makefiles/Makefile.dragonfly;	\
 	fi
 
diff --git a/databases/postgresql74/distinfo b/databases/postgresql74/distinfo
index 034f7054566..d179dc4cb09 100644
--- a/databases/postgresql74/distinfo
+++ b/databases/postgresql74/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2006/05/26 17:47:58 joerg Exp $
+$NetBSD: distinfo,v 1.22 2006/10/18 19:24:07 adam Exp $
 
-SHA1 (postgresql-7.4.13.tar.bz2) = 32bb03c00e4905d02fc621988d88b075a8a07194
-RMD160 (postgresql-7.4.13.tar.bz2) = 8b107ed07fd44814f8559c4803a95e86176f2b63
-Size (postgresql-7.4.13.tar.bz2) = 10248808 bytes
+SHA1 (postgresql-7.4.14.tar.bz2) = 1193ae3215a3b36409ee457de812a7e179e608ee
+RMD160 (postgresql-7.4.14.tar.bz2) = 105f37482ff5591d89ad697a7d3cce1f29845440
+Size (postgresql-7.4.14.tar.bz2) = 10277632 bytes
 SHA1 (patch-aa) = 830a0789195aacd10094e35e7d0d79c5e201491f
 SHA1 (patch-ab) = f44a544c56452bad197a88cb827e88624c54656c
 SHA1 (patch-ac) = 8104ac7631dd8566eb455e479dd59da058b68c8f