summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/postgresql91-contrib/DESCR4
-rw-r--r--databases/postgresql91-contrib/Makefile75
-rw-r--r--databases/postgresql91-contrib/PLIST172
-rw-r--r--databases/postgresql91/Makefile.common3
-rw-r--r--databases/postgresql92-contrib/DESCR4
-rw-r--r--databases/postgresql92-contrib/Makefile77
-rw-r--r--databases/postgresql92-contrib/PLIST178
-rw-r--r--databases/postgresql92/Makefile.common3
-rw-r--r--databases/postgresql93-contrib/DESCR4
-rw-r--r--databases/postgresql93-contrib/Makefile79
-rw-r--r--databases/postgresql93-contrib/PLIST188
-rw-r--r--databases/postgresql93/Makefile.common3
-rw-r--r--databases/postgresql94-contrib/DESCR4
-rw-r--r--databases/postgresql94-contrib/Makefile80
-rw-r--r--databases/postgresql94-contrib/PLIST202
-rw-r--r--databases/postgresql94/Makefile.common3
-rw-r--r--databases/postgresql95-contrib/DESCR4
-rw-r--r--databases/postgresql95-contrib/Makefile72
-rw-r--r--databases/postgresql95-contrib/PLIST195
-rw-r--r--databases/postgresql95/Makefile.common3
20 files changed, 1348 insertions, 5 deletions
diff --git a/databases/postgresql91-contrib/DESCR b/databases/postgresql91-contrib/DESCR
new file mode 100644
index 00000000000..be9981a85f4
--- /dev/null
+++ b/databases/postgresql91-contrib/DESCR
@@ -0,0 +1,4 @@
+This subtree contains porting tools, analysis utilities, and plug-in
+features that are not part of the core PostgreSQL system, mainly because
+they address a limited audience or are too experimental to be part of
+the main source tree. This does not preclude their usefulness.
diff --git a/databases/postgresql91-contrib/Makefile b/databases/postgresql91-contrib/Makefile
new file mode 100644
index 00000000000..da7346c56e9
--- /dev/null
+++ b/databases/postgresql91-contrib/Makefile
@@ -0,0 +1,75 @@
+# $NetBSD: Makefile,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+
+PKGNAME= ${DISTNAME:C/-/91-contrib-/}
+COMMENT= Contrib subtree of tools and plug-ins
+
+.include "../../databases/postgresql91/Makefile.common"
+
+DEPENDS+= postgresql91-server>=${PKGVERSION_NOREV}:../../databases/postgresql91-server
+
+BUILD_MAKE_FLAGS+= USE_PGXS=1
+
+BUILD_DIRS+= contrib/adminpack
+BUILD_DIRS+= contrib/auth_delay
+BUILD_DIRS+= contrib/auto_explain
+BUILD_DIRS+= contrib/btree_gin
+BUILD_DIRS+= contrib/btree_gist
+BUILD_DIRS+= contrib/chkpass
+BUILD_DIRS+= contrib/citext
+BUILD_DIRS+= contrib/cube
+BUILD_DIRS+= contrib/dblink
+BUILD_DIRS+= contrib/dict_int
+BUILD_DIRS+= contrib/dict_xsyn
+BUILD_DIRS+= contrib/dummy_seclabel
+BUILD_DIRS+= contrib/earthdistance
+BUILD_DIRS+= contrib/file_fdw
+BUILD_DIRS+= contrib/fuzzystrmatch
+BUILD_DIRS+= contrib/hstore
+BUILD_DIRS+= contrib/intagg
+BUILD_DIRS+= contrib/intarray
+BUILD_DIRS+= contrib/isn
+BUILD_DIRS+= contrib/lo
+BUILD_DIRS+= contrib/ltree
+BUILD_DIRS+= contrib/oid2name
+BUILD_DIRS+= contrib/pageinspect
+BUILD_DIRS+= contrib/passwordcheck
+BUILD_DIRS+= contrib/pg_archivecleanup
+BUILD_DIRS+= contrib/pg_buffercache
+BUILD_DIRS+= contrib/pg_freespacemap
+BUILD_DIRS+= contrib/pg_standby
+BUILD_DIRS+= contrib/pg_stat_statements
+BUILD_DIRS+= contrib/pg_test_fsync
+BUILD_DIRS+= contrib/pg_trgm
+BUILD_DIRS+= contrib/pg_upgrade
+BUILD_DIRS+= contrib/pg_upgrade_support
+BUILD_DIRS+= contrib/pgbench
+BUILD_DIRS+= contrib/pgcrypto
+BUILD_DIRS+= contrib/pgrowlocks
+BUILD_DIRS+= contrib/pgstattuple
+BUILD_DIRS+= contrib/seg
+BUILD_DIRS+= contrib/spi
+BUILD_DIRS+= contrib/sslinfo
+BUILD_DIRS+= contrib/tablefunc
+BUILD_DIRS+= contrib/test_parser
+BUILD_DIRS+= contrib/tsearch2
+BUILD_DIRS+= contrib/unaccent
+BUILD_DIRS+= contrib/vacuumlo
+
+CONFIGURE_ARGS+= --with-openssl
+CONFIGURE_ARGS+= --with-readline
+
+PLIST_VARS+= uuid
+.if ${OPSYS} != "Darwin"
+PLIST.uuid= yes
+CONFIGURE_ARGS+= --with-ossp-uuid
+BUILD_DIRS+= contrib/uuid-ossp
+# because global pg_config.h is included, we have to define this
+BUILD_MAKE_FLAGS+= PG_CPPFLAGS=-DHAVE_UUID_H
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
+PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../databases/postgresql91-client/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql91-contrib/PLIST b/databases/postgresql91-contrib/PLIST
new file mode 100644
index 00000000000..f4fb25db683
--- /dev/null
+++ b/databases/postgresql91-contrib/PLIST
@@ -0,0 +1,172 @@
+@comment $NetBSD: PLIST,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+bin/oid2name
+bin/pg_archivecleanup
+bin/pg_standby
+bin/pg_test_fsync
+bin/pg_upgrade
+bin/pgbench
+bin/vacuumlo
+lib/postgresql/_int.so
+lib/postgresql/adminpack.so
+lib/postgresql/auth_delay.so
+lib/postgresql/auto_explain.so
+lib/postgresql/autoinc.so
+lib/postgresql/btree_gin.so
+lib/postgresql/btree_gist.so
+lib/postgresql/chkpass.so
+lib/postgresql/citext.so
+lib/postgresql/cube.so
+lib/postgresql/dblink.so
+lib/postgresql/dict_int.so
+lib/postgresql/dict_xsyn.so
+lib/postgresql/dummy_seclabel.so
+lib/postgresql/earthdistance.so
+lib/postgresql/file_fdw.so
+lib/postgresql/fuzzystrmatch.so
+lib/postgresql/hstore.so
+lib/postgresql/insert_username.so
+lib/postgresql/isn.so
+lib/postgresql/lo.so
+lib/postgresql/ltree.so
+lib/postgresql/moddatetime.so
+lib/postgresql/pageinspect.so
+lib/postgresql/passwordcheck.so
+lib/postgresql/pg_buffercache.so
+lib/postgresql/pg_freespacemap.so
+lib/postgresql/pg_stat_statements.so
+lib/postgresql/pg_trgm.so
+lib/postgresql/pg_upgrade_support.so
+lib/postgresql/pgcrypto.so
+lib/postgresql/pgrowlocks.so
+lib/postgresql/pgstattuple.so
+lib/postgresql/refint.so
+lib/postgresql/seg.so
+lib/postgresql/sslinfo.so
+lib/postgresql/tablefunc.so
+lib/postgresql/test_parser.so
+lib/postgresql/timetravel.so
+lib/postgresql/tsearch2.so
+lib/postgresql/unaccent.so
+${PLIST.uuid}lib/postgresql/uuid-ossp.so
+share/doc/postgresql/extension/autoinc.example
+share/doc/postgresql/extension/insert_username.example
+share/doc/postgresql/extension/moddatetime.example
+share/doc/postgresql/extension/refint.example
+share/doc/postgresql/extension/timetravel.example
+share/postgresql/extension/adminpack--1.0.sql
+share/postgresql/extension/adminpack.control
+share/postgresql/extension/autoinc--1.0.sql
+share/postgresql/extension/autoinc--unpackaged--1.0.sql
+share/postgresql/extension/autoinc.control
+share/postgresql/extension/btree_gin--1.0.sql
+share/postgresql/extension/btree_gin--unpackaged--1.0.sql
+share/postgresql/extension/btree_gin.control
+share/postgresql/extension/btree_gist--1.0.sql
+share/postgresql/extension/btree_gist--unpackaged--1.0.sql
+share/postgresql/extension/btree_gist.control
+share/postgresql/extension/chkpass--1.0.sql
+share/postgresql/extension/chkpass--unpackaged--1.0.sql
+share/postgresql/extension/chkpass.control
+share/postgresql/extension/citext--1.0--1.1.sql
+share/postgresql/extension/citext--1.0.sql
+share/postgresql/extension/citext--1.1--1.0.sql
+share/postgresql/extension/citext--1.1.sql
+share/postgresql/extension/citext--unpackaged--1.0.sql
+share/postgresql/extension/citext.control
+share/postgresql/extension/cube--1.0.sql
+share/postgresql/extension/cube--unpackaged--1.0.sql
+share/postgresql/extension/cube.control
+share/postgresql/extension/dblink--1.0.sql
+share/postgresql/extension/dblink--unpackaged--1.0.sql
+share/postgresql/extension/dblink.control
+share/postgresql/extension/dict_int--1.0.sql
+share/postgresql/extension/dict_int--unpackaged--1.0.sql
+share/postgresql/extension/dict_int.control
+share/postgresql/extension/dict_xsyn--1.0.sql
+share/postgresql/extension/dict_xsyn--unpackaged--1.0.sql
+share/postgresql/extension/dict_xsyn.control
+share/postgresql/extension/earthdistance--1.0.sql
+share/postgresql/extension/earthdistance--unpackaged--1.0.sql
+share/postgresql/extension/earthdistance.control
+share/postgresql/extension/file_fdw--1.0.sql
+share/postgresql/extension/file_fdw.control
+share/postgresql/extension/fuzzystrmatch--1.0.sql
+share/postgresql/extension/fuzzystrmatch--unpackaged--1.0.sql
+share/postgresql/extension/fuzzystrmatch.control
+share/postgresql/extension/hstore--1.0.sql
+share/postgresql/extension/hstore--unpackaged--1.0.sql
+share/postgresql/extension/hstore.control
+share/postgresql/extension/insert_username--1.0.sql
+share/postgresql/extension/insert_username--unpackaged--1.0.sql
+share/postgresql/extension/insert_username.control
+share/postgresql/extension/intagg--1.0.sql
+share/postgresql/extension/intagg--unpackaged--1.0.sql
+share/postgresql/extension/intagg.control
+share/postgresql/extension/intarray--1.0.sql
+share/postgresql/extension/intarray--unpackaged--1.0.sql
+share/postgresql/extension/intarray.control
+share/postgresql/extension/isn--1.0.sql
+share/postgresql/extension/isn--unpackaged--1.0.sql
+share/postgresql/extension/isn.control
+share/postgresql/extension/lo--1.0.sql
+share/postgresql/extension/lo--unpackaged--1.0.sql
+share/postgresql/extension/lo.control
+share/postgresql/extension/ltree--1.0.sql
+share/postgresql/extension/ltree--unpackaged--1.0.sql
+share/postgresql/extension/ltree.control
+share/postgresql/extension/moddatetime--1.0.sql
+share/postgresql/extension/moddatetime--unpackaged--1.0.sql
+share/postgresql/extension/moddatetime.control
+share/postgresql/extension/pageinspect--1.0.sql
+share/postgresql/extension/pageinspect--unpackaged--1.0.sql
+share/postgresql/extension/pageinspect.control
+share/postgresql/extension/pg_buffercache--1.0.sql
+share/postgresql/extension/pg_buffercache--unpackaged--1.0.sql
+share/postgresql/extension/pg_buffercache.control
+share/postgresql/extension/pg_freespacemap--1.0.sql
+share/postgresql/extension/pg_freespacemap--unpackaged--1.0.sql
+share/postgresql/extension/pg_freespacemap.control
+share/postgresql/extension/pg_stat_statements--1.0.sql
+share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
+share/postgresql/extension/pg_stat_statements.control
+share/postgresql/extension/pg_trgm--1.0.sql
+share/postgresql/extension/pg_trgm--unpackaged--1.0.sql
+share/postgresql/extension/pg_trgm.control
+share/postgresql/extension/pgcrypto--1.0.sql
+share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
+share/postgresql/extension/pgcrypto.control
+share/postgresql/extension/pgrowlocks--1.0.sql
+share/postgresql/extension/pgrowlocks--unpackaged--1.0.sql
+share/postgresql/extension/pgrowlocks.control
+share/postgresql/extension/pgstattuple--1.0.sql
+share/postgresql/extension/pgstattuple--unpackaged--1.0.sql
+share/postgresql/extension/pgstattuple.control
+share/postgresql/extension/refint--1.0.sql
+share/postgresql/extension/refint--unpackaged--1.0.sql
+share/postgresql/extension/refint.control
+share/postgresql/extension/seg--1.0.sql
+share/postgresql/extension/seg--unpackaged--1.0.sql
+share/postgresql/extension/seg.control
+share/postgresql/extension/sslinfo--1.0.sql
+share/postgresql/extension/sslinfo--unpackaged--1.0.sql
+share/postgresql/extension/sslinfo.control
+share/postgresql/extension/tablefunc--1.0.sql
+share/postgresql/extension/tablefunc--unpackaged--1.0.sql
+share/postgresql/extension/tablefunc.control
+share/postgresql/extension/test_parser--1.0.sql
+share/postgresql/extension/test_parser--unpackaged--1.0.sql
+share/postgresql/extension/test_parser.control
+share/postgresql/extension/timetravel--1.0.sql
+share/postgresql/extension/timetravel--unpackaged--1.0.sql
+share/postgresql/extension/timetravel.control
+share/postgresql/extension/tsearch2--1.0.sql
+share/postgresql/extension/tsearch2--unpackaged--1.0.sql
+share/postgresql/extension/tsearch2.control
+share/postgresql/extension/unaccent--1.0.sql
+share/postgresql/extension/unaccent--unpackaged--1.0.sql
+share/postgresql/extension/unaccent.control
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp.control
+share/postgresql/tsearch_data/unaccent.rules
+share/postgresql/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql91/Makefile.common b/databases/postgresql91/Makefile.common
index 53153802433..4467074a48d 100644
--- a/databases/postgresql91/Makefile.common
+++ b/databases/postgresql91/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2016/05/23 14:27:34 adam Exp $
+# $NetBSD: Makefile.common,v 1.32 2016/06/19 20:48:28 fhajny Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -10,6 +10,7 @@
#
# used by databases/postgresql91-adminpack/Makefile
# used by databases/postgresql91-client/Makefile
+# used by databases/postgresql91-contrib/Makefile
# used by databases/postgresql91-datatypes/Makefile
# used by databases/postgresql91-dblink/Makefile
# used by databases/postgresql91-docs/Makefile
diff --git a/databases/postgresql92-contrib/DESCR b/databases/postgresql92-contrib/DESCR
new file mode 100644
index 00000000000..be9981a85f4
--- /dev/null
+++ b/databases/postgresql92-contrib/DESCR
@@ -0,0 +1,4 @@
+This subtree contains porting tools, analysis utilities, and plug-in
+features that are not part of the core PostgreSQL system, mainly because
+they address a limited audience or are too experimental to be part of
+the main source tree. This does not preclude their usefulness.
diff --git a/databases/postgresql92-contrib/Makefile b/databases/postgresql92-contrib/Makefile
new file mode 100644
index 00000000000..f5f309b80bf
--- /dev/null
+++ b/databases/postgresql92-contrib/Makefile
@@ -0,0 +1,77 @@
+# $NetBSD: Makefile,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+
+PKGNAME= ${DISTNAME:C/-/92-contrib-/}
+COMMENT= Contrib subtree of tools and plug-ins
+
+.include "../../databases/postgresql92/Makefile.common"
+
+DEPENDS+= postgresql92-server>=${PKGVERSION_NOREV}:../../databases/postgresql92-server
+
+BUILD_MAKE_FLAGS+= USE_PGXS=1
+
+BUILD_DIRS+= contrib/adminpack
+BUILD_DIRS+= contrib/auth_delay
+BUILD_DIRS+= contrib/auto_explain
+BUILD_DIRS+= contrib/btree_gin
+BUILD_DIRS+= contrib/btree_gist
+BUILD_DIRS+= contrib/chkpass
+BUILD_DIRS+= contrib/citext
+BUILD_DIRS+= contrib/cube
+BUILD_DIRS+= contrib/dblink
+BUILD_DIRS+= contrib/dict_int
+BUILD_DIRS+= contrib/dict_xsyn
+BUILD_DIRS+= contrib/dummy_seclabel
+BUILD_DIRS+= contrib/earthdistance
+BUILD_DIRS+= contrib/file_fdw
+BUILD_DIRS+= contrib/fuzzystrmatch
+BUILD_DIRS+= contrib/hstore
+BUILD_DIRS+= contrib/intagg
+BUILD_DIRS+= contrib/intarray
+BUILD_DIRS+= contrib/isn
+BUILD_DIRS+= contrib/lo
+BUILD_DIRS+= contrib/ltree
+BUILD_DIRS+= contrib/oid2name
+BUILD_DIRS+= contrib/pageinspect
+BUILD_DIRS+= contrib/passwordcheck
+BUILD_DIRS+= contrib/pg_archivecleanup
+BUILD_DIRS+= contrib/pg_buffercache
+BUILD_DIRS+= contrib/pg_freespacemap
+BUILD_DIRS+= contrib/pg_standby
+BUILD_DIRS+= contrib/pg_stat_statements
+BUILD_DIRS+= contrib/pg_test_fsync
+BUILD_DIRS+= contrib/pg_test_timing
+BUILD_DIRS+= contrib/pg_trgm
+BUILD_DIRS+= contrib/pg_upgrade
+BUILD_DIRS+= contrib/pg_upgrade_support
+BUILD_DIRS+= contrib/pgbench
+BUILD_DIRS+= contrib/pgcrypto
+BUILD_DIRS+= contrib/pgrowlocks
+BUILD_DIRS+= contrib/pgstattuple
+BUILD_DIRS+= contrib/seg
+BUILD_DIRS+= contrib/spi
+BUILD_DIRS+= contrib/sslinfo
+BUILD_DIRS+= contrib/tablefunc
+BUILD_DIRS+= contrib/tcn
+BUILD_DIRS+= contrib/test_parser
+BUILD_DIRS+= contrib/tsearch2
+BUILD_DIRS+= contrib/unaccent
+BUILD_DIRS+= contrib/vacuumlo
+
+CONFIGURE_ARGS+= --with-openssl
+CONFIGURE_ARGS+= --with-readline
+
+PLIST_VARS+= uuid
+.if ${OPSYS} != "Darwin"
+PLIST.uuid= yes
+CONFIGURE_ARGS+= --with-ossp-uuid
+BUILD_DIRS+= contrib/uuid-ossp
+# because global pg_config.h is included, we have to define this
+BUILD_MAKE_FLAGS+= PG_CPPFLAGS=-DHAVE_UUID_H
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
+PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../databases/postgresql92-client/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql92-contrib/PLIST b/databases/postgresql92-contrib/PLIST
new file mode 100644
index 00000000000..0ddb64359bd
--- /dev/null
+++ b/databases/postgresql92-contrib/PLIST
@@ -0,0 +1,178 @@
+@comment $NetBSD: PLIST,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+bin/oid2name
+bin/pg_archivecleanup
+bin/pg_standby
+bin/pg_test_fsync
+bin/pg_test_timing
+bin/pg_upgrade
+bin/pgbench
+bin/vacuumlo
+lib/postgresql/_int.so
+lib/postgresql/adminpack.so
+lib/postgresql/auth_delay.so
+lib/postgresql/auto_explain.so
+lib/postgresql/autoinc.so
+lib/postgresql/btree_gin.so
+lib/postgresql/btree_gist.so
+lib/postgresql/chkpass.so
+lib/postgresql/citext.so
+lib/postgresql/cube.so
+lib/postgresql/dblink.so
+lib/postgresql/dict_int.so
+lib/postgresql/dict_xsyn.so
+lib/postgresql/dummy_seclabel.so
+lib/postgresql/earthdistance.so
+lib/postgresql/file_fdw.so
+lib/postgresql/fuzzystrmatch.so
+lib/postgresql/hstore.so
+lib/postgresql/insert_username.so
+lib/postgresql/isn.so
+lib/postgresql/lo.so
+lib/postgresql/ltree.so
+lib/postgresql/moddatetime.so
+lib/postgresql/pageinspect.so
+lib/postgresql/passwordcheck.so
+lib/postgresql/pg_buffercache.so
+lib/postgresql/pg_freespacemap.so
+lib/postgresql/pg_stat_statements.so
+lib/postgresql/pg_trgm.so
+lib/postgresql/pg_upgrade_support.so
+lib/postgresql/pgcrypto.so
+lib/postgresql/pgrowlocks.so
+lib/postgresql/pgstattuple.so
+lib/postgresql/refint.so
+lib/postgresql/seg.so
+lib/postgresql/sslinfo.so
+lib/postgresql/tablefunc.so
+lib/postgresql/tcn.so
+lib/postgresql/test_parser.so
+lib/postgresql/timetravel.so
+lib/postgresql/tsearch2.so
+lib/postgresql/unaccent.so
+${PLIST.uuid}lib/postgresql/uuid-ossp.so
+share/doc/postgresql/extension/autoinc.example
+share/doc/postgresql/extension/insert_username.example
+share/doc/postgresql/extension/moddatetime.example
+share/doc/postgresql/extension/refint.example
+share/doc/postgresql/extension/timetravel.example
+share/postgresql/extension/adminpack--1.0.sql
+share/postgresql/extension/adminpack.control
+share/postgresql/extension/autoinc--1.0.sql
+share/postgresql/extension/autoinc--unpackaged--1.0.sql
+share/postgresql/extension/autoinc.control
+share/postgresql/extension/btree_gin--1.0.sql
+share/postgresql/extension/btree_gin--unpackaged--1.0.sql
+share/postgresql/extension/btree_gin.control
+share/postgresql/extension/btree_gist--1.0.sql
+share/postgresql/extension/btree_gist--unpackaged--1.0.sql
+share/postgresql/extension/btree_gist.control
+share/postgresql/extension/chkpass--1.0.sql
+share/postgresql/extension/chkpass--unpackaged--1.0.sql
+share/postgresql/extension/chkpass.control
+share/postgresql/extension/citext--1.0--1.1.sql
+share/postgresql/extension/citext--1.0.sql
+share/postgresql/extension/citext--1.1--1.0.sql
+share/postgresql/extension/citext--1.1.sql
+share/postgresql/extension/citext--unpackaged--1.0.sql
+share/postgresql/extension/citext.control
+share/postgresql/extension/cube--1.0.sql
+share/postgresql/extension/cube--unpackaged--1.0.sql
+share/postgresql/extension/cube.control
+share/postgresql/extension/dblink--1.0.sql
+share/postgresql/extension/dblink--unpackaged--1.0.sql
+share/postgresql/extension/dblink.control
+share/postgresql/extension/dict_int--1.0.sql
+share/postgresql/extension/dict_int--unpackaged--1.0.sql
+share/postgresql/extension/dict_int.control
+share/postgresql/extension/dict_xsyn--1.0.sql
+share/postgresql/extension/dict_xsyn--unpackaged--1.0.sql
+share/postgresql/extension/dict_xsyn.control
+share/postgresql/extension/earthdistance--1.0.sql
+share/postgresql/extension/earthdistance--unpackaged--1.0.sql
+share/postgresql/extension/earthdistance.control
+share/postgresql/extension/file_fdw--1.0.sql
+share/postgresql/extension/file_fdw.control
+share/postgresql/extension/fuzzystrmatch--1.0.sql
+share/postgresql/extension/fuzzystrmatch--unpackaged--1.0.sql
+share/postgresql/extension/fuzzystrmatch.control
+share/postgresql/extension/hstore--1.0--1.1.sql
+share/postgresql/extension/hstore--1.1.sql
+share/postgresql/extension/hstore--unpackaged--1.0.sql
+share/postgresql/extension/hstore.control
+share/postgresql/extension/insert_username--1.0.sql
+share/postgresql/extension/insert_username--unpackaged--1.0.sql
+share/postgresql/extension/insert_username.control
+share/postgresql/extension/intagg--1.0.sql
+share/postgresql/extension/intagg--unpackaged--1.0.sql
+share/postgresql/extension/intagg.control
+share/postgresql/extension/intarray--1.0.sql
+share/postgresql/extension/intarray--unpackaged--1.0.sql
+share/postgresql/extension/intarray.control
+share/postgresql/extension/isn--1.0.sql
+share/postgresql/extension/isn--unpackaged--1.0.sql
+share/postgresql/extension/isn.control
+share/postgresql/extension/lo--1.0.sql
+share/postgresql/extension/lo--unpackaged--1.0.sql
+share/postgresql/extension/lo.control
+share/postgresql/extension/ltree--1.0.sql
+share/postgresql/extension/ltree--unpackaged--1.0.sql
+share/postgresql/extension/ltree.control
+share/postgresql/extension/moddatetime--1.0.sql
+share/postgresql/extension/moddatetime--unpackaged--1.0.sql
+share/postgresql/extension/moddatetime.control
+share/postgresql/extension/pageinspect--1.0.sql
+share/postgresql/extension/pageinspect--unpackaged--1.0.sql
+share/postgresql/extension/pageinspect.control
+share/postgresql/extension/pg_buffercache--1.0.sql
+share/postgresql/extension/pg_buffercache--unpackaged--1.0.sql
+share/postgresql/extension/pg_buffercache.control
+share/postgresql/extension/pg_freespacemap--1.0.sql
+share/postgresql/extension/pg_freespacemap--unpackaged--1.0.sql
+share/postgresql/extension/pg_freespacemap.control
+share/postgresql/extension/pg_stat_statements--1.0--1.1.sql
+share/postgresql/extension/pg_stat_statements--1.1.sql
+share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
+share/postgresql/extension/pg_stat_statements.control
+share/postgresql/extension/pg_trgm--1.0.sql
+share/postgresql/extension/pg_trgm--unpackaged--1.0.sql
+share/postgresql/extension/pg_trgm.control
+share/postgresql/extension/pgcrypto--1.0.sql
+share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
+share/postgresql/extension/pgcrypto.control
+share/postgresql/extension/pgrowlocks--1.0.sql
+share/postgresql/extension/pgrowlocks--unpackaged--1.0.sql
+share/postgresql/extension/pgrowlocks.control
+share/postgresql/extension/pgstattuple--1.0.sql
+share/postgresql/extension/pgstattuple--unpackaged--1.0.sql
+share/postgresql/extension/pgstattuple.control
+share/postgresql/extension/refint--1.0.sql
+share/postgresql/extension/refint--unpackaged--1.0.sql
+share/postgresql/extension/refint.control
+share/postgresql/extension/seg--1.0.sql
+share/postgresql/extension/seg--unpackaged--1.0.sql
+share/postgresql/extension/seg.control
+share/postgresql/extension/sslinfo--1.0.sql
+share/postgresql/extension/sslinfo--unpackaged--1.0.sql
+share/postgresql/extension/sslinfo.control
+share/postgresql/extension/tablefunc--1.0.sql
+share/postgresql/extension/tablefunc--unpackaged--1.0.sql
+share/postgresql/extension/tablefunc.control
+share/postgresql/extension/tcn--1.0.sql
+share/postgresql/extension/tcn.control
+share/postgresql/extension/test_parser--1.0.sql
+share/postgresql/extension/test_parser--unpackaged--1.0.sql
+share/postgresql/extension/test_parser.control
+share/postgresql/extension/timetravel--1.0.sql
+share/postgresql/extension/timetravel--unpackaged--1.0.sql
+share/postgresql/extension/timetravel.control
+share/postgresql/extension/tsearch2--1.0.sql
+share/postgresql/extension/tsearch2--unpackaged--1.0.sql
+share/postgresql/extension/tsearch2.control
+share/postgresql/extension/unaccent--1.0.sql
+share/postgresql/extension/unaccent--unpackaged--1.0.sql
+share/postgresql/extension/unaccent.control
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp.control
+share/postgresql/tsearch_data/unaccent.rules
+share/postgresql/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common
index 229f4a9f273..202e7c8f061 100644
--- a/databases/postgresql92/Makefile.common
+++ b/databases/postgresql92/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2016/05/23 14:27:34 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2016/06/19 20:48:29 fhajny Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -10,6 +10,7 @@
#
# used by databases/postgresql92-adminpack/Makefile
# used by databases/postgresql92-client/Makefile
+# used by databases/postgresql92-contrib/Makefile
# used by databases/postgresql92-datatypes/Makefile
# used by databases/postgresql92-dblink/Makefile
# used by databases/postgresql92-docs/Makefile
diff --git a/databases/postgresql93-contrib/DESCR b/databases/postgresql93-contrib/DESCR
new file mode 100644
index 00000000000..be9981a85f4
--- /dev/null
+++ b/databases/postgresql93-contrib/DESCR
@@ -0,0 +1,4 @@
+This subtree contains porting tools, analysis utilities, and plug-in
+features that are not part of the core PostgreSQL system, mainly because
+they address a limited audience or are too experimental to be part of
+the main source tree. This does not preclude their usefulness.
diff --git a/databases/postgresql93-contrib/Makefile b/databases/postgresql93-contrib/Makefile
new file mode 100644
index 00000000000..2dd794457d8
--- /dev/null
+++ b/databases/postgresql93-contrib/Makefile
@@ -0,0 +1,79 @@
+# $NetBSD: Makefile,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+
+PKGNAME= ${DISTNAME:C/-/93-contrib-/}
+COMMENT= Contrib subtree of tools and plug-ins
+
+.include "../../databases/postgresql93/Makefile.common"
+
+DEPENDS+= postgresql93-server>=${PKGVERSION_NOREV}:../../databases/postgresql93-server
+
+BUILD_MAKE_FLAGS+= USE_PGXS=1
+
+BUILD_DIRS+= contrib/adminpack
+BUILD_DIRS+= contrib/auth_delay
+BUILD_DIRS+= contrib/auto_explain
+BUILD_DIRS+= contrib/btree_gin
+BUILD_DIRS+= contrib/btree_gist
+BUILD_DIRS+= contrib/chkpass
+BUILD_DIRS+= contrib/citext
+BUILD_DIRS+= contrib/cube
+BUILD_DIRS+= contrib/dblink
+BUILD_DIRS+= contrib/dict_int
+BUILD_DIRS+= contrib/dict_xsyn
+BUILD_DIRS+= contrib/dummy_seclabel
+BUILD_DIRS+= contrib/earthdistance
+BUILD_DIRS+= contrib/file_fdw
+BUILD_DIRS+= contrib/fuzzystrmatch
+BUILD_DIRS+= contrib/hstore
+BUILD_DIRS+= contrib/intagg
+BUILD_DIRS+= contrib/intarray
+BUILD_DIRS+= contrib/isn
+BUILD_DIRS+= contrib/lo
+BUILD_DIRS+= contrib/ltree
+BUILD_DIRS+= contrib/oid2name
+BUILD_DIRS+= contrib/pageinspect
+BUILD_DIRS+= contrib/passwordcheck
+BUILD_DIRS+= contrib/pg_archivecleanup
+BUILD_DIRS+= contrib/pg_buffercache
+BUILD_DIRS+= contrib/pg_freespacemap
+BUILD_DIRS+= contrib/pg_standby
+BUILD_DIRS+= contrib/pg_stat_statements
+BUILD_DIRS+= contrib/pg_test_fsync
+BUILD_DIRS+= contrib/pg_test_timing
+BUILD_DIRS+= contrib/pg_trgm
+BUILD_DIRS+= contrib/pg_upgrade
+BUILD_DIRS+= contrib/pg_upgrade_support
+BUILD_DIRS+= contrib/pgbench
+BUILD_DIRS+= contrib/pgcrypto
+BUILD_DIRS+= contrib/pgrowlocks
+BUILD_DIRS+= contrib/pgstattuple
+BUILD_DIRS+= contrib/postgres_fdw
+BUILD_DIRS+= contrib/seg
+BUILD_DIRS+= contrib/spi
+BUILD_DIRS+= contrib/sslinfo
+BUILD_DIRS+= contrib/tablefunc
+BUILD_DIRS+= contrib/tcn
+BUILD_DIRS+= contrib/test_parser
+BUILD_DIRS+= contrib/tsearch2
+BUILD_DIRS+= contrib/unaccent
+BUILD_DIRS+= contrib/vacuumlo
+BUILD_DIRS+= contrib/worker_spi
+
+CONFIGURE_ARGS+= --with-openssl
+CONFIGURE_ARGS+= --with-readline
+
+PLIST_VARS+= uuid
+.if ${OPSYS} != "Darwin"
+PLIST.uuid= yes
+CONFIGURE_ARGS+= --with-ossp-uuid
+BUILD_DIRS+= contrib/uuid-ossp
+# because global pg_config.h is included, we have to define this
+BUILD_MAKE_FLAGS+= PG_CPPFLAGS=-DHAVE_UUID_H
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
+PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../databases/postgresql93-client/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql93-contrib/PLIST b/databases/postgresql93-contrib/PLIST
new file mode 100644
index 00000000000..0e5cdaf9f82
--- /dev/null
+++ b/databases/postgresql93-contrib/PLIST
@@ -0,0 +1,188 @@
+@comment $NetBSD: PLIST,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+bin/oid2name
+bin/pg_archivecleanup
+bin/pg_standby
+bin/pg_test_fsync
+bin/pg_test_timing
+bin/pg_upgrade
+bin/pgbench
+bin/vacuumlo
+lib/postgresql/_int.so
+lib/postgresql/adminpack.so
+lib/postgresql/auth_delay.so
+lib/postgresql/auto_explain.so
+lib/postgresql/autoinc.so
+lib/postgresql/btree_gin.so
+lib/postgresql/btree_gist.so
+lib/postgresql/chkpass.so
+lib/postgresql/citext.so
+lib/postgresql/cube.so
+lib/postgresql/dblink.so
+lib/postgresql/dict_int.so
+lib/postgresql/dict_xsyn.so
+lib/postgresql/dummy_seclabel.so
+lib/postgresql/earthdistance.so
+lib/postgresql/file_fdw.so
+lib/postgresql/fuzzystrmatch.so
+lib/postgresql/hstore.so
+lib/postgresql/insert_username.so
+lib/postgresql/isn.so
+lib/postgresql/lo.so
+lib/postgresql/ltree.so
+lib/postgresql/moddatetime.so
+lib/postgresql/pageinspect.so
+lib/postgresql/passwordcheck.so
+lib/postgresql/pg_buffercache.so
+lib/postgresql/pg_freespacemap.so
+lib/postgresql/pg_stat_statements.so
+lib/postgresql/pg_trgm.so
+lib/postgresql/pg_upgrade_support.so
+lib/postgresql/pgcrypto.so
+lib/postgresql/pgrowlocks.so
+lib/postgresql/pgstattuple.so
+lib/postgresql/postgres_fdw.so
+lib/postgresql/refint.so
+lib/postgresql/seg.so
+lib/postgresql/sslinfo.so
+lib/postgresql/tablefunc.so
+lib/postgresql/tcn.so
+lib/postgresql/test_parser.so
+lib/postgresql/timetravel.so
+lib/postgresql/tsearch2.so
+lib/postgresql/unaccent.so
+${PLIST.uuid}lib/postgresql/uuid-ossp.so
+lib/postgresql/worker_spi.so
+share/doc/postgresql/extension/autoinc.example
+share/doc/postgresql/extension/insert_username.example
+share/doc/postgresql/extension/moddatetime.example
+share/doc/postgresql/extension/refint.example
+share/doc/postgresql/extension/timetravel.example
+share/postgresql/extension/adminpack--1.0.sql
+share/postgresql/extension/adminpack.control
+share/postgresql/extension/autoinc--1.0.sql
+share/postgresql/extension/autoinc--unpackaged--1.0.sql
+share/postgresql/extension/autoinc.control
+share/postgresql/extension/btree_gin--1.0.sql
+share/postgresql/extension/btree_gin--unpackaged--1.0.sql
+share/postgresql/extension/btree_gin.control
+share/postgresql/extension/btree_gist--1.0.sql
+share/postgresql/extension/btree_gist--unpackaged--1.0.sql
+share/postgresql/extension/btree_gist.control
+share/postgresql/extension/chkpass--1.0.sql
+share/postgresql/extension/chkpass--unpackaged--1.0.sql
+share/postgresql/extension/chkpass.control
+share/postgresql/extension/citext--1.0--1.1.sql
+share/postgresql/extension/citext--1.0.sql
+share/postgresql/extension/citext--1.1--1.0.sql
+share/postgresql/extension/citext--1.1.sql
+share/postgresql/extension/citext--unpackaged--1.0.sql
+share/postgresql/extension/citext.control
+share/postgresql/extension/cube--1.0.sql
+share/postgresql/extension/cube--unpackaged--1.0.sql
+share/postgresql/extension/cube.control
+share/postgresql/extension/dblink--1.0--1.1.sql
+share/postgresql/extension/dblink--1.1.sql
+share/postgresql/extension/dblink--unpackaged--1.0.sql
+share/postgresql/extension/dblink.control
+share/postgresql/extension/dict_int--1.0.sql
+share/postgresql/extension/dict_int--unpackaged--1.0.sql
+share/postgresql/extension/dict_int.control
+share/postgresql/extension/dict_xsyn--1.0.sql
+share/postgresql/extension/dict_xsyn--unpackaged--1.0.sql
+share/postgresql/extension/dict_xsyn.control
+share/postgresql/extension/earthdistance--1.0.sql
+share/postgresql/extension/earthdistance--unpackaged--1.0.sql
+share/postgresql/extension/earthdistance.control
+share/postgresql/extension/file_fdw--1.0.sql
+share/postgresql/extension/file_fdw.control
+share/postgresql/extension/fuzzystrmatch--1.0.sql
+share/postgresql/extension/fuzzystrmatch--unpackaged--1.0.sql
+share/postgresql/extension/fuzzystrmatch.control
+share/postgresql/extension/hstore--1.0--1.1.sql
+share/postgresql/extension/hstore--1.1--1.2.sql
+share/postgresql/extension/hstore--1.2.sql
+share/postgresql/extension/hstore--unpackaged--1.0.sql
+share/postgresql/extension/hstore.control
+share/postgresql/extension/insert_username--1.0.sql
+share/postgresql/extension/insert_username--unpackaged--1.0.sql
+share/postgresql/extension/insert_username.control
+share/postgresql/extension/intagg--1.0.sql
+share/postgresql/extension/intagg--unpackaged--1.0.sql
+share/postgresql/extension/intagg.control
+share/postgresql/extension/intarray--1.0.sql
+share/postgresql/extension/intarray--unpackaged--1.0.sql
+share/postgresql/extension/intarray.control
+share/postgresql/extension/isn--1.0.sql
+share/postgresql/extension/isn--unpackaged--1.0.sql
+share/postgresql/extension/isn.control
+share/postgresql/extension/lo--1.0.sql
+share/postgresql/extension/lo--unpackaged--1.0.sql
+share/postgresql/extension/lo.control
+share/postgresql/extension/ltree--1.0.sql
+share/postgresql/extension/ltree--unpackaged--1.0.sql
+share/postgresql/extension/ltree.control
+share/postgresql/extension/moddatetime--1.0.sql
+share/postgresql/extension/moddatetime--unpackaged--1.0.sql
+share/postgresql/extension/moddatetime.control
+share/postgresql/extension/pageinspect--1.0--1.1.sql
+share/postgresql/extension/pageinspect--1.1.sql
+share/postgresql/extension/pageinspect--unpackaged--1.0.sql
+share/postgresql/extension/pageinspect.control
+share/postgresql/extension/pg_buffercache--1.0.sql
+share/postgresql/extension/pg_buffercache--unpackaged--1.0.sql
+share/postgresql/extension/pg_buffercache.control
+share/postgresql/extension/pg_freespacemap--1.0.sql
+share/postgresql/extension/pg_freespacemap--unpackaged--1.0.sql
+share/postgresql/extension/pg_freespacemap.control
+share/postgresql/extension/pg_stat_statements--1.0--1.1.sql
+share/postgresql/extension/pg_stat_statements--1.1.sql
+share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
+share/postgresql/extension/pg_stat_statements.control
+share/postgresql/extension/pg_trgm--1.0--1.1.sql
+share/postgresql/extension/pg_trgm--1.1.sql
+share/postgresql/extension/pg_trgm--unpackaged--1.0.sql
+share/postgresql/extension/pg_trgm.control
+share/postgresql/extension/pgcrypto--1.0.sql
+share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
+share/postgresql/extension/pgcrypto.control
+share/postgresql/extension/pgrowlocks--1.0--1.1.sql
+share/postgresql/extension/pgrowlocks--1.1.sql
+share/postgresql/extension/pgrowlocks--unpackaged--1.0.sql
+share/postgresql/extension/pgrowlocks.control
+share/postgresql/extension/pgstattuple--1.0--1.1.sql
+share/postgresql/extension/pgstattuple--1.1.sql
+share/postgresql/extension/pgstattuple--unpackaged--1.0.sql
+share/postgresql/extension/pgstattuple.control
+share/postgresql/extension/postgres_fdw--1.0.sql
+share/postgresql/extension/postgres_fdw.control
+share/postgresql/extension/refint--1.0.sql
+share/postgresql/extension/refint--unpackaged--1.0.sql
+share/postgresql/extension/refint.control
+share/postgresql/extension/seg--1.0.sql
+share/postgresql/extension/seg--unpackaged--1.0.sql
+share/postgresql/extension/seg.control
+share/postgresql/extension/sslinfo--1.0.sql
+share/postgresql/extension/sslinfo--unpackaged--1.0.sql
+share/postgresql/extension/sslinfo.control
+share/postgresql/extension/tablefunc--1.0.sql
+share/postgresql/extension/tablefunc--unpackaged--1.0.sql
+share/postgresql/extension/tablefunc.control
+share/postgresql/extension/tcn--1.0.sql
+share/postgresql/extension/tcn.control
+share/postgresql/extension/test_parser--1.0.sql
+share/postgresql/extension/test_parser--unpackaged--1.0.sql
+share/postgresql/extension/test_parser.control
+share/postgresql/extension/timetravel--1.0.sql
+share/postgresql/extension/timetravel--unpackaged--1.0.sql
+share/postgresql/extension/timetravel.control
+share/postgresql/extension/tsearch2--1.0.sql
+share/postgresql/extension/tsearch2--unpackaged--1.0.sql
+share/postgresql/extension/tsearch2.control
+share/postgresql/extension/unaccent--1.0.sql
+share/postgresql/extension/unaccent--unpackaged--1.0.sql
+share/postgresql/extension/unaccent.control
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp.control
+share/postgresql/tsearch_data/unaccent.rules
+share/postgresql/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index 4ea457f9d42..966ef038036 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2016/05/23 14:27:34 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2016/06/19 20:48:29 fhajny Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -10,6 +10,7 @@
#
# used by databases/postgresql93-adminpack/Makefile
# used by databases/postgresql93-client/Makefile
+# used by databases/postgresql93-contrib/Makefile
# used by databases/postgresql93-datatypes/Makefile
# used by databases/postgresql93-dblink/Makefile
# used by databases/postgresql93-docs/Makefile
diff --git a/databases/postgresql94-contrib/DESCR b/databases/postgresql94-contrib/DESCR
new file mode 100644
index 00000000000..be9981a85f4
--- /dev/null
+++ b/databases/postgresql94-contrib/DESCR
@@ -0,0 +1,4 @@
+This subtree contains porting tools, analysis utilities, and plug-in
+features that are not part of the core PostgreSQL system, mainly because
+they address a limited audience or are too experimental to be part of
+the main source tree. This does not preclude their usefulness.
diff --git a/databases/postgresql94-contrib/Makefile b/databases/postgresql94-contrib/Makefile
new file mode 100644
index 00000000000..33e96d637c4
--- /dev/null
+++ b/databases/postgresql94-contrib/Makefile
@@ -0,0 +1,80 @@
+# $NetBSD: Makefile,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+
+PKGNAME= ${DISTNAME:C/-/94-contrib-/}
+COMMENT= Contrib subtree of tools and plug-ins
+
+.include "../../databases/postgresql94/Makefile.common"
+
+DEPENDS+= postgresql94-server>=${PKGVERSION_NOREV}:../../databases/postgresql94-server
+
+BUILD_MAKE_FLAGS= USE_PGXS=1
+
+BUILD_DIRS+= contrib/adminpack
+BUILD_DIRS+= contrib/auth_delay
+BUILD_DIRS+= contrib/auto_explain
+BUILD_DIRS+= contrib/btree_gin
+BUILD_DIRS+= contrib/btree_gist
+BUILD_DIRS+= contrib/chkpass
+BUILD_DIRS+= contrib/citext
+BUILD_DIRS+= contrib/cube
+BUILD_DIRS+= contrib/dblink
+BUILD_DIRS+= contrib/dict_int
+BUILD_DIRS+= contrib/dict_xsyn
+BUILD_DIRS+= contrib/dummy_seclabel
+BUILD_DIRS+= contrib/earthdistance
+BUILD_DIRS+= contrib/file_fdw
+BUILD_DIRS+= contrib/fuzzystrmatch
+BUILD_DIRS+= contrib/hstore
+BUILD_DIRS+= contrib/intagg
+BUILD_DIRS+= contrib/intarray
+BUILD_DIRS+= contrib/isn
+BUILD_DIRS+= contrib/lo
+BUILD_DIRS+= contrib/ltree
+BUILD_DIRS+= contrib/oid2name
+BUILD_DIRS+= contrib/pageinspect
+BUILD_DIRS+= contrib/passwordcheck
+BUILD_DIRS+= contrib/pg_archivecleanup
+BUILD_DIRS+= contrib/pg_buffercache
+BUILD_DIRS+= contrib/pg_freespacemap
+BUILD_DIRS+= contrib/pg_prewarm
+BUILD_DIRS+= contrib/pg_standby
+BUILD_DIRS+= contrib/pg_stat_statements
+BUILD_DIRS+= contrib/pg_test_fsync
+BUILD_DIRS+= contrib/pg_test_timing
+BUILD_DIRS+= contrib/pg_trgm
+BUILD_DIRS+= contrib/pg_upgrade
+BUILD_DIRS+= contrib/pg_upgrade_support
+BUILD_DIRS+= contrib/pgbench
+BUILD_DIRS+= contrib/pgcrypto
+BUILD_DIRS+= contrib/pgrowlocks
+BUILD_DIRS+= contrib/pgstattuple
+BUILD_DIRS+= contrib/postgres_fdw
+BUILD_DIRS+= contrib/seg
+BUILD_DIRS+= contrib/spi
+BUILD_DIRS+= contrib/sslinfo
+BUILD_DIRS+= contrib/tablefunc
+BUILD_DIRS+= contrib/tcn
+BUILD_DIRS+= contrib/test_decoding
+BUILD_DIRS+= contrib/test_parser
+BUILD_DIRS+= contrib/test_shm_mq
+BUILD_DIRS+= contrib/tsearch2
+BUILD_DIRS+= contrib/unaccent
+BUILD_DIRS+= contrib/vacuumlo
+BUILD_DIRS+= contrib/worker_spi
+
+CONFIGURE_ARGS+= --with-openssl
+
+PLIST_VARS+= uuid
+.if ${OPSYS} != "Darwin"
+PLIST.uuid= yes
+CONFIGURE_ARGS+= --with-uuid=ossp
+BUILD_DIRS+= contrib/uuid-ossp
+# because global pg_config.h is included, we have to define this
+BUILD_MAKE_FLAGS+= PG_CPPFLAGS=-DHAVE_UUID_H
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
+PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}
+
+.include "../../databases/postgresql94-client/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql94-contrib/PLIST b/databases/postgresql94-contrib/PLIST
new file mode 100644
index 00000000000..4624ae5245d
--- /dev/null
+++ b/databases/postgresql94-contrib/PLIST
@@ -0,0 +1,202 @@
+@comment $NetBSD: PLIST,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+bin/oid2name
+bin/pg_archivecleanup
+bin/pg_standby
+bin/pg_test_fsync
+bin/pg_test_timing
+bin/pg_upgrade
+bin/pgbench
+bin/vacuumlo
+lib/postgresql/_int.so
+lib/postgresql/adminpack.so
+lib/postgresql/auth_delay.so
+lib/postgresql/auto_explain.so
+lib/postgresql/autoinc.so
+lib/postgresql/btree_gin.so
+lib/postgresql/btree_gist.so
+lib/postgresql/chkpass.so
+lib/postgresql/citext.so
+lib/postgresql/cube.so
+lib/postgresql/dblink.so
+lib/postgresql/dict_int.so
+lib/postgresql/dict_xsyn.so
+lib/postgresql/dummy_seclabel.so
+lib/postgresql/earthdistance.so
+lib/postgresql/file_fdw.so
+lib/postgresql/fuzzystrmatch.so
+lib/postgresql/hstore.so
+lib/postgresql/insert_username.so
+lib/postgresql/isn.so
+lib/postgresql/lo.so
+lib/postgresql/ltree.so
+lib/postgresql/moddatetime.so
+lib/postgresql/pageinspect.so
+lib/postgresql/passwordcheck.so
+lib/postgresql/pg_buffercache.so
+lib/postgresql/pg_freespacemap.so
+lib/postgresql/pg_prewarm.so
+lib/postgresql/pg_stat_statements.so
+lib/postgresql/pg_trgm.so
+lib/postgresql/pg_upgrade_support.so
+lib/postgresql/pgcrypto.so
+lib/postgresql/pgrowlocks.so
+lib/postgresql/pgstattuple.so
+lib/postgresql/postgres_fdw.so
+lib/postgresql/refint.so
+lib/postgresql/seg.so
+lib/postgresql/sslinfo.so
+lib/postgresql/tablefunc.so
+lib/postgresql/tcn.so
+lib/postgresql/test_decoding.so
+lib/postgresql/test_parser.so
+lib/postgresql/test_shm_mq.so
+lib/postgresql/timetravel.so
+lib/postgresql/tsearch2.so
+lib/postgresql/unaccent.so
+${PLIST.uuid}lib/postgresql/uuid-ossp.so
+lib/postgresql/worker_spi.so
+share/doc/postgresql/extension/autoinc.example
+share/doc/postgresql/extension/insert_username.example
+share/doc/postgresql/extension/moddatetime.example
+share/doc/postgresql/extension/refint.example
+share/doc/postgresql/extension/timetravel.example
+share/postgresql/extension/adminpack--1.0.sql
+share/postgresql/extension/adminpack.control
+share/postgresql/extension/autoinc--1.0.sql
+share/postgresql/extension/autoinc--unpackaged--1.0.sql
+share/postgresql/extension/autoinc.control
+share/postgresql/extension/btree_gin--1.0.sql
+share/postgresql/extension/btree_gin--unpackaged--1.0.sql
+share/postgresql/extension/btree_gin.control
+share/postgresql/extension/btree_gist--1.0.sql
+share/postgresql/extension/btree_gist--unpackaged--1.0.sql
+share/postgresql/extension/btree_gist.control
+share/postgresql/extension/chkpass--1.0.sql
+share/postgresql/extension/chkpass--unpackaged--1.0.sql
+share/postgresql/extension/chkpass.control
+share/postgresql/extension/citext--1.0--1.1.sql
+share/postgresql/extension/citext--1.0.sql
+share/postgresql/extension/citext--1.1--1.0.sql
+share/postgresql/extension/citext--1.1.sql
+share/postgresql/extension/citext--unpackaged--1.0.sql
+share/postgresql/extension/citext.control
+share/postgresql/extension/cube--1.0.sql
+share/postgresql/extension/cube--unpackaged--1.0.sql
+share/postgresql/extension/cube.control
+share/postgresql/extension/dblink--1.0--1.1.sql
+share/postgresql/extension/dblink--1.1.sql
+share/postgresql/extension/dblink--unpackaged--1.0.sql
+share/postgresql/extension/dblink.control
+share/postgresql/extension/dict_int--1.0.sql
+share/postgresql/extension/dict_int--unpackaged--1.0.sql
+share/postgresql/extension/dict_int.control
+share/postgresql/extension/dict_xsyn--1.0.sql
+share/postgresql/extension/dict_xsyn--unpackaged--1.0.sql
+share/postgresql/extension/dict_xsyn.control
+share/postgresql/extension/earthdistance--1.0.sql
+share/postgresql/extension/earthdistance--unpackaged--1.0.sql
+share/postgresql/extension/earthdistance.control
+share/postgresql/extension/file_fdw--1.0.sql
+share/postgresql/extension/file_fdw.control
+share/postgresql/extension/fuzzystrmatch--1.0.sql
+share/postgresql/extension/fuzzystrmatch--unpackaged--1.0.sql
+share/postgresql/extension/fuzzystrmatch.control
+share/postgresql/extension/hstore--1.0--1.1.sql
+share/postgresql/extension/hstore--1.1--1.2.sql
+share/postgresql/extension/hstore--1.2--1.3.sql
+share/postgresql/extension/hstore--1.3.sql
+share/postgresql/extension/hstore--unpackaged--1.0.sql
+share/postgresql/extension/hstore.control
+share/postgresql/extension/insert_username--1.0.sql
+share/postgresql/extension/insert_username--unpackaged--1.0.sql
+share/postgresql/extension/insert_username.control
+share/postgresql/extension/intagg--1.0.sql
+share/postgresql/extension/intagg--unpackaged--1.0.sql
+share/postgresql/extension/intagg.control
+share/postgresql/extension/intarray--1.0.sql
+share/postgresql/extension/intarray--unpackaged--1.0.sql
+share/postgresql/extension/intarray.control
+share/postgresql/extension/isn--1.0.sql
+share/postgresql/extension/isn--unpackaged--1.0.sql
+share/postgresql/extension/isn.control
+share/postgresql/extension/lo--1.0.sql
+share/postgresql/extension/lo--unpackaged--1.0.sql
+share/postgresql/extension/lo.control
+share/postgresql/extension/ltree--1.0.sql
+share/postgresql/extension/ltree--unpackaged--1.0.sql
+share/postgresql/extension/ltree.control
+share/postgresql/extension/moddatetime--1.0.sql
+share/postgresql/extension/moddatetime--unpackaged--1.0.sql
+share/postgresql/extension/moddatetime.control
+share/postgresql/extension/pageinspect--1.0--1.1.sql
+share/postgresql/extension/pageinspect--1.1--1.2.sql
+share/postgresql/extension/pageinspect--1.2.sql
+share/postgresql/extension/pageinspect--unpackaged--1.0.sql
+share/postgresql/extension/pageinspect.control
+share/postgresql/extension/pg_buffercache--1.0.sql
+share/postgresql/extension/pg_buffercache--unpackaged--1.0.sql
+share/postgresql/extension/pg_buffercache.control
+share/postgresql/extension/pg_freespacemap--1.0.sql
+share/postgresql/extension/pg_freespacemap--unpackaged--1.0.sql
+share/postgresql/extension/pg_freespacemap.control
+share/postgresql/extension/pg_prewarm--1.0.sql
+share/postgresql/extension/pg_prewarm.control
+share/postgresql/extension/pg_stat_statements--1.0--1.1.sql
+share/postgresql/extension/pg_stat_statements--1.1--1.2.sql
+share/postgresql/extension/pg_stat_statements--1.2.sql
+share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
+share/postgresql/extension/pg_stat_statements.control
+share/postgresql/extension/pg_trgm--1.0--1.1.sql
+share/postgresql/extension/pg_trgm--1.1.sql
+share/postgresql/extension/pg_trgm--unpackaged--1.0.sql
+share/postgresql/extension/pg_trgm.control
+share/postgresql/extension/pgcrypto--1.0--1.1.sql
+share/postgresql/extension/pgcrypto--1.1.sql
+share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
+share/postgresql/extension/pgcrypto.control
+share/postgresql/extension/pgrowlocks--1.0--1.1.sql
+share/postgresql/extension/pgrowlocks--1.1.sql
+share/postgresql/extension/pgrowlocks--unpackaged--1.0.sql
+share/postgresql/extension/pgrowlocks.control
+share/postgresql/extension/pgstattuple--1.0--1.1.sql
+share/postgresql/extension/pgstattuple--1.1--1.2.sql
+share/postgresql/extension/pgstattuple--1.2.sql
+share/postgresql/extension/pgstattuple--unpackaged--1.0.sql
+share/postgresql/extension/pgstattuple.control
+share/postgresql/extension/postgres_fdw--1.0.sql
+share/postgresql/extension/postgres_fdw.control
+share/postgresql/extension/refint--1.0.sql
+share/postgresql/extension/refint--unpackaged--1.0.sql
+share/postgresql/extension/refint.control
+share/postgresql/extension/seg--1.0.sql
+share/postgresql/extension/seg--unpackaged--1.0.sql
+share/postgresql/extension/seg.control
+share/postgresql/extension/sslinfo--1.0.sql
+share/postgresql/extension/sslinfo--unpackaged--1.0.sql
+share/postgresql/extension/sslinfo.control
+share/postgresql/extension/tablefunc--1.0.sql
+share/postgresql/extension/tablefunc--unpackaged--1.0.sql
+share/postgresql/extension/tablefunc.control
+share/postgresql/extension/tcn--1.0.sql
+share/postgresql/extension/tcn.control
+share/postgresql/extension/test_parser--1.0.sql
+share/postgresql/extension/test_parser--unpackaged--1.0.sql
+share/postgresql/extension/test_parser.control
+share/postgresql/extension/test_shm_mq--1.0.sql
+share/postgresql/extension/test_shm_mq.control
+share/postgresql/extension/timetravel--1.0.sql
+share/postgresql/extension/timetravel--unpackaged--1.0.sql
+share/postgresql/extension/timetravel.control
+share/postgresql/extension/tsearch2--1.0.sql
+share/postgresql/extension/tsearch2--unpackaged--1.0.sql
+share/postgresql/extension/tsearch2.control
+share/postgresql/extension/unaccent--1.0.sql
+share/postgresql/extension/unaccent--unpackaged--1.0.sql
+share/postgresql/extension/unaccent.control
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp.control
+share/postgresql/extension/worker_spi--1.0.sql
+share/postgresql/extension/worker_spi.control
+share/postgresql/tsearch_data/unaccent.rules
+share/postgresql/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index 8f16550b43f..1b18b719288 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2016/05/23 14:27:35 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2016/06/19 20:48:29 fhajny Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -10,6 +10,7 @@
#
# used by databases/postgresql94-adminpack/Makefile
# used by databases/postgresql94-client/Makefile
+# used by databases/postgresql94-contrib/Makefile
# used by databases/postgresql94-datatypes/Makefile
# used by databases/postgresql94-dblink/Makefile
# used by databases/postgresql94-docs/Makefile
diff --git a/databases/postgresql95-contrib/DESCR b/databases/postgresql95-contrib/DESCR
new file mode 100644
index 00000000000..be9981a85f4
--- /dev/null
+++ b/databases/postgresql95-contrib/DESCR
@@ -0,0 +1,4 @@
+This subtree contains porting tools, analysis utilities, and plug-in
+features that are not part of the core PostgreSQL system, mainly because
+they address a limited audience or are too experimental to be part of
+the main source tree. This does not preclude their usefulness.
diff --git a/databases/postgresql95-contrib/Makefile b/databases/postgresql95-contrib/Makefile
new file mode 100644
index 00000000000..7954ecfd16c
--- /dev/null
+++ b/databases/postgresql95-contrib/Makefile
@@ -0,0 +1,72 @@
+# $NetBSD: Makefile,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+
+PKGNAME= ${DISTNAME:C/-/95-contrib-/}
+COMMENT= Contrib subtree of tools and plug-ins
+
+.include "../../databases/postgresql95/Makefile.common"
+
+DEPENDS+= postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server
+
+BUILD_MAKE_FLAGS= USE_PGXS=1
+
+BUILD_DIRS+= contrib/adminpack
+BUILD_DIRS+= contrib/auth_delay
+BUILD_DIRS+= contrib/auto_explain
+BUILD_DIRS+= contrib/btree_gin
+BUILD_DIRS+= contrib/btree_gist
+BUILD_DIRS+= contrib/chkpass
+BUILD_DIRS+= contrib/citext
+BUILD_DIRS+= contrib/cube
+BUILD_DIRS+= contrib/dblink
+BUILD_DIRS+= contrib/dict_int
+BUILD_DIRS+= contrib/dict_xsyn
+BUILD_DIRS+= contrib/earthdistance
+BUILD_DIRS+= contrib/file_fdw
+BUILD_DIRS+= contrib/fuzzystrmatch
+BUILD_DIRS+= contrib/hstore
+BUILD_DIRS+= contrib/intagg
+BUILD_DIRS+= contrib/intarray
+BUILD_DIRS+= contrib/isn
+BUILD_DIRS+= contrib/lo
+BUILD_DIRS+= contrib/ltree
+BUILD_DIRS+= contrib/oid2name
+BUILD_DIRS+= contrib/pageinspect
+BUILD_DIRS+= contrib/passwordcheck
+BUILD_DIRS+= contrib/pg_buffercache
+BUILD_DIRS+= contrib/pg_freespacemap
+BUILD_DIRS+= contrib/pg_prewarm
+BUILD_DIRS+= contrib/pg_standby
+BUILD_DIRS+= contrib/pg_stat_statements
+BUILD_DIRS+= contrib/pg_trgm
+BUILD_DIRS+= contrib/pgcrypto
+BUILD_DIRS+= contrib/pgrowlocks
+BUILD_DIRS+= contrib/pgstattuple
+BUILD_DIRS+= contrib/postgres_fdw
+BUILD_DIRS+= contrib/seg
+BUILD_DIRS+= contrib/spi
+BUILD_DIRS+= contrib/sslinfo
+BUILD_DIRS+= contrib/tablefunc
+BUILD_DIRS+= contrib/tcn
+BUILD_DIRS+= contrib/test_decoding
+BUILD_DIRS+= contrib/tsearch2
+BUILD_DIRS+= contrib/tsm_system_rows
+BUILD_DIRS+= contrib/tsm_system_time
+BUILD_DIRS+= contrib/unaccent
+BUILD_DIRS+= contrib/vacuumlo
+
+CONFIGURE_ARGS+= --with-openssl
+
+PLIST_VARS+= uuid
+.if ${OPSYS} != "Darwin"
+PLIST.uuid= yes
+CONFIGURE_ARGS+= --with-uuid=ossp
+BUILD_DIRS+= contrib/uuid-ossp
+# because global pg_config.h is included, we have to define this
+BUILD_MAKE_FLAGS+= PG_CPPFLAGS=-DHAVE_UUID_H
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
+PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}
+
+.include "../../databases/postgresql95-client/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql95-contrib/PLIST b/databases/postgresql95-contrib/PLIST
new file mode 100644
index 00000000000..f0e98f1b682
--- /dev/null
+++ b/databases/postgresql95-contrib/PLIST
@@ -0,0 +1,195 @@
+@comment $NetBSD: PLIST,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+bin/oid2name
+bin/pg_standby
+bin/vacuumlo
+lib/postgresql/_int.so
+lib/postgresql/adminpack.so
+lib/postgresql/auth_delay.so
+lib/postgresql/auto_explain.so
+lib/postgresql/autoinc.so
+lib/postgresql/btree_gin.so
+lib/postgresql/btree_gist.so
+lib/postgresql/chkpass.so
+lib/postgresql/citext.so
+lib/postgresql/cube.so
+lib/postgresql/dblink.so
+lib/postgresql/dict_int.so
+lib/postgresql/dict_xsyn.so
+lib/postgresql/earthdistance.so
+lib/postgresql/file_fdw.so
+lib/postgresql/fuzzystrmatch.so
+lib/postgresql/hstore.so
+lib/postgresql/insert_username.so
+lib/postgresql/isn.so
+lib/postgresql/lo.so
+lib/postgresql/ltree.so
+lib/postgresql/moddatetime.so
+lib/postgresql/pageinspect.so
+lib/postgresql/passwordcheck.so
+lib/postgresql/pg_buffercache.so
+lib/postgresql/pg_freespacemap.so
+lib/postgresql/pg_prewarm.so
+lib/postgresql/pg_stat_statements.so
+lib/postgresql/pg_trgm.so
+lib/postgresql/pgcrypto.so
+lib/postgresql/pgrowlocks.so
+lib/postgresql/pgstattuple.so
+lib/postgresql/postgres_fdw.so
+lib/postgresql/refint.so
+lib/postgresql/seg.so
+lib/postgresql/sslinfo.so
+lib/postgresql/tablefunc.so
+lib/postgresql/tcn.so
+lib/postgresql/test_decoding.so
+lib/postgresql/timetravel.so
+lib/postgresql/tsearch2.so
+lib/postgresql/tsm_system_rows.so
+lib/postgresql/tsm_system_time.so
+lib/postgresql/unaccent.so
+${PLIST.uuid}lib/postgresql/uuid-ossp.so
+share/doc/postgresql/extension/autoinc.example
+share/doc/postgresql/extension/insert_username.example
+share/doc/postgresql/extension/moddatetime.example
+share/doc/postgresql/extension/refint.example
+share/doc/postgresql/extension/timetravel.example
+share/postgresql/extension/adminpack--1.0.sql
+share/postgresql/extension/adminpack.control
+share/postgresql/extension/autoinc--1.0.sql
+share/postgresql/extension/autoinc--unpackaged--1.0.sql
+share/postgresql/extension/autoinc.control
+share/postgresql/extension/btree_gin--1.0.sql
+share/postgresql/extension/btree_gin--unpackaged--1.0.sql
+share/postgresql/extension/btree_gin.control
+share/postgresql/extension/btree_gist--1.0--1.1.sql
+share/postgresql/extension/btree_gist--1.1.sql
+share/postgresql/extension/btree_gist--unpackaged--1.0.sql
+share/postgresql/extension/btree_gist.control
+share/postgresql/extension/chkpass--1.0.sql
+share/postgresql/extension/chkpass--unpackaged--1.0.sql
+share/postgresql/extension/chkpass.control
+share/postgresql/extension/citext--1.0--1.1.sql
+share/postgresql/extension/citext--1.1.sql
+share/postgresql/extension/citext--unpackaged--1.0.sql
+share/postgresql/extension/citext.control
+share/postgresql/extension/cube--1.0.sql
+share/postgresql/extension/cube--unpackaged--1.0.sql
+share/postgresql/extension/cube.control
+share/postgresql/extension/dblink--1.0--1.1.sql
+share/postgresql/extension/dblink--1.1.sql
+share/postgresql/extension/dblink--unpackaged--1.0.sql
+share/postgresql/extension/dblink.control
+share/postgresql/extension/dict_int--1.0.sql
+share/postgresql/extension/dict_int--unpackaged--1.0.sql
+share/postgresql/extension/dict_int.control
+share/postgresql/extension/dict_xsyn--1.0.sql
+share/postgresql/extension/dict_xsyn--unpackaged--1.0.sql
+share/postgresql/extension/dict_xsyn.control
+share/postgresql/extension/earthdistance--1.0.sql
+share/postgresql/extension/earthdistance--unpackaged--1.0.sql
+share/postgresql/extension/earthdistance.control
+share/postgresql/extension/file_fdw--1.0.sql
+share/postgresql/extension/file_fdw.control
+share/postgresql/extension/fuzzystrmatch--1.0.sql
+share/postgresql/extension/fuzzystrmatch--unpackaged--1.0.sql
+share/postgresql/extension/fuzzystrmatch.control
+share/postgresql/extension/hstore--1.0--1.1.sql
+share/postgresql/extension/hstore--1.1--1.2.sql
+share/postgresql/extension/hstore--1.2--1.3.sql
+share/postgresql/extension/hstore--1.3.sql
+share/postgresql/extension/hstore--unpackaged--1.0.sql
+share/postgresql/extension/hstore.control
+share/postgresql/extension/insert_username--1.0.sql
+share/postgresql/extension/insert_username--unpackaged--1.0.sql
+share/postgresql/extension/insert_username.control
+share/postgresql/extension/intagg--1.0.sql
+share/postgresql/extension/intagg--unpackaged--1.0.sql
+share/postgresql/extension/intagg.control
+share/postgresql/extension/intarray--1.0.sql
+share/postgresql/extension/intarray--unpackaged--1.0.sql
+share/postgresql/extension/intarray.control
+share/postgresql/extension/isn--1.0.sql
+share/postgresql/extension/isn--unpackaged--1.0.sql
+share/postgresql/extension/isn.control
+share/postgresql/extension/lo--1.0.sql
+share/postgresql/extension/lo--unpackaged--1.0.sql
+share/postgresql/extension/lo.control
+share/postgresql/extension/ltree--1.0.sql
+share/postgresql/extension/ltree--unpackaged--1.0.sql
+share/postgresql/extension/ltree.control
+share/postgresql/extension/moddatetime--1.0.sql
+share/postgresql/extension/moddatetime--unpackaged--1.0.sql
+share/postgresql/extension/moddatetime.control
+share/postgresql/extension/pageinspect--1.0--1.1.sql
+share/postgresql/extension/pageinspect--1.1--1.2.sql
+share/postgresql/extension/pageinspect--1.2--1.3.sql
+share/postgresql/extension/pageinspect--1.3.sql
+share/postgresql/extension/pageinspect--unpackaged--1.0.sql
+share/postgresql/extension/pageinspect.control
+share/postgresql/extension/pg_buffercache--1.0--1.1.sql
+share/postgresql/extension/pg_buffercache--1.1.sql
+share/postgresql/extension/pg_buffercache--unpackaged--1.0.sql
+share/postgresql/extension/pg_buffercache.control
+share/postgresql/extension/pg_freespacemap--1.0.sql
+share/postgresql/extension/pg_freespacemap--unpackaged--1.0.sql
+share/postgresql/extension/pg_freespacemap.control
+share/postgresql/extension/pg_prewarm--1.0.sql
+share/postgresql/extension/pg_prewarm.control
+share/postgresql/extension/pg_stat_statements--1.0--1.1.sql
+share/postgresql/extension/pg_stat_statements--1.1--1.2.sql
+share/postgresql/extension/pg_stat_statements--1.2--1.3.sql
+share/postgresql/extension/pg_stat_statements--1.3.sql
+share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
+share/postgresql/extension/pg_stat_statements.control
+share/postgresql/extension/pg_trgm--1.0--1.1.sql
+share/postgresql/extension/pg_trgm--1.1.sql
+share/postgresql/extension/pg_trgm--unpackaged--1.0.sql
+share/postgresql/extension/pg_trgm.control
+share/postgresql/extension/pgcrypto--1.0--1.1.sql
+share/postgresql/extension/pgcrypto--1.1--1.2.sql
+share/postgresql/extension/pgcrypto--1.2.sql
+share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
+share/postgresql/extension/pgcrypto.control
+share/postgresql/extension/pgrowlocks--1.0--1.1.sql
+share/postgresql/extension/pgrowlocks--1.1.sql
+share/postgresql/extension/pgrowlocks--unpackaged--1.0.sql
+share/postgresql/extension/pgrowlocks.control
+share/postgresql/extension/pgstattuple--1.0--1.1.sql
+share/postgresql/extension/pgstattuple--1.1--1.2.sql
+share/postgresql/extension/pgstattuple--1.2--1.3.sql
+share/postgresql/extension/pgstattuple--1.3.sql
+share/postgresql/extension/pgstattuple--unpackaged--1.0.sql
+share/postgresql/extension/pgstattuple.control
+share/postgresql/extension/postgres_fdw--1.0.sql
+share/postgresql/extension/postgres_fdw.control
+share/postgresql/extension/refint--1.0.sql
+share/postgresql/extension/refint--unpackaged--1.0.sql
+share/postgresql/extension/refint.control
+share/postgresql/extension/seg--1.0.sql
+share/postgresql/extension/seg--unpackaged--1.0.sql
+share/postgresql/extension/seg.control
+share/postgresql/extension/sslinfo--1.0.sql
+share/postgresql/extension/sslinfo--unpackaged--1.0.sql
+share/postgresql/extension/sslinfo.control
+share/postgresql/extension/tablefunc--1.0.sql
+share/postgresql/extension/tablefunc--unpackaged--1.0.sql
+share/postgresql/extension/tablefunc.control
+share/postgresql/extension/tcn--1.0.sql
+share/postgresql/extension/tcn.control
+share/postgresql/extension/timetravel--1.0.sql
+share/postgresql/extension/timetravel--unpackaged--1.0.sql
+share/postgresql/extension/timetravel.control
+share/postgresql/extension/tsearch2--1.0.sql
+share/postgresql/extension/tsearch2--unpackaged--1.0.sql
+share/postgresql/extension/tsearch2.control
+share/postgresql/extension/tsm_system_rows--1.0.sql
+share/postgresql/extension/tsm_system_rows.control
+share/postgresql/extension/tsm_system_time--1.0.sql
+share/postgresql/extension/tsm_system_time.control
+share/postgresql/extension/unaccent--1.0.sql
+share/postgresql/extension/unaccent--unpackaged--1.0.sql
+share/postgresql/extension/unaccent.control
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
+${PLIST.uuid}share/postgresql/extension/uuid-ossp.control
+share/postgresql/tsearch_data/unaccent.rules
+share/postgresql/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common
index a1427c0f035..995818a011f 100644
--- a/databases/postgresql95/Makefile.common
+++ b/databases/postgresql95/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2016/05/23 14:27:35 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2016/06/19 20:48:29 fhajny Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -10,6 +10,7 @@
#
# used by databases/postgresql95-adminpack/Makefile
# used by databases/postgresql95-client/Makefile
+# used by databases/postgresql95-contrib/Makefile
# used by databases/postgresql95-datatypes/Makefile
# used by databases/postgresql95-dblink/Makefile
# used by databases/postgresql95-docs/Makefile