Changes 9.0.2:

* Force the default wal_sync_method to be fdatasync on Linux
* Fix "too many KnownAssignedXids" error during Hot Standby replay
* Fix race condition in lock acquisition during Hot Standby
* Avoid unnecessary conflicts during Hot Standby
* Fix assorted bugs in WAL replay logic for GIN indexes
* Fix recovery from base backup when the starting checkpoint WAL
  record is not in the same WAL segment as its redo point
* Fix corner-case bug when streaming replication is enabled
  immediately after creating the master database cluster
* Fix persistent slowdown of autovacuum workers when multiple workers
  remain active for a long time
* Fix long-term memory leak in autovacuum launcher
* Avoid failure when trying to report an impending transaction
  wraparound condition from outside a transaction
* Add support for detecting register-stack overrun on IA64
* Add a check for stack overflow in copyObject()
* Fix detection of page splits in temporary GiST indexes
* Fix error checking during early connection processing
* Improve efficiency of window functions
* Avoid memory leakage while "ANALYZE"'ing complex index expressions
* Ensure an index that uses a whole-row Var still depends on its table
* Add missing support in "DROP OWNED BY" for removing foreign data
  wrapper/server privileges belonging to a user
* Do not "inline" a SQL function with multiple OUT parameters
* Fix crash when inline-ing a set-returning function whose argument
  list contains a reference to an inline-able user function
* Behave correctly if ORDER BY, LIMIT, FOR UPDATE, or WITH is
  attached to the VALUES part of INSERT ... VALUES
* Make the OFF keyword unreserved
  This prevents problems with using off as a variable name in
  PL/pgSQL. That worked before 9.0, but was now broken because
  PL/pgSQL now treats all core reserved words as reserved.
* Fix constant-folding of COALESCE() expressions

4 files changed, 735 insertions, 755 deletions

diff --git a/databases/postgresql90-server/MESSAGE b/databases/postgresql90-server/MESSAGE
index a827b1ce33d..ff2b0e3cf6c 100644
--- a/databases/postgresql90-server/MESSAGE
+++ b/databases/postgresql90-server/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2010/09/21 07:52:56 adam Exp $
+$NetBSD: MESSAGE,v 1.2 2010/12/19 09:53:29 adam Exp $
 
 To enable this package, put the following into your /etc/rc.conf:
 
-	pgsql=yes
+	pgsql=YES
 	pgsql_flags="-l"     # enables SSL connections (TCP/IP and
 			     # ~pgsql/data/server.crt required)
 
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index bcdc0c80d3b..7503f0d5061 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/12/10 11:41:30 asau Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/19 09:53:29 adam Exp $
 
-PKGNAME=	postgresql90-server-${BASE_VERS}
-PKGREVISION=	1
+PKGNAME=	${DISTNAME:C/-/90-server-/}
 COMMENT=	PostgreSQL database server programs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -15,18 +14,18 @@ NOT_FOR_PLATFORM=	*-*-mips
 USE_LIBTOOL=		yes
 PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 
-MESSAGE_SRC=		${.CURDIR}/MESSAGE
-
 CONFIGURE_ARGS+=	--with-openssl
 
-BUILD_DIRS=		src/backend
-BUILD_DIRS+=		src/backend/replication/libpqwalreceiver
-BUILD_DIRS+=		src/backend/utils/mb/conversion_procs
-BUILD_DIRS+=		src/backend/snowball
-BUILD_DIRS+=		src/timezone
-BUILD_DIRS+=		src/pl
+INSTALL_DIRS=	src/backend
+INSTALL_DIRS+=	src/backend/replication/libpqwalreceiver
+INSTALL_DIRS+=	src/backend/utils/mb/conversion_procs
+INSTALL_DIRS+=	src/backend/snowball
+INSTALL_DIRS+=	src/timezone
+INSTALL_DIRS+=	src/pl
+BUILD_DIRS=	src/port
+BUILD_DIRS+=	${INSTALL_DIRS}
 
-LIBS.SunOS+=    -lintl
+LIBS.SunOS+=	-lintl
 
 # PostgreSQL has loadable server-side language modules.
 #
@@ -68,7 +67,6 @@ PKG_GROUPS=		${PGGROUP}
 PKG_USERS=		${PGUSER}:${PGGROUP}
 PKG_GECOS.${PGUSER}=	PostgreSQL database administrator
 PKG_HOME.${PGUSER}=	${PGHOME}
-PKG_SHELL.${PGUSER}=	${SH}
 
 RCD_SCRIPTS=		pgsql
 
@@ -82,9 +80,4 @@ post-wrapper:
 	touch ${BUILDLINK_DIR}/include/crypt.h
 .endif
 
