Fix probable typo (and PKGNAME collision)

While here, fix plist

2 files changed, 30 insertions, 38 deletions

diff --git a/databases/postgresql95-contrib/Makefile b/databases/postgresql95-contrib/Makefile
index 45d868146b4e..516581112f68 100644
--- a/databases/postgresql95-contrib/Makefile
+++ b/databases/postgresql95-contrib/Makefile
@@ -10,7 +10,7 @@ COMMENT=	The contrib utilities from the PostgreSQL distribution
 LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
-MASTERDIR=	${.CURDIR}/../postgresql94-server
+MASTERDIR=	${.CURDIR}/../postgresql95-server
 
 USES=		bison pgsql:9.5
 
diff --git a/databases/postgresql95-server/pkg-plist-contrib b/databases/postgresql95-server/pkg-plist-contrib
index 9810a6293104..0012a0b8c08c 100644
--- a/databases/postgresql95-server/pkg-plist-contrib
+++ b/databases/postgresql95-server/pkg-plist-contrib
@@ -1,13 +1,9 @@
 bin/oid2name
-bin/pg_archivecleanup
 bin/pg_standby
-bin/pg_test_timing
-bin/pg_upgrade
-bin/pg_xlogdump
-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
@@ -19,6 +15,7 @@ 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
@@ -33,7 +30,6 @@ 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
@@ -45,24 +41,19 @@ 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/tsm_system_rows.so
+lib/postgresql/tsm_system_time.so
 lib/postgresql/unaccent.so
 lib/postgresql/uuid-ossp.so
-lib/postgresql/worker_spi.so
-%%DOCSDIR%%/README-contrib
-%%DOCSDIR%%/extension/README
-bin/pg_test_fsync
-lib/postgresql/auth_delay.so
-lib/postgresql/dummy_seclabel.so
-lib/postgresql/file_fdw.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
+%%PORTDOCS%%%%DOCSDIR%%/README-contrib
+%%PORTDOCS%%%%DOCSDIR%%/extension/README
+%%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/timetravel.example
 %%DATADIR%%/extension/adminpack--1.0.sql
 %%DATADIR%%/extension/adminpack.control
 %%DATADIR%%/extension/autoinc--1.0.sql
@@ -71,25 +62,18 @@ share/doc/postgresql/extension/timetravel.example
 %%DATADIR%%/extension/btree_gin--1.0.sql
 %%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql
 %%DATADIR%%/extension/btree_gin.control
-%%DATADIR%%/extension/btree_gist--1.0.sql
+%%DATADIR%%/extension/btree_gist--1.0--1.1.sql
+%%DATADIR%%/extension/btree_gist--1.1.sql
 %%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql
 %%DATADIR%%/extension/btree_gist.control
 %%DATADIR%%/extension/chkpass--1.0.sql
 %%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
 %%DATADIR%%/extension/chkpass.control
 %%DATADIR%%/extension/citext--1.0--1.1.sql
-%%DATADIR%%/extension/citext--1.0.sql
-%%DATADIR%%/extension/citext--1.1--1.0.sql
 %%DATADIR%%/extension/citext--1.1.sql
 %%DATADIR%%/extension/citext--unpackaged--1.0.sql
 %%DATADIR%%/extension/citext.control
 %%DATADIR%%/extension/cube--1.0.sql
-%%DATADIR%%/extension/pg_prewarm.control
-%%DATADIR%%/extension/pg_prewarm--1.0.sql
-%%DATADIR%%/extension/test_shm_mq.control
-%%DATADIR%%/extension/test_shm_mq--1.0.sql
-%%DATADIR%%/extension/worker_spi.control
-%%DATADIR%%/extension/worker_spi--1.0.sql
 %%DATADIR%%/extension/cube--unpackaged--1.0.sql
 %%DATADIR%%/extension/cube.control
 %%DATADIR%%/extension/dblink--1.0--1.1.sql