-pre-build:
-	${RUN}${_ULIMIT_CMD}						\
-	cd ${WRKSRC}/src/port &&					\
-	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql90-server/PLIST b/databases/postgresql90-server/PLIST
index 6486e0f3264..f57369d2187 100644
--- a/databases/postgresql90-server/PLIST
+++ b/databases/postgresql90-server/PLIST
@@ -1,666 +1,671 @@
-@comment $NetBSD: PLIST,v 1.2 2010/11/05 14:56:49 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/dict_snowball.la
-${PG_SUBPREFIX}lib/postgresql/euc2004_sjis2004.la
-${PG_SUBPREFIX}lib/postgresql/euc_cn_and_mic.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/libpqwalreceiver.la
-${PG_SUBPREFIX}lib/postgresql/plpgsql.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_ascii.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_big5.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_cyrillic.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_euc2004.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_euc_cn.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_euc_jp.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_euc_kr.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_euc_tw.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_gb18030.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_gbk.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_iso8859.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_iso8859_1.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_johab.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_sjis.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_sjis2004.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_uhc.la
-${PG_SUBPREFIX}lib/postgresql/utf8_and_win.la
-${PG_SUBPREFIX}share/examples/rc.d/pgsql
-${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/plpgsql0-9.0.mo
-${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/postgres-9.0.mo
-${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/plpgsql0-9.0.mo
-${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/postgres-9.0.mo
-${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/plpgsql0-9.0.mo
-${PG_SUBPREFIX}share/locale/fr/LC_MESSAGES/postgres-9.0.mo
-${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/plpgsql0-9.0.mo
-${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/plpgsql0-9.0.mo
-${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/postgres-9.0.mo
-${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/plpgsql0-9.0.mo
-${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/postgres-9.0.mo
-${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/plpgsql0-9.0.mo
-${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/plpgsql0-9.0.mo
-${PG_SUBPREFIX}share/locale/tr/LC_MESSAGES/postgres-9.0.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
-${PG_SUBPREFIX}share/postgresql/postgres.bki
-${PG_SUBPREFIX}share/postgresql/postgres.description
-${PG_SUBPREFIX}share/postgresql/postgres.shdescription
-${PG_SUBPREFIX}share/postgresql/postgresql.conf.sample
-${PG_SUBPREFIX}share/postgresql/recovery.conf.sample
-${PG_SUBPREFIX}share/postgresql/snowball_create.sql
-${PG_SUBPREFIX}share/postgresql/sql_features.txt
-${PG_SUBPREFIX}share/postgresql/system_views.sql
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Abidjan
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Accra
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Addis_Ababa
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Algiers
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Asmara
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Asmera
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Bamako
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Bangui
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Banjul
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Bissau
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Blantyre
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Brazzaville
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Bujumbura
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Cairo
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Casablanca
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Ceuta
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Conakry
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Dakar
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Dar_es_Salaam
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Djibouti
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Douala
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/El_Aaiun
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Freetown
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Gaborone
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Harare
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Johannesburg
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Kampala
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Khartoum
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Kigali
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Kinshasa
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Lagos
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Libreville
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Lome
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Luanda
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Lubumbashi
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Lusaka
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Malabo
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Maputo
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Maseru
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Mbabane
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Mogadishu
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Monrovia
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Nairobi
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Ndjamena
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Niamey
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Nouakchott
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Ouagadougou
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Porto-Novo
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Sao_Tome
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Timbuktu
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Tripoli
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Tunis
-${PG_SUBPREFIX}share/postgresql/timezone/Africa/Windhoek
-${PG_SUBPREFIX}share/postgresql/timezone/America/Adak
-${PG_SUBPREFIX}share/postgresql/timezone/America/Anchorage
-${PG_SUBPREFIX}share/postgresql/timezone/America/Anguilla
-${PG_SUBPREFIX}share/postgresql/timezone/America/Antigua
-${PG_SUBPREFIX}share/postgresql/timezone/America/Araguaina
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Buenos_Aires
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Catamarca
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/ComodRivadavia
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Cordoba
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Jujuy
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/La_Rioja
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Mendoza
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Rio_Gallegos
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Salta
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/San_Juan
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/San_Luis
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Tucuman
-${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Ushuaia
-${PG_SUBPREFIX}share/postgresql/timezone/America/Aruba
-${PG_SUBPREFIX}share/postgresql/timezone/America/Asuncion
-${PG_SUBPREFIX}share/postgresql/timezone/America/Atikokan
-${PG_SUBPREFIX}share/postgresql/timezone/America/Atka
-${PG_SUBPREFIX}share/postgresql/timezone/America/Bahia
-${PG_SUBPREFIX}share/postgresql/timezone/America/Bahia_Banderas
-${PG_SUBPREFIX}share/postgresql/timezone/America/Barbados
-${PG_SUBPREFIX}share/postgresql/timezone/America/Belem
-${PG_SUBPREFIX}share/postgresql/timezone/America/Belize
-${PG_SUBPREFIX}share/postgresql/timezone/America/Blanc-Sablon
-${PG_SUBPREFIX}share/postgresql/timezone/America/Boa_Vista
-${PG_SUBPREFIX}share/postgresql/timezone/America/Bogota
-${PG_SUBPREFIX}share/postgresql/timezone/America/Boise
-${PG_SUBPREFIX}share/postgresql/timezone/America/Buenos_Aires
-${PG_SUBPREFIX}share/postgresql/timezone/America/Cambridge_Bay
-${PG_SUBPREFIX}share/postgresql/timezone/America/Campo_Grande
-${PG_SUBPREFIX}share/postgresql/timezone/America/Cancun
-${PG_SUBPREFIX}share/postgresql/timezone/America/Caracas
-${PG_SUBPREFIX}share/postgresql/timezone/America/Catamarca
-${PG_SUBPREFIX}share/postgresql/timezone/America/Cayenne
-${PG_SUBPREFIX}share/postgresql/timezone/America/Cayman
-${PG_SUBPREFIX}share/postgresql/timezone/America/Chicago
-${PG_SUBPREFIX}share/postgresql/timezone/America/Chihuahua
-${PG_SUBPREFIX}share/postgresql/timezone/America/Coral_Harbour
-${PG_SUBPREFIX}share/postgresql/timezone/America/Cordoba
-${PG_SUBPREFIX}share/postgresql/timezone/America/Costa_Rica
-${PG_SUBPREFIX}share/postgresql/timezone/America/Cuiaba
-${PG_SUBPREFIX}share/postgresql/timezone/America/Curacao
-${PG_SUBPREFIX}share/postgresql/timezone/America/Danmarkshavn
-${PG_SUBPREFIX}share/postgresql/timezone/America/Dawson
-${PG_SUBPREFIX}share/postgresql/timezone/America/Dawson_Creek
-${PG_SUBPREFIX}share/postgresql/timezone/America/Denver
-${PG_SUBPREFIX}share/postgresql/timezone/America/Detroit
-${PG_SUBPREFIX}share/postgresql/timezone/America/Dominica
-${PG_SUBPREFIX}share/postgresql/timezone/America/Edmonton
-${PG_SUBPREFIX}share/postgresql/timezone/America/Eirunepe
-${PG_SUBPREFIX}share/postgresql/timezone/America/El_Salvador
-${PG_SUBPREFIX}share/postgresql/timezone/America/Ensenada
-${PG_SUBPREFIX}share/postgresql/timezone/America/Fort_Wayne
-${PG_SUBPREFIX}share/postgresql/timezone/America/Fortaleza
-${PG_SUBPREFIX}share/postgresql/timezone/America/Glace_Bay
-${PG_SUBPREFIX}share/postgresql/timezone/America/Godthab
-${PG_SUBPREFIX}share/postgresql/timezone/America/Goose_Bay
-${PG_SUBPREFIX}share/postgresql/timezone/America/Grand_Turk
-${PG_SUBPREFIX}share/postgresql/timezone/America/Grenada
-${PG_SUBPREFIX}share/postgresql/timezone/America/Guadeloupe
-${PG_SUBPREFIX}share/postgresql/timezone/America/Guatemala
-${PG_SUBPREFIX}share/postgresql/timezone/America/Guayaquil
-${PG_SUBPREFIX}share/postgresql/timezone/America/Guyana
-${PG_SUBPREFIX}share/postgresql/timezone/America/Halifax
-${PG_SUBPREFIX}share/postgresql/timezone/America/Havana
-${PG_SUBPREFIX}share/postgresql/timezone/America/Hermosillo
-${PG_SUBPREFIX}share/postgresql/timezone/America/Indiana/Indianapolis
-${PG_SUBPREFIX}share/postgresql/timezone/America/Indiana/Knox
-${PG_SUBPREFIX}share/postgresql/timezone/America/Indiana/Marengo
-${PG_SUBPREFIX}share/postgresql/timezone/America/Indiana/Petersburg
-${PG_SUBPREFIX}share/postgresql/timezone/America/Indiana/Tell_City
-${PG_SUBPREFIX}share/postgresql/timezone/America/Indiana/Vevay
-${PG_SUBPREFIX}share/postgresql/timezone/America/Indiana/Vincennes
-${PG_SUBPREFIX}share/postgresql/timezone/America/Indiana/Winamac
-${PG_SUBPREFIX}share/postgresql/timezone/America/Indianapolis
-${PG_SUBPREFIX}share/postgresql/timezone/America/Inuvik
-${PG_SUBPREFIX}share/postgresql/timezone/America/Iqaluit
-${PG_SUBPREFIX}share/postgresql/timezone/America/Jamaica
-${PG_SUBPREFIX}share/postgresql/timezone/America/Jujuy
-${PG_SUBPREFIX}share/postgresql/timezone/America/Juneau
-${PG_SUBPREFIX}share/postgresql/timezone/America/Kentucky/Louisville
-${PG_SUBPREFIX}share/postgresql/timezone/America/Kentucky/Monticello
-${PG_SUBPREFIX}share/postgresql/timezone/America/Knox_IN
-${PG_SUBPREFIX}share/postgresql/timezone/America/La_Paz
-${PG_SUBPREFIX}share/postgresql/timezone/America/Lima
-${PG_SUBPREFIX}share/postgresql/timezone/America/Los_Angeles
-${PG_SUBPREFIX}share/postgresql/timezone/America/Louisville
-${PG_SUBPREFIX}share/postgresql/timezone/America/Maceio
-${PG_SUBPREFIX}share/postgresql/timezone/America/Managua
-${PG_SUBPREFIX}share/postgresql/timezone/America/Manaus
-${PG_SUBPREFIX}share/postgresql/timezone/America/Marigot
-${PG_SUBPREFIX}share/postgresql/timezone/America/Martinique
-${PG_SUBPREFIX}share/postgresql/timezone/America/Matamoros
-${PG_SUBPREFIX}share/postgresql/timezone/America/Mazatlan
-${PG_SUBPREFIX}share/postgresql/timezone/America/Mendoza
-${PG_SUBPREFIX}share/postgresql/timezone/America/Menominee
-${PG_SUBPREFIX}share/postgresql/timezone/America/Merida
-${PG_SUBPREFIX}share/postgresql/timezone/America/Mexico_City
-${PG_SUBPREFIX}share/postgresql/timezone/America/Miquelon
-${PG_SUBPREFIX}share/postgresql/timezone/America/Moncton
-${PG_SUBPREFIX}share/postgresql/timezone/America/Monterrey
-${PG_SUBPREFIX}share/postgresql/timezone/America/Montevideo
-${PG_SUBPREFIX}share/postgresql/timezone/America/Montreal
-${PG_SUBPREFIX}share/postgresql/timezone/America/Montserrat
-${PG_SUBPREFIX}share/postgresql/timezone/America/Nassau
-${PG_SUBPREFIX}share/postgresql/timezone/America/New_York
-${PG_SUBPREFIX}share/postgresql/timezone/America/Nipigon
-${PG_SUBPREFIX}share/postgresql/timezone/America/Nome
-${PG_SUBPREFIX}share/postgresql/timezone/America/Noronha
-${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/Center
-${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/New_Salem
-${PG_SUBPREFIX}share/postgresql/timezone/America/Ojinaga
-${PG_SUBPREFIX}share/postgresql/timezone/America/Panama
-${PG_SUBPREFIX}share/postgresql/timezone/America/Pangnirtung
-${PG_SUBPREFIX}share/postgresql/timezone/America/Paramaribo
-${PG_SUBPREFIX}share/postgresql/timezone/America/Phoenix
-${PG_SUBPREFIX}share/postgresql/timezone/America/Port-au-Prince
-${PG_SUBPREFIX}share/postgresql/timezone/America/Port_of_Spain
-${PG_SUBPREFIX}share/postgresql/timezone/America/Porto_Acre
-${PG_SUBPREFIX}share/postgresql/timezone/America/Porto_Velho
-${PG_SUBPREFIX}share/postgresql/timezone/America/Puerto_Rico
-${PG_SUBPREFIX}share/postgresql/timezone/America/Rainy_River
-${PG_SUBPREFIX}share/postgresql/timezone/America/Rankin_Inlet
-${PG_SUBPREFIX}share/postgresql/timezone/America/Recife
-${PG_SUBPREFIX}share/postgresql/timezone/America/Regina
-${PG_SUBPREFIX}share/postgresql/timezone/America/Resolute
-${PG_SUBPREFIX}share/postgresql/timezone/America/Rio_Branco
-${PG_SUBPREFIX}share/postgresql/timezone/America/Rosario
-${PG_SUBPREFIX}share/postgresql/timezone/America/Santa_Isabel
-${PG_SUBPREFIX}share/postgresql/timezone/America/Santarem
-${PG_SUBPREFIX}share/postgresql/timezone/America/Santiago
-${PG_SUBPREFIX}share/postgresql/timezone/America/Santo_Domingo
-${PG_SUBPREFIX}share/postgresql/timezone/America/Sao_Paulo
-${PG_SUBPREFIX}share/postgresql/timezone/America/Scoresbysund
-${PG_SUBPREFIX}share/postgresql/timezone/America/Shiprock
-${PG_SUBPREFIX}share/postgresql/timezone/America/St_Barthelemy
-${PG_SUBPREFIX}share/postgresql/timezone/America/St_Johns
-${PG_SUBPREFIX}share/postgresql/timezone/America/St_Kitts
-${PG_SUBPREFIX}share/postgresql/timezone/America/St_Lucia
-${PG_SUBPREFIX}share/postgresql/timezone/America/St_Thomas
-${PG_SUBPREFIX}share/postgresql/timezone/America/St_Vincent
-${PG_SUBPREFIX}share/postgresql/timezone/America/Swift_Current
-${PG_SUBPREFIX}share/postgresql/timezone/America/Tegucigalpa
-${PG_SUBPREFIX}share/postgresql/timezone/America/Thule
-${PG_SUBPREFIX}share/postgresql/timezone/America/Thunder_Bay
-${PG_SUBPREFIX}share/postgresql/timezone/America/Tijuana
-${PG_SUBPREFIX}share/postgresql/timezone/America/Toronto
-${PG_SUBPREFIX}share/postgresql/timezone/America/Tortola
-${PG_SUBPREFIX}share/postgresql/timezone/America/Vancouver
-${PG_SUBPREFIX}share/postgresql/timezone/America/Virgin
-${PG_SUBPREFIX}share/postgresql/timezone/America/Whitehorse
-${PG_SUBPREFIX}share/postgresql/timezone/America/Winnipeg
-${PG_SUBPREFIX}share/postgresql/timezone/America/Yakutat
-${PG_SUBPREFIX}share/postgresql/timezone/America/Yellowknife
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Casey
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Davis
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/DumontDUrville
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Macquarie
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Mawson
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/McMurdo
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Palmer
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Rothera
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/South_Pole
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Syowa
-${PG_SUBPREFIX}share/postgresql/timezone/Antarctica/Vostok
-${PG_SUBPREFIX}share/postgresql/timezone/Arctic/Longyearbyen
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Aden
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Almaty
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Amman
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Anadyr
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Aqtau
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Aqtobe
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Ashgabat
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Ashkhabad
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Baghdad
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Bahrain
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Baku
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Bangkok
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Beirut
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Bishkek
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Brunei
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Calcutta
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Choibalsan
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Chongqing
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Chungking
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Colombo
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Dacca
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Damascus
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Dhaka
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Dili
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Dubai
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Dushanbe
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Gaza
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Harbin
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Ho_Chi_Minh
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Hong_Kong
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Hovd
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Irkutsk
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Istanbul
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Jakarta
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Jayapura
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Jerusalem
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kabul
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kamchatka
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Karachi
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kashgar
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kathmandu
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Katmandu
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kolkata
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Krasnoyarsk
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kuala_Lumpur
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kuching
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kuwait
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Macao
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Macau
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Magadan
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Makassar
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Manila
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Muscat
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Nicosia
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Novokuznetsk
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Novosibirsk
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Omsk
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Oral
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Phnom_Penh
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Pontianak
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Pyongyang
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Qatar
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Qyzylorda
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Rangoon
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Riyadh
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Riyadh87
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Riyadh88
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Riyadh89
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Saigon
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Sakhalin
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Samarkand
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Seoul
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Shanghai
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Singapore
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Taipei
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Tashkent
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Tbilisi
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Tehran
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Tel_Aviv
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Thimbu
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Thimphu
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Tokyo
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Ujung_Pandang
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Ulaanbaatar
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Ulan_Bator
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Urumqi
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Vientiane
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Vladivostok
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Yakutsk
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Yekaterinburg
-${PG_SUBPREFIX}share/postgresql/timezone/Asia/Yerevan
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Azores
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Bermuda
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Canary
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Cape_Verde
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Faeroe
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Faroe
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Jan_Mayen
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Madeira
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Reykjavik
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/South_Georgia
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/St_Helena
-${PG_SUBPREFIX}share/postgresql/timezone/Atlantic/Stanley
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/ACT
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Adelaide
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Brisbane
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Broken_Hill
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Canberra
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Currie
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Darwin
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Eucla
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Hobart
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/LHI
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Lindeman
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Lord_Howe
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Melbourne
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/NSW
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/North
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Perth
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Queensland
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/South
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Sydney
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Tasmania
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Victoria
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/West
-${PG_SUBPREFIX}share/postgresql/timezone/Australia/Yancowinna
-${PG_SUBPREFIX}share/postgresql/timezone/Brazil/Acre
-${PG_SUBPREFIX}share/postgresql/timezone/Brazil/DeNoronha
-${PG_SUBPREFIX}share/postgresql/timezone/Brazil/East
-${PG_SUBPREFIX}share/postgresql/timezone/Brazil/West
-${PG_SUBPREFIX}share/postgresql/timezone/CET
-${PG_SUBPREFIX}share/postgresql/timezone/CST6CDT
-${PG_SUBPREFIX}share/postgresql/timezone/Canada/Atlantic
-${PG_SUBPREFIX}share/postgresql/timezone/Canada/Central
-${PG_SUBPREFIX}share/postgresql/timezone/Canada/East-Saskatchewan
-${PG_SUBPREFIX}share/postgresql/timezone/Canada/Eastern
-${PG_SUBPREFIX}share/postgresql/timezone/Canada/Mountain
-${PG_SUBPREFIX}share/postgresql/timezone/Canada/Newfoundland
-${PG_SUBPREFIX}share/postgresql/timezone/Canada/Pacific
-${PG_SUBPREFIX}share/postgresql/timezone/Canada/Saskatchewan
-${PG_SUBPREFIX}share/postgresql/timezone/Canada/Yukon
-${PG_SUBPREFIX}share/postgresql/timezone/Chile/Continental
-${PG_SUBPREFIX}share/postgresql/timezone/Chile/EasterIsland
-${PG_SUBPREFIX}share/postgresql/timezone/Cuba
-${PG_SUBPREFIX}share/postgresql/timezone/EET
-${PG_SUBPREFIX}share/postgresql/timezone/EST
-${PG_SUBPREFIX}share/postgresql/timezone/EST5EDT
-${PG_SUBPREFIX}share/postgresql/timezone/Egypt
-${PG_SUBPREFIX}share/postgresql/timezone/Eire
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+0
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+1
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+10
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+11
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+12
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+2
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+3
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+4
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+5
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+6
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+7
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+8
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT+9
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-0
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-1
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-10
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-11
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-12
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-13
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-14
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-2
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-3
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-4
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-5
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-6
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-7
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-8
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT-9
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/GMT0
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/Greenwich
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/UCT
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/UTC
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/Universal
-${PG_SUBPREFIX}share/postgresql/timezone/Etc/Zulu
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Amsterdam
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Andorra
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Athens
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Belfast
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Belgrade
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Berlin
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Bratislava
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Brussels
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Bucharest
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Budapest
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Chisinau
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Copenhagen
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Dublin
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Gibraltar
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Guernsey
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Helsinki
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Isle_of_Man
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Istanbul
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Jersey
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Kaliningrad
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Kiev
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Lisbon
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Ljubljana
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/London
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Luxembourg
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Madrid
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Malta
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Mariehamn
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Minsk
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Monaco
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Moscow
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Nicosia
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Oslo
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Paris
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Podgorica
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Prague
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Riga
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Rome
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Samara
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/San_Marino
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Sarajevo
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Simferopol
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Skopje
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Sofia
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Stockholm
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Tallinn
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Tirane
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Tiraspol
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Uzhgorod
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Vaduz
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Vatican
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Vienna
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Vilnius
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Volgograd
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Warsaw
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Zagreb
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Zaporozhye
-${PG_SUBPREFIX}share/postgresql/timezone/Europe/Zurich
-${PG_SUBPREFIX}share/postgresql/timezone/Factory
-${PG_SUBPREFIX}share/postgresql/timezone/GB
-${PG_SUBPREFIX}share/postgresql/timezone/GB-Eire
-${PG_SUBPREFIX}share/postgresql/timezone/GMT
-${PG_SUBPREFIX}share/postgresql/timezone/GMT+0
-${PG_SUBPREFIX}share/postgresql/timezone/GMT-0
-${PG_SUBPREFIX}share/postgresql/timezone/GMT0
-${PG_SUBPREFIX}share/postgresql/timezone/Greenwich
-${PG_SUBPREFIX}share/postgresql/timezone/HST
-${PG_SUBPREFIX}share/postgresql/timezone/Hongkong
-${PG_SUBPREFIX}share/postgresql/timezone/Iceland
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Antananarivo
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Chagos
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Christmas
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Cocos
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Comoro
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Kerguelen
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Mahe
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Maldives
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Mauritius
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Mayotte
-${PG_SUBPREFIX}share/postgresql/timezone/Indian/Reunion
-${PG_SUBPREFIX}share/postgresql/timezone/Iran
-${PG_SUBPREFIX}share/postgresql/timezone/Israel
-${PG_SUBPREFIX}share/postgresql/timezone/Jamaica
-${PG_SUBPREFIX}share/postgresql/timezone/Japan
-${PG_SUBPREFIX}share/postgresql/timezone/Kwajalein
-${PG_SUBPREFIX}share/postgresql/timezone/Libya
-${PG_SUBPREFIX}share/postgresql/timezone/MET
-${PG_SUBPREFIX}share/postgresql/timezone/MST
-${PG_SUBPREFIX}share/postgresql/timezone/MST7MDT
-${PG_SUBPREFIX}share/postgresql/timezone/Mexico/BajaNorte
-${PG_SUBPREFIX}share/postgresql/timezone/Mexico/BajaSur
-${PG_SUBPREFIX}share/postgresql/timezone/Mexico/General
-${PG_SUBPREFIX}share/postgresql/timezone/Mideast/Riyadh87
-${PG_SUBPREFIX}share/postgresql/timezone/Mideast/Riyadh88
-${PG_SUBPREFIX}share/postgresql/timezone/Mideast/Riyadh89
-${PG_SUBPREFIX}share/postgresql/timezone/NZ
-${PG_SUBPREFIX}share/postgresql/timezone/NZ-CHAT
-${PG_SUBPREFIX}share/postgresql/timezone/Navajo
-${PG_SUBPREFIX}share/postgresql/timezone/PRC
-${PG_SUBPREFIX}share/postgresql/timezone/PST8PDT
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Apia
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Auckland
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Chatham
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Chuuk
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Easter
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Efate
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Enderbury
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Fakaofo
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Fiji
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Funafuti
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Galapagos
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Gambier
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Guadalcanal
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Guam
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Honolulu
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Johnston
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Kiritimati
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Kosrae
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Kwajalein
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Majuro
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Marquesas
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Midway
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Nauru
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Niue
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Norfolk
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Noumea
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Pago_Pago
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Palau
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Pitcairn
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Pohnpei
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Ponape
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Port_Moresby
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Rarotonga
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Saipan
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Samoa
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Tahiti
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Tarawa
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Tongatapu
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Truk
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Wake
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Wallis
-${PG_SUBPREFIX}share/postgresql/timezone/Pacific/Yap
-${PG_SUBPREFIX}share/postgresql/timezone/Poland
-${PG_SUBPREFIX}share/postgresql/timezone/Portugal
-${PG_SUBPREFIX}share/postgresql/timezone/ROC
-${PG_SUBPREFIX}share/postgresql/timezone/ROK
-${PG_SUBPREFIX}share/postgresql/timezone/Singapore
-${PG_SUBPREFIX}share/postgresql/timezone/Turkey
-${PG_SUBPREFIX}share/postgresql/timezone/UCT
-${PG_SUBPREFIX}share/postgresql/timezone/US/Alaska
-${PG_SUBPREFIX}share/postgresql/timezone/US/Aleutian
-${PG_SUBPREFIX}share/postgresql/timezone/US/Arizona
-${PG_SUBPREFIX}share/postgresql/timezone/US/Central
-${PG_SUBPREFIX}share/postgresql/timezone/US/East-Indiana
-${PG_SUBPREFIX}share/postgresql/timezone/US/Eastern
-${PG_SUBPREFIX}share/postgresql/timezone/US/Hawaii
-${PG_SUBPREFIX}share/postgresql/timezone/US/Indiana-Starke
-${PG_SUBPREFIX}share/postgresql/timezone/US/Michigan
-${PG_SUBPREFIX}share/postgresql/timezone/US/Mountain
-${PG_SUBPREFIX}share/postgresql/timezone/US/Pacific
-${PG_SUBPREFIX}share/postgresql/timezone/US/Pacific-New
-${PG_SUBPREFIX}share/postgresql/timezone/US/Samoa
-${PG_SUBPREFIX}share/postgresql/timezone/UTC
-${PG_SUBPREFIX}share/postgresql/timezone/Universal
-${PG_SUBPREFIX}share/postgresql/timezone/W-SU
-${PG_SUBPREFIX}share/postgresql/timezone/WET
-${PG_SUBPREFIX}share/postgresql/timezone/Zulu
-${PG_SUBPREFIX}share/postgresql/timezone/posixrules
-${PG_SUBPREFIX}share/postgresql/timezonesets/Africa.txt
-${PG_SUBPREFIX}share/postgresql/timezonesets/America.txt
-${PG_SUBPREFIX}share/postgresql/timezonesets/Antarctica.txt
-${PG_SUBPREFIX}share/postgresql/timezonesets/Asia.txt
-${PG_SUBPREFIX}share/postgresql/timezonesets/Atlantic.txt
-${PG_SUBPREFIX}share/postgresql/timezonesets/Australia
-${PG_SUBPREFIX}share/postgresql/timezonesets/Australia.txt
-${PG_SUBPREFIX}share/postgresql/timezonesets/Default
-${PG_SUBPREFIX}share/postgresql/timezonesets/Etc.txt
-${PG_SUBPREFIX}share/postgresql/timezonesets/Europe.txt
-${PG_SUBPREFIX}share/postgresql/timezonesets/India
-${PG_SUBPREFIX}share/postgresql/timezonesets/Indian.txt
-${PG_SUBPREFIX}share/postgresql/timezonesets/Pacific.txt
-${PG_SUBPREFIX}share/postgresql/tsearch_data/danish.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/dutch.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/english.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/finnish.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/french.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/german.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/hungarian.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/hunspell_sample.affix
-${PG_SUBPREFIX}share/postgresql/tsearch_data/ispell_sample.affix
-${PG_SUBPREFIX}share/postgresql/tsearch_data/ispell_sample.dict
-${PG_SUBPREFIX}share/postgresql/tsearch_data/italian.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/norwegian.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/portuguese.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/russian.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/spanish.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/swedish.stop
-${PG_SUBPREFIX}share/postgresql/tsearch_data/synonym_sample.syn
-${PG_SUBPREFIX}share/postgresql/tsearch_data/thesaurus_sample.ths
-${PG_SUBPREFIX}share/postgresql/tsearch_data/turkish.stop
+@comment $NetBSD: PLIST,v 1.3 2010/12/19 09:53:29 adam Exp $
+bin/postgres
+bin/postmaster
+lib/postgresql/ascii_and_mic.la
+lib/postgresql/cyrillic_and_mic.la
+lib/postgresql/dict_snowball.la
+lib/postgresql/euc2004_sjis2004.la
+lib/postgresql/euc_cn_and_mic.la
+lib/postgresql/euc_jp_and_sjis.la
+lib/postgresql/euc_kr_and_mic.la
+lib/postgresql/euc_tw_and_big5.la
+lib/postgresql/latin2_and_win1250.la
+lib/postgresql/latin_and_mic.la
+lib/postgresql/libpqwalreceiver.la
+lib/postgresql/plpgsql.la
+lib/postgresql/utf8_and_ascii.la
+lib/postgresql/utf8_and_big5.la
+lib/postgresql/utf8_and_cyrillic.la
+lib/postgresql/utf8_and_euc2004.la
+lib/postgresql/utf8_and_euc_cn.la
+lib/postgresql/utf8_and_euc_jp.la
+lib/postgresql/utf8_and_euc_kr.la
+lib/postgresql/utf8_and_euc_tw.la
+lib/postgresql/utf8_and_gb18030.la
+lib/postgresql/utf8_and_gbk.la
+lib/postgresql/utf8_and_iso8859.la
+lib/postgresql/utf8_and_iso8859_1.la
+lib/postgresql/utf8_and_johab.la
+lib/postgresql/utf8_and_sjis.la
+lib/postgresql/utf8_and_sjis2004.la
+lib/postgresql/utf8_and_uhc.la
+lib/postgresql/utf8_and_win.la
+share/examples/rc.d/pgsql
+share/locale/de/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/de/LC_MESSAGES/postgres-9.0.mo
+share/locale/es/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/es/LC_MESSAGES/postgres-9.0.mo
+share/locale/fr/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/fr/LC_MESSAGES/postgres-9.0.mo
+share/locale/it/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/ja/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/ja/LC_MESSAGES/postgres-9.0.mo
+share/locale/ko/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/pt_BR/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/pt_BR/LC_MESSAGES/postgres-9.0.mo
+share/locale/ro/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/tr/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/tr/LC_MESSAGES/postgres-9.0.mo
+share/locale/zh_CN/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/zh_CN/LC_MESSAGES/postgres-9.0.mo
+share/locale/zh_TW/LC_MESSAGES/plpgsql0-9.0.mo
+share/locale/zh_TW/LC_MESSAGES/postgres-9.0.mo
+share/postgresql/conversion_create.sql
+share/postgresql/information_schema.sql
+share/postgresql/pg_hba.conf.sample
+share/postgresql/pg_ident.conf.sample
+share/postgresql/postgres.bki
+share/postgresql/postgres.description
+share/postgresql/postgres.shdescription
+share/postgresql/postgresql.conf.sample
+share/postgresql/recovery.conf.sample
+share/postgresql/snowball_create.sql
+share/postgresql/sql_features.txt
+share/postgresql/system_views.sql
+share/postgresql/timezone/Africa/Abidjan
+share/postgresql/timezone/Africa/Accra
+share/postgresql/timezone/Africa/Addis_Ababa
+share/postgresql/timezone/Africa/Algiers
+share/postgresql/timezone/Africa/Asmara
+share/postgresql/timezone/Africa/Asmera
+share/postgresql/timezone/Africa/Bamako
+share/postgresql/timezone/Africa/Bangui
+share/postgresql/timezone/Africa/Banjul
+share/postgresql/timezone/Africa/Bissau
+share/postgresql/timezone/Africa/Blantyre
+share/postgresql/timezone/Africa/Brazzaville
+share/postgresql/timezone/Africa/Bujumbura
+share/postgresql/timezone/Africa/Cairo
+share/postgresql/timezone/Africa/Casablanca
+share/postgresql/timezone/Africa/Ceuta
+share/postgresql/timezone/Africa/Conakry
+share/postgresql/timezone/Africa/Dakar
+share/postgresql/timezone/Africa/Dar_es_Salaam
+share/postgresql/timezone/Africa/Djibouti
+share/postgresql/timezone/Africa/Douala
+share/postgresql/timezone/Africa/El_Aaiun
+share/postgresql/timezone/Africa/Freetown
+share/postgresql/timezone/Africa/Gaborone
+share/postgresql/timezone/Africa/Harare
+share/postgresql/timezone/Africa/Johannesburg
+share/postgresql/timezone/Africa/Kampala
+share/postgresql/timezone/Africa/Khartoum
+share/postgresql/timezone/Africa/Kigali
+share/postgresql/timezone/Africa/Kinshasa
+share/postgresql/timezone/Africa/Lagos
+share/postgresql/timezone/Africa/Libreville
+share/postgresql/timezone/Africa/Lome
+share/postgresql/timezone/Africa/Luanda
+share/postgresql/timezone/Africa/Lubumbashi
+share/postgresql/timezone/Africa/Lusaka
+share/postgresql/timezone/Africa/Malabo
+share/postgresql/timezone/Africa/Maputo
+share/postgresql/timezone/Africa/Maseru
+share/postgresql/timezone/Africa/Mbabane
+share/postgresql/timezone/Africa/Mogadishu
+share/postgresql/timezone/Africa/Monrovia
+share/postgresql/timezone/Africa/Nairobi
+share/postgresql/timezone/Africa/Ndjamena
+share/postgresql/timezone/Africa/Niamey
+share/postgresql/timezone/Africa/Nouakchott
+share/postgresql/timezone/Africa/Ouagadougou
+share/postgresql/timezone/Africa/Porto-Novo
+share/postgresql/timezone/Africa/Sao_Tome
+share/postgresql/timezone/Africa/Timbuktu
+share/postgresql/timezone/Africa/Tripoli
+share/postgresql/timezone/Africa/Tunis
+share/postgresql/timezone/Africa/Windhoek
+share/postgresql/timezone/America/Adak
+share/postgresql/timezone/America/Anchorage
+share/postgresql/timezone/America/Anguilla
+share/postgresql/timezone/America/Antigua
+share/postgresql/timezone/America/Araguaina
+share/postgresql/timezone/America/Argentina/Buenos_Aires
+share/postgresql/timezone/America/Argentina/Catamarca
+share/postgresql/timezone/America/Argentina/ComodRivadavia
+share/postgresql/timezone/America/Argentina/Cordoba
+share/postgresql/timezone/America/Argentina/Jujuy
+share/postgresql/timezone/America/Argentina/La_Rioja
+share/postgresql/timezone/America/Argentina/Mendoza
+share/postgresql/timezone/America/Argentina/Rio_Gallegos
+share/postgresql/timezone/America/Argentina/Salta
+share/postgresql/timezone/America/Argentina/San_Juan
+share/postgresql/timezone/America/Argentina/San_Luis
+share/postgresql/timezone/America/Argentina/Tucuman
+share/postgresql/timezone/America/Argentina/Ushuaia
+share/postgresql/timezone/America/Aruba
+share/postgresql/timezone/America/Asuncion
+share/postgresql/timezone/America/Atikokan
+share/postgresql/timezone/America/Atka
+share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Bahia_Banderas
+share/postgresql/timezone/America/Barbados
+share/postgresql/timezone/America/Belem
+share/postgresql/timezone/America/Belize
+share/postgresql/timezone/America/Blanc-Sablon
+share/postgresql/timezone/America/Boa_Vista
+share/postgresql/timezone/America/Bogota
+share/postgresql/timezone/America/Boise
+share/postgresql/timezone/America/Buenos_Aires
+share/postgresql/timezone/America/Cambridge_Bay
+share/postgresql/timezone/America/Campo_Grande
+share/postgresql/timezone/America/Cancun
+share/postgresql/timezone/America/Caracas
+share/postgresql/timezone/America/Catamarca
+share/postgresql/timezone/America/Cayenne
+share/postgresql/timezone/America/Cayman
+share/postgresql/timezone/America/Chicago
+share/postgresql/timezone/America/Chihuahua
+share/postgresql/timezone/America/Coral_Harbour
+share/postgresql/timezone/America/Cordoba
+share/postgresql/timezone/America/Costa_Rica
+share/postgresql/timezone/America/Cuiaba
+share/postgresql/timezone/America/Curacao
+share/postgresql/timezone/America/Danmarkshavn
+share/postgresql/timezone/America/Dawson
+share/postgresql/timezone/America/Dawson_Creek
+share/postgresql/timezone/America/Denver
+share/postgresql/timezone/America/Detroit
+share/postgresql/timezone/America/Dominica
+share/postgresql/timezone/America/Edmonton
+share/postgresql/timezone/America/Eirunepe
+share/postgresql/timezone/America/El_Salvador
+share/postgresql/timezone/America/Ensenada
+share/postgresql/timezone/America/Fort_Wayne
+share/postgresql/timezone/America/Fortaleza
+share/postgresql/timezone/America/Glace_Bay
+share/postgresql/timezone/America/Godthab
+share/postgresql/timezone/America/Goose_Bay
+share/postgresql/timezone/America/Grand_Turk
+share/postgresql/timezone/America/Grenada
+share/postgresql/timezone/America/Guadeloupe
+share/postgresql/timezone/America/Guatemala
+share/postgresql/timezone/America/Guayaquil
+share/postgresql/timezone/America/Guyana
+share/postgresql/timezone/America/Halifax
+share/postgresql/timezone/America/Havana
+share/postgresql/timezone/America/Hermosillo
+share/postgresql/timezone/America/Indiana/Indianapolis
+share/postgresql/timezone/America/Indiana/Knox
+share/postgresql/timezone/America/Indiana/Marengo
+share/postgresql/timezone/America/Indiana/Petersburg
+share/postgresql/timezone/America/Indiana/Tell_City
+share/postgresql/timezone/America/Indiana/Vevay
+share/postgresql/timezone/America/Indiana/Vincennes
+share/postgresql/timezone/America/Indiana/Winamac
+share/postgresql/timezone/America/Indianapolis
+share/postgresql/timezone/America/Inuvik
+share/postgresql/timezone/America/Iqaluit
+share/postgresql/timezone/America/Jamaica
+share/postgresql/timezone/America/Jujuy
+share/postgresql/timezone/America/Juneau
+share/postgresql/timezone/America/Kentucky/Louisville
+share/postgresql/timezone/America/Kentucky/Monticello
+share/postgresql/timezone/America/Knox_IN
+share/postgresql/timezone/America/La_Paz
+share/postgresql/timezone/America/Lima
+share/postgresql/timezone/America/Los_Angeles
+share/postgresql/timezone/America/Louisville
+share/postgresql/timezone/America/Maceio
+share/postgresql/timezone/America/Managua
+share/postgresql/timezone/America/Manaus
+share/postgresql/timezone/America/Marigot
+share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Matamoros
+share/postgresql/timezone/America/Mazatlan
+share/postgresql/timezone/America/Mendoza
+share/postgresql/timezone/America/Menominee
+share/postgresql/timezone/America/Merida
+share/postgresql/timezone/America/Mexico_City
+share/postgresql/timezone/America/Miquelon
+share/postgresql/timezone/America/Moncton
+share/postgresql/timezone/America/Monterrey
+share/postgresql/timezone/America/Montevideo
+share/postgresql/timezone/America/Montreal
+share/postgresql/timezone/America/Montserrat
+share/postgresql/timezone/America/Nassau
+share/postgresql/timezone/America/New_York
+share/postgresql/timezone/America/Nipigon
+share/postgresql/timezone/America/Nome
+share/postgresql/timezone/America/Noronha
+share/postgresql/timezone/America/North_Dakota/Center
+share/postgresql/timezone/America/North_Dakota/New_Salem
+share/postgresql/timezone/America/Ojinaga
+share/postgresql/timezone/America/Panama
+share/postgresql/timezone/America/Pangnirtung
+share/postgresql/timezone/America/Paramaribo
+share/postgresql/timezone/America/Phoenix
+share/postgresql/timezone/America/Port-au-Prince
+share/postgresql/timezone/America/Port_of_Spain
+share/postgresql/timezone/America/Porto_Acre
+share/postgresql/timezone/America/Porto_Velho
+share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/Rainy_River
+share/postgresql/timezone/America/Rankin_Inlet
+share/postgresql/timezone/America/Recife
+share/postgresql/timezone/America/Regina
+share/postgresql/timezone/America/Resolute
+share/postgresql/timezone/America/Rio_Branco
+share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santa_Isabel
+share/postgresql/timezone/America/Santarem
+share/postgresql/timezone/America/Santiago
+share/postgresql/timezone/America/Santo_Domingo
+share/postgresql/timezone/America/Sao_Paulo
+share/postgresql/timezone/America/Scoresbysund
+share/postgresql/timezone/America/Shiprock
+share/postgresql/timezone/America/St_Barthelemy
+share/postgresql/timezone/America/St_Johns
+share/postgresql/timezone/America/St_Kitts
+share/postgresql/timezone/America/St_Lucia
+share/postgresql/timezone/America/St_Thomas
+share/postgresql/timezone/America/St_Vincent
+share/postgresql/timezone/America/Swift_Current
+share/postgresql/timezone/America/Tegucigalpa
+share/postgresql/timezone/America/Thule
+share/postgresql/timezone/America/Thunder_Bay
+share/postgresql/timezone/America/Tijuana
+share/postgresql/timezone/America/Toronto
+share/postgresql/timezone/America/Tortola
+share/postgresql/timezone/America/Vancouver
+share/postgresql/timezone/America/Virgin
+share/postgresql/timezone/America/Whitehorse
+share/postgresql/timezone/America/Winnipeg
+share/postgresql/timezone/America/Yakutat
+share/postgresql/timezone/America/Yellowknife
+share/postgresql/timezone/Antarctica/Casey
+share/postgresql/timezone/Antarctica/Davis
+share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Macquarie
+share/postgresql/timezone/Antarctica/Mawson
+share/postgresql/timezone/Antarctica/McMurdo
+share/postgresql/timezone/Antarctica/Palmer
+share/postgresql/timezone/Antarctica/Rothera
+share/postgresql/timezone/Antarctica/South_Pole
+share/postgresql/timezone/Antarctica/Syowa
+share/postgresql/timezone/Antarctica/Vostok
+share/postgresql/timezone/Arctic/Longyearbyen
+share/postgresql/timezone/Asia/Aden
+share/postgresql/timezone/Asia/Almaty
+share/postgresql/timezone/Asia/Amman
+share/postgresql/timezone/Asia/Anadyr
+share/postgresql/timezone/Asia/Aqtau
+share/postgresql/timezone/Asia/Aqtobe
+share/postgresql/timezone/Asia/Ashgabat
+share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Baghdad
+share/postgresql/timezone/Asia/Bahrain
+share/postgresql/timezone/Asia/Baku
+share/postgresql/timezone/Asia/Bangkok
+share/postgresql/timezone/Asia/Beirut
+share/postgresql/timezone/Asia/Bishkek
+share/postgresql/timezone/Asia/Brunei
+share/postgresql/timezone/Asia/Calcutta
+share/postgresql/timezone/Asia/Choibalsan
+share/postgresql/timezone/Asia/Chongqing
+share/postgresql/timezone/Asia/Chungking
+share/postgresql/timezone/Asia/Colombo
+share/postgresql/timezone/Asia/Dacca
+share/postgresql/timezone/Asia/Damascus
+share/postgresql/timezone/Asia/Dhaka
+share/postgresql/timezone/Asia/Dili
+share/postgresql/timezone/Asia/Dubai
+share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Gaza
+share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Ho_Chi_Minh
+share/postgresql/timezone/Asia/Hong_Kong
+share/postgresql/timezone/Asia/Hovd
+share/postgresql/timezone/Asia/Irkutsk
+share/postgresql/timezone/Asia/Istanbul
+share/postgresql/timezone/Asia/Jakarta
+share/postgresql/timezone/Asia/Jayapura
+share/postgresql/timezone/Asia/Jerusalem
+share/postgresql/timezone/Asia/Kabul
+share/postgresql/timezone/Asia/Kamchatka
+share/postgresql/timezone/Asia/Karachi
+share/postgresql/timezone/Asia/Kashgar
+share/postgresql/timezone/Asia/Kathmandu
+share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Kolkata
+share/postgresql/timezone/Asia/Krasnoyarsk
+share/postgresql/timezone/Asia/Kuala_Lumpur
+share/postgresql/timezone/Asia/Kuching
+share/postgresql/timezone/Asia/Kuwait
+share/postgresql/timezone/Asia/Macao
+share/postgresql/timezone/Asia/Macau
+share/postgresql/timezone/Asia/Magadan
+share/postgresql/timezone/Asia/Makassar
+share/postgresql/timezone/Asia/Manila
+share/postgresql/timezone/Asia/Muscat
+share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Novokuznetsk
+share/postgresql/timezone/Asia/Novosibirsk
+share/postgresql/timezone/Asia/Omsk
+share/postgresql/timezone/Asia/Oral
+share/postgresql/timezone/Asia/Phnom_Penh
+share/postgresql/timezone/Asia/Pontianak
+share/postgresql/timezone/Asia/Pyongyang
+share/postgresql/timezone/Asia/Qatar
+share/postgresql/timezone/Asia/Qyzylorda
+share/postgresql/timezone/Asia/Rangoon
+share/postgresql/timezone/Asia/Riyadh
+share/postgresql/timezone/Asia/Riyadh87
+share/postgresql/timezone/Asia/Riyadh88
+share/postgresql/timezone/Asia/Riyadh89
+share/postgresql/timezone/Asia/Saigon
+share/postgresql/timezone/Asia/Sakhalin
+share/postgresql/timezone/Asia/Samarkand
+share/postgresql/timezone/Asia/Seoul
+share/postgresql/timezone/Asia/Shanghai
+share/postgresql/timezone/Asia/Singapore
+share/postgresql/timezone/Asia/Taipei
+share/postgresql/timezone/Asia/Tashkent
+share/postgresql/timezone/Asia/Tbilisi
+share/postgresql/timezone/Asia/Tehran
+share/postgresql/timezone/Asia/Tel_Aviv
+share/postgresql/timezone/Asia/Thimbu
+share/postgresql/timezone/Asia/Thimphu
+share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Ujung_Pandang
+share/postgresql/timezone/Asia/Ulaanbaatar
+share/postgresql/timezone/Asia/Ulan_Bator
+share/postgresql/timezone/Asia/Urumqi
+share/postgresql/timezone/Asia/Vientiane
+share/postgresql/timezone/Asia/Vladivostok
+share/postgresql/timezone/Asia/Yakutsk
+share/postgresql/timezone/Asia/Yekaterinburg
+share/postgresql/timezone/Asia/Yerevan
+share/postgresql/timezone/Atlantic/Azores
+share/postgresql/timezone/Atlantic/Bermuda
+share/postgresql/timezone/Atlantic/Canary
+share/postgresql/timezone/Atlantic/Cape_Verde
+share/postgresql/timezone/Atlantic/Faeroe
+share/postgresql/timezone/Atlantic/Faroe
+share/postgresql/timezone/Atlantic/Jan_Mayen
+share/postgresql/timezone/Atlantic/Madeira
+share/postgresql/timezone/Atlantic/Reykjavik
+share/postgresql/timezone/Atlantic/South_Georgia
+share/postgresql/timezone/Atlantic/St_Helena
+share/postgresql/timezone/Atlantic/Stanley
+share/postgresql/timezone/Australia/ACT
+share/postgresql/timezone/Australia/Adelaide
+share/postgresql/timezone/Australia/Brisbane
+share/postgresql/timezone/Australia/Broken_Hill
+share/postgresql/timezone/Australia/Canberra
+share/postgresql/timezone/Australia/Currie
+share/postgresql/timezone/Australia/Darwin
+share/postgresql/timezone/Australia/Eucla
+share/postgresql/timezone/Australia/Hobart
+share/postgresql/timezone/Australia/LHI
+share/postgresql/timezone/Australia/Lindeman
+share/postgresql/timezone/Australia/Lord_Howe
+share/postgresql/timezone/Australia/Melbourne
+share/postgresql/timezone/Australia/NSW
+share/postgresql/timezone/Australia/North
+share/postgresql/timezone/Australia/Perth
+share/postgresql/timezone/Australia/Queensland
+share/postgresql/timezone/Australia/South
+share/postgresql/timezone/Australia/Sydney
+share/postgresql/timezone/Australia/Tasmania
+share/postgresql/timezone/Australia/Victoria
+share/postgresql/timezone/Australia/West
+share/postgresql/timezone/Australia/Yancowinna
+share/postgresql/timezone/Brazil/Acre
+share/postgresql/timezone/Brazil/DeNoronha
+share/postgresql/timezone/Brazil/East
+share/postgresql/timezone/Brazil/West
+share/postgresql/timezone/CET
+share/postgresql/timezone/CST6CDT
+share/postgresql/timezone/Canada/Atlantic
+share/postgresql/timezone/Canada/Central
+share/postgresql/timezone/Canada/East-Saskatchewan
+share/postgresql/timezone/Canada/Eastern
+share/postgresql/timezone/Canada/Mountain
+share/postgresql/timezone/Canada/Newfoundland
+share/postgresql/timezone/Canada/Pacific
+share/postgresql/timezone/Canada/Saskatchewan
+share/postgresql/timezone/Canada/Yukon
+share/postgresql/timezone/Chile/Continental
+share/postgresql/timezone/Chile/EasterIsland
+share/postgresql/timezone/Cuba
+share/postgresql/timezone/EET
+share/postgresql/timezone/EST
+share/postgresql/timezone/EST5EDT
+share/postgresql/timezone/Egypt
+share/postgresql/timezone/Eire
+share/postgresql/timezone/Etc/GMT
+share/postgresql/timezone/Etc/GMT+0
+share/postgresql/timezone/Etc/GMT+1
+share/postgresql/timezone/Etc/GMT+10
+share/postgresql/timezone/Etc/GMT+11
+share/postgresql/timezone/Etc/GMT+12
+share/postgresql/timezone/Etc/GMT+2
+share/postgresql/timezone/Etc/GMT+3
+share/postgresql/timezone/Etc/GMT+4
+share/postgresql/timezone/Etc/GMT+5
+share/postgresql/timezone/Etc/GMT+6
+share/postgresql/timezone/Etc/GMT+7
+share/postgresql/timezone/Etc/GMT+8
+share/postgresql/timezone/Etc/GMT+9
+share/postgresql/timezone/Etc/GMT-0
+share/postgresql/timezone/Etc/GMT-1
+share/postgresql/timezone/Etc/GMT-10
+share/postgresql/timezone/Etc/GMT-11
+share/postgresql/timezone/Etc/GMT-12
+share/postgresql/timezone/Etc/GMT-13
+share/postgresql/timezone/Etc/GMT-14
+share/postgresql/timezone/Etc/GMT-2
+share/postgresql/timezone/Etc/GMT-3
+share/postgresql/timezone/Etc/GMT-4
+share/postgresql/timezone/Etc/GMT-5
+share/postgresql/timezone/Etc/GMT-6
+share/postgresql/timezone/Etc/GMT-7
+share/postgresql/timezone/Etc/GMT-8
+share/postgresql/timezone/Etc/GMT-9
+share/postgresql/timezone/Etc/GMT0
+share/postgresql/timezone/Etc/Greenwich
+share/postgresql/timezone/Etc/UCT
+share/postgresql/timezone/Etc/UTC
+share/postgresql/timezone/Etc/Universal
+share/postgresql/timezone/Etc/Zulu
+share/postgresql/timezone/Europe/Amsterdam
+share/postgresql/timezone/Europe/Andorra
+share/postgresql/timezone/Europe/Athens
+share/postgresql/timezone/Europe/Belfast
+share/postgresql/timezone/Europe/Belgrade
+share/postgresql/timezone/Europe/Berlin
+share/postgresql/timezone/Europe/Bratislava
+share/postgresql/timezone/Europe/Brussels
+share/postgresql/timezone/Europe/Bucharest
+share/postgresql/timezone/Europe/Budapest
+share/postgresql/timezone/Europe/Chisinau
+share/postgresql/timezone/Europe/Copenhagen
+share/postgresql/timezone/Europe/Dublin
+share/postgresql/timezone/Europe/Gibraltar
+share/postgresql/timezone/Europe/Guernsey
+share/postgresql/timezone/Europe/Helsinki
+share/postgresql/timezone/Europe/Isle_of_Man
+share/postgresql/timezone/Europe/Istanbul
+share/postgresql/timezone/Europe/Jersey
+share/postgresql/timezone/Europe/Kaliningrad
+share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Lisbon
+share/postgresql/timezone/Europe/Ljubljana
+share/postgresql/timezone/Europe/London
+share/postgresql/timezone/Europe/Luxembourg
+share/postgresql/timezone/Europe/Madrid
+share/postgresql/timezone/Europe/Malta
+share/postgresql/timezone/Europe/Mariehamn
+share/postgresql/timezone/Europe/Minsk
+share/postgresql/timezone/Europe/Monaco
+share/postgresql/timezone/Europe/Moscow
+share/postgresql/timezone/Europe/Nicosia
+share/postgresql/timezone/Europe/Oslo
+share/postgresql/timezone/Europe/Paris
+share/postgresql/timezone/Europe/Podgorica
+share/postgresql/timezone/Europe/Prague
+share/postgresql/timezone/Europe/Riga
+share/postgresql/timezone/Europe/Rome
+share/postgresql/timezone/Europe/Samara
+share/postgresql/timezone/Europe/San_Marino
+share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Simferopol
+share/postgresql/timezone/Europe/Skopje
+share/postgresql/timezone/Europe/Sofia
+share/postgresql/timezone/Europe/Stockholm
+share/postgresql/timezone/Europe/Tallinn
+share/postgresql/timezone/Europe/Tirane
+share/postgresql/timezone/Europe/Tiraspol
+share/postgresql/timezone/Europe/Uzhgorod
+share/postgresql/timezone/Europe/Vaduz
+share/postgresql/timezone/Europe/Vatican
+share/postgresql/timezone/Europe/Vienna
+share/postgresql/timezone/Europe/Vilnius
+share/postgresql/timezone/Europe/Volgograd
+share/postgresql/timezone/Europe/Warsaw
+share/postgresql/timezone/Europe/Zagreb
+share/postgresql/timezone/Europe/Zaporozhye
+share/postgresql/timezone/Europe/Zurich
+share/postgresql/timezone/Factory
+share/postgresql/timezone/GB
+share/postgresql/timezone/GB-Eire
+share/postgresql/timezone/GMT
+share/postgresql/timezone/GMT+0
+share/postgresql/timezone/GMT-0
+share/postgresql/timezone/GMT0
+share/postgresql/timezone/Greenwich
+share/postgresql/timezone/HST
+share/postgresql/timezone/Hongkong
+share/postgresql/timezone/Iceland
+share/postgresql/timezone/Indian/Antananarivo
+share/postgresql/timezone/Indian/Chagos
+share/postgresql/timezone/Indian/Christmas
+share/postgresql/timezone/Indian/Cocos
+share/postgresql/timezone/Indian/Comoro
+share/postgresql/timezone/Indian/Kerguelen
+share/postgresql/timezone/Indian/Mahe
+share/postgresql/timezone/Indian/Maldives
+share/postgresql/timezone/Indian/Mauritius
+share/postgresql/timezone/Indian/Mayotte
+share/postgresql/timezone/Indian/Reunion
+share/postgresql/timezone/Iran
+share/postgresql/timezone/Israel
+share/postgresql/timezone/Jamaica
+share/postgresql/timezone/Japan
+share/postgresql/timezone/Kwajalein
+share/postgresql/timezone/Libya
+share/postgresql/timezone/MET
+share/postgresql/timezone/MST
+share/postgresql/timezone/MST7MDT
+share/postgresql/timezone/Mexico/BajaNorte
+share/postgresql/timezone/Mexico/BajaSur
+share/postgresql/timezone/Mexico/General
+share/postgresql/timezone/Mideast/Riyadh87
+share/postgresql/timezone/Mideast/Riyadh88
+share/postgresql/timezone/Mideast/Riyadh89
+share/postgresql/timezone/NZ
+share/postgresql/timezone/NZ-CHAT
+share/postgresql/timezone/Navajo
+share/postgresql/timezone/PRC
+share/postgresql/timezone/PST8PDT
+share/postgresql/timezone/Pacific/Apia
+share/postgresql/timezone/Pacific/Auckland
+share/postgresql/timezone/Pacific/Chatham
+share/postgresql/timezone/Pacific/Chuuk
+share/postgresql/timezone/Pacific/Easter
+share/postgresql/timezone/Pacific/Efate
+share/postgresql/timezone/Pacific/Enderbury
+share/postgresql/timezone/Pacific/Fakaofo
+share/postgresql/timezone/Pacific/Fiji
+share/postgresql/timezone/Pacific/Funafuti
+share/postgresql/timezone/Pacific/Galapagos
+share/postgresql/timezone/Pacific/Gambier
+share/postgresql/timezone/Pacific/Guadalcanal
+share/postgresql/timezone/Pacific/Guam
+share/postgresql/timezone/Pacific/Honolulu
+share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Kiritimati
+share/postgresql/timezone/Pacific/Kosrae
+share/postgresql/timezone/Pacific/Kwajalein
+share/postgresql/timezone/Pacific/Majuro
+share/postgresql/timezone/Pacific/Marquesas
+share/postgresql/timezone/Pacific/Midway
+share/postgresql/timezone/Pacific/Nauru
+share/postgresql/timezone/Pacific/Niue
+share/postgresql/timezone/Pacific/Norfolk
+share/postgresql/timezone/Pacific/Noumea
+share/postgresql/timezone/Pacific/Pago_Pago
+share/postgresql/timezone/Pacific/Palau
+share/postgresql/timezone/Pacific/Pitcairn
+share/postgresql/timezone/Pacific/Pohnpei
+share/postgresql/timezone/Pacific/Ponape
+share/postgresql/timezone/Pacific/Port_Moresby
+share/postgresql/timezone/Pacific/Rarotonga
+share/postgresql/timezone/Pacific/Saipan
+share/postgresql/timezone/Pacific/Samoa
+share/postgresql/timezone/Pacific/Tahiti
+share/postgresql/timezone/Pacific/Tarawa
+share/postgresql/timezone/Pacific/Tongatapu
+share/postgresql/timezone/Pacific/Truk
+share/postgresql/timezone/Pacific/Wake
+share/postgresql/timezone/Pacific/Wallis
+share/postgresql/timezone/Pacific/Yap
+share/postgresql/timezone/Poland
+share/postgresql/timezone/Portugal
+share/postgresql/timezone/ROC
+share/postgresql/timezone/ROK
+share/postgresql/timezone/Singapore
+share/postgresql/timezone/Turkey
+share/postgresql/timezone/UCT
+share/postgresql/timezone/US/Alaska
+share/postgresql/timezone/US/Aleutian
+share/postgresql/timezone/US/Arizona
+share/postgresql/timezone/US/Central
+share/postgresql/timezone/US/East-Indiana
+share/postgresql/timezone/US/Eastern
+share/postgresql/timezone/US/Hawaii
+share/postgresql/timezone/US/Indiana-Starke
+share/postgresql/timezone/US/Michigan
+share/postgresql/timezone/US/Mountain
+share/postgresql/timezone/US/Pacific
+share/postgresql/timezone/US/Pacific-New
+share/postgresql/timezone/US/Samoa
+share/postgresql/timezone/UTC
+share/postgresql/timezone/Universal
+share/postgresql/timezone/W-SU
+share/postgresql/timezone/WET
+share/postgresql/timezone/Zulu
+share/postgresql/timezone/posixrules
+share/postgresql/timezonesets/Africa.txt
+share/postgresql/timezonesets/America.txt
+share/postgresql/timezonesets/Antarctica.txt
+share/postgresql/timezonesets/Asia.txt
+share/postgresql/timezonesets/Atlantic.txt
+share/postgresql/timezonesets/Australia
+share/postgresql/timezonesets/Australia.txt
+share/postgresql/timezonesets/Default
+share/postgresql/timezonesets/Etc.txt
+share/postgresql/timezonesets/Europe.txt
+share/postgresql/timezonesets/India
+share/postgresql/timezonesets/Indian.txt
+share/postgresql/timezonesets/Pacific.txt
+share/postgresql/tsearch_data/danish.stop
+share/postgresql/tsearch_data/dutch.stop
+share/postgresql/tsearch_data/english.stop
+share/postgresql/tsearch_data/finnish.stop
+share/postgresql/tsearch_data/french.stop
+share/postgresql/tsearch_data/german.stop
+share/postgresql/tsearch_data/hungarian.stop
+share/postgresql/tsearch_data/hunspell_sample.affix
+share/postgresql/tsearch_data/ispell_sample.affix
+share/postgresql/tsearch_data/ispell_sample.dict
+share/postgresql/tsearch_data/italian.stop
+share/postgresql/tsearch_data/norwegian.stop
+share/postgresql/tsearch_data/portuguese.stop
+share/postgresql/tsearch_data/russian.stop
+share/postgresql/tsearch_data/spanish.stop
+share/postgresql/tsearch_data/swedish.stop
+share/postgresql/tsearch_data/synonym_sample.syn
+share/postgresql/tsearch_data/thesaurus_sample.ths
+share/postgresql/tsearch_data/turkish.stop
diff --git a/databases/postgresql90-server/files/pgsql.sh b/databases/postgresql90-server/files/pgsql.sh
index 812b24e5228..1f661d37017 100644
--- a/databases/postgresql90-server/files/pgsql.sh
+++ b/databases/postgresql90-server/files/pgsql.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgsql.sh,v 1.1.1.1 2010/09/21 07:52:57 adam Exp $
+# $NetBSD: pgsql.sh,v 1.2 2010/12/19 09:53:29 adam Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -12,28 +12,32 @@
 #
 # pgsql=YES
 #
-# The following variables are optional:
-#
+# Optionally, "pgsql_flags" contains options for the PostgreSQL postmaster, e.g.
 #	pgsql_flags="-i"		# allows TCP/IP connections
 #	pgsql_flags="-i -l"		# enables SSL connections
 #	pgsql_home="/path/to/home"	# path to pgsql database directory
-#
-# "pgsql_flags" contains options for the PostgreSQL postmaster.  See
-# postmaster(1) for possible options.
+# See postmaster(1) for possible options.
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
 name="pgsql"
-rcvar=$name
+rcvar=${name}
+command="@PREFIX@/bin/pg_ctl"
+procname="@PREFIX@/bin/postgres"
 pgsql_user="@PGUSER@"
 pgsql_group="@PGGROUP@"
-eval pgsql_home="~$pgsql_user"
+pgsql_home="@PGHOME@"
 
-command="@PG_PREFIX@/bin/postmaster"
-ctl_command="@PG_PREFIX@/bin/pg_ctl"
-extra_commands="initdb"
+extra_commands="initdb reload"
+initdb_cmd="pgsql_initdb"
+start_precmd="pgsql_precmd"
+start_cmd="pgsql_start"
+restart_precmd="pgsql_precmd"
+restart_cmd="pgsql_restart"
+stop_cmd="pgsql_stop"
+reload_cmd="pgsql_reload"
 
 if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
 	load_rc_config $name
@@ -41,21 +45,14 @@ elif [ -f /etc/rc.conf ]; then
 	. /etc/rc.conf
 fi
 
-pidfile="${pgsql_home}/data/postmaster.pid"
-common_args="-D ${pgsql_home}/data -m fast"
-start_command_args="-w -s -l ${pgsql_home}/errlog"
-stop_command_args="-s"
-
-initdb_cmd="pgsql_initdb"
-start_precmd="pgsql_precmd"
-start_cmd="pgsql_doit start"
-restart_cmd="pgsql_doit restart"
-stop_cmd="pgsql_doit stop"
-
-ulimit -n 4096
+command_args="-w -s -D ${pgsql_home}/data -m fast -l ${pgsql_home}/errlog"
+if [ -n "${pgsql_flags}" ]; then
+	command_args="${command_args} -o \\\"${pgsql_flags}\\\""
+fi
 
 pgsql_precmd()
 {
+	ulimit -n 4096
 	if [ ! -d ${pgsql_home}/data/base ]; then
 		pgsql_initdb
 	fi
@@ -63,13 +60,6 @@ pgsql_precmd()
 
 pgsql_initdb()
 {
-	initdb="@PG_PREFIX@/bin/initdb"
-
-	cd /
-
-	if [ ! -x ${initdb} ]; then
-		return 1
-	fi
 	if [ -d ${pgsql_home}/data/base ]; then
 		@ECHO@ "The PostgreSQL template databases have already been initialized."
 		@ECHO@ "Skipping database initialization."
@@ -78,67 +68,59 @@ pgsql_initdb()
 		@MKDIR@ -p ${pgsql_home}
 		@CHOWN@ ${pgsql_user} ${pgsql_home}
 		@CHGRP@ ${pgsql_group} ${pgsql_home}
-		@CHMOD@ 0750 ${pgsql_home}
-		common_args_without_m=$(echo "${common_args}" |\
-		    sed -e 's/-m [a-z]*//')
-		eval doit_command=\"${initdb} ${common_args_without_m} ${flags}\"
-		doit="@SU@ -m ${pgsql_user} -c '${doit_command}'"
+		@CHMOD@ 0700 ${pgsql_home}
+		doit="@SU@ -m ${pgsql_user} -c '${command} init ${command_args}'"
 		eval $doit
 	fi
 }
 
-pgsql_doit()
+pgsql_start()
 {
-	action=$1
-
-	cd /
-
-	case ${action} in
-	start|restart)
-		if [ -n "${pgsql_flags}" ]; then
-			start_command_args="${start_command_args} -o \\\"${pgsql_flags}\\\""
-		fi
-		command_args="${common_args} ${start_command_args} ${command_args}"
-		;;
-	stop)
-		command_args="${common_args} ${stop_command_args} ${command_args}"
-		;;
-	*)
-		command_args="${common_args} ${command_args}"
-		;;
-	esac
+	@ECHO@ "Starting ${name}."
+	doit="@SU@ -m ${pgsql_user} -c '${command} start ${command_args}'"
+	eval $doit
+}
 
-	if [ ! -x ${ctl_command} ]; then
-		return
-	fi
+pgsql_restart()
+{
+	@ECHO@ "Restarting ${name}."
+	doit="@SU@ -m ${pgsql_user} -c '${command} restart ${command_args}'"
+	eval $doit
+}
 
-	case ${action} in
-	start)		@ECHO@ "Starting ${name}." ;;
-	stop)		@ECHO@ "Stopping ${name}." ;;
-	restart)	@ECHO@ "Restarting ${name}." ;;
-	esac
+pgsql_stop()
+{
+	@ECHO@ "Stopping ${name}."
+	doit="@SU@ -m ${pgsql_user} -c '${command} stop ${command_args}'"
+	eval $doit
+}
 
-	eval doit_command=\"${ctl_command} ${action} ${command_args}\"
-	doit="@SU@ -m ${pgsql_user} -c '${doit_command}'"
+pgsql_reload()
+{
+	@ECHO@ "Reloading ${name}."
+	doit="@SU@ -m ${pgsql_user} -c '${command} reload ${command_args}'"
 	eval $doit
 }
 
 if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
-	load_rc_config $name
 	run_rc_command "$1"
 else
-	if [ -f /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
+	pidfile="${pgsql_home}/data/postmaster.pid"
 	case "$1" in
 	initdb)
 		eval ${initdb_cmd}
 		;;
 	restart)
+		eval ${restart_precmd}
 		eval ${restart_cmd}
 		;;
 	stop)
-		eval ${stop_cmd}
+		if [ -r "${pidfile}" ]; then
+			eval ${stop_cmd}
+		fi
+		;;
+	reload)
+		eval ${reload_cmd}
 		;;
 	*)
 		eval ${start_precmd}