@@ -139,18 +123,23 @@ share/doc/postgresql/extension/timetravel.example
 %%DATADIR%%/extension/moddatetime.control
 %%DATADIR%%/extension/pageinspect--1.0--1.1.sql
 %%DATADIR%%/extension/pageinspect--1.1--1.2.sql
-%%DATADIR%%/extension/pageinspect--1.2.sql
+%%DATADIR%%/extension/pageinspect--1.2--1.3.sql
+%%DATADIR%%/extension/pageinspect--1.3.sql
 %%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql
 %%DATADIR%%/extension/pageinspect.control
-%%DATADIR%%/extension/pg_buffercache--1.0.sql
+%%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql
+%%DATADIR%%/extension/pg_buffercache--1.1.sql
 %%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql
 %%DATADIR%%/extension/pg_buffercache.control
 %%DATADIR%%/extension/pg_freespacemap--1.0.sql
 %%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql
 %%DATADIR%%/extension/pg_freespacemap.control
+%%DATADIR%%/extension/pg_prewarm--1.0.sql
+%%DATADIR%%/extension/pg_prewarm.control
 %%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
 %%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql
-%%DATADIR%%/extension/pg_stat_statements--1.2.sql
+%%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql
+%%DATADIR%%/extension/pg_stat_statements--1.3.sql
 %%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql
 %%DATADIR%%/extension/pg_stat_statements.control
 %%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
@@ -158,7 +147,8 @@ share/doc/postgresql/extension/timetravel.example
 %%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql
 %%DATADIR%%/extension/pg_trgm.control
 %%DATADIR%%/extension/pgcrypto--1.0--1.1.sql
-%%DATADIR%%/extension/pgcrypto--1.1.sql
+%%DATADIR%%/extension/pgcrypto--1.1--1.2.sql
+%%DATADIR%%/extension/pgcrypto--1.2.sql
 %%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql
 %%DATADIR%%/extension/pgcrypto.control
 %%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
@@ -167,7 +157,8 @@ share/doc/postgresql/extension/timetravel.example
 %%DATADIR%%/extension/pgrowlocks.control
 %%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
 %%DATADIR%%/extension/pgstattuple--1.1--1.2.sql
-%%DATADIR%%/extension/pgstattuple--1.2.sql
+%%DATADIR%%/extension/pgstattuple--1.2--1.3.sql
+%%DATADIR%%/extension/pgstattuple--1.3.sql
 %%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql
 %%DATADIR%%/extension/pgstattuple.control
 %%DATADIR%%/extension/postgres_fdw--1.0.sql
@@ -186,15 +177,16 @@ share/doc/postgresql/extension/timetravel.example
 %%DATADIR%%/extension/tablefunc.control
 %%DATADIR%%/extension/tcn--1.0.sql
 %%DATADIR%%/extension/tcn.control
-%%DATADIR%%/extension/test_parser--1.0.sql
-%%DATADIR%%/extension/test_parser--unpackaged--1.0.sql
-%%DATADIR%%/extension/test_parser.control
 %%DATADIR%%/extension/timetravel--1.0.sql
 %%DATADIR%%/extension/timetravel--unpackaged--1.0.sql
 %%DATADIR%%/extension/timetravel.control
 %%DATADIR%%/extension/tsearch2--1.0.sql
 %%DATADIR%%/extension/tsearch2--unpackaged--1.0.sql
 %%DATADIR%%/extension/tsearch2.control
+%%DATADIR%%/extension/tsm_system_rows--1.0.sql
+%%DATADIR%%/extension/tsm_system_rows.control
+%%DATADIR%%/extension/tsm_system_time--1.0.sql
+%%DATADIR%%/extension/tsm_system_time.control
 %%DATADIR%%/extension/unaccent--1.0.sql
 %%DATADIR%%/extension/unaccent--unpackaged--1.0.sql
 %%DATADIR%%/extension/unaccent.control