Cleanup plist and avoid useless @exec

35 files changed, 10 insertions, 475 deletions

diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 264e1b39d147..099d94673cbd 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 DISTVERSION?=	9.0.22
-PORTREVISION?=	0
+PORTREVISION?=	1
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client
index 575e93a21a0f..f6ba3e72d520 100644
--- a/databases/postgresql90-server/pkg-plist-client
+++ b/databases/postgresql90-server/pkg-plist-client
@@ -476,54 +476,16 @@ include/postgresql/server/windowapi.h
 include/sqlda-compat.h
 include/sqlda-native.h
 include/sqlda.h
-@dir include/postgresql/server/utils
-@dir include/postgresql/server/tsearch/dicts
-@dir include/postgresql/server/tsearch
-@dir include/postgresql/server/tcop
-@dir include/postgresql/server/storage
-@dir include/postgresql/server/snowball/libstemmer
-@dir include/postgresql/server/snowball
-@dir include/postgresql/server/rewrite
-@dir include/postgresql/server/replication
-@dir include/postgresql/server/regex
-@dir include/postgresql/server/postmaster
-@dir include/postgresql/server/portability
-@dir include/postgresql/server/port/win32_msvc/sys
-@dir include/postgresql/server/port/win32_msvc
-@dir include/postgresql/server/port/win32/sys
-@dir include/postgresql/server/port/win32/netinet
-@dir include/postgresql/server/port/win32/arpa
-@dir include/postgresql/server/port/win32
-@dir include/postgresql/server/port
-@dir include/postgresql/server/parser
-@dir include/postgresql/server/optimizer
-@dir include/postgresql/server/nodes
-@dir include/postgresql/server/mb
-@dir include/postgresql/server/libpq
-@dir include/postgresql/server/lib
-@dir include/postgresql/server/foreign
-@dir include/postgresql/server/executor
-@dir include/postgresql/server/commands
-@dir include/postgresql/server/catalog
-@dir include/postgresql/server/bootstrap
-@dir include/postgresql/server/access
-@dir include/postgresql/server
 include/libpq/libpq-fs.h
-@dir include/libpq
 include/postgresql/internal/libpq/pqcomm.h
-@dir include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqltypes.h
-@dir include/postgresql/informix/esql
-@dir include/postgresql/informix
 include/postgresql/internal/c.h
 include/postgresql/internal/libpq-int.h
 include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
-@dir include/postgresql/internal
-@dir include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@@ -559,11 +521,6 @@ lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib
 lib/postgresql/pgxs/src/nls-global.mk
-@dir lib/postgresql/pgxs/src/makefiles
-@dir lib/postgresql/pgxs/config
-@dir lib/postgresql/pgxs/src
-@dir lib/postgresql/pgxs
-@dir lib/postgresql
 man/man1/clusterdb.1.gz
 man/man1/createdb.1.gz
 man/man1/createlang.1.gz
@@ -791,10 +748,8 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%DOCSDIR%%/README-client
-@dir %%DOCSDIR%%
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
-@dir %%DATADIR%%
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.0.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.0.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.0.mo
diff --git a/databases/postgresql90-server/pkg-plist-contrib b/databases/postgresql90-server/pkg-plist-contrib
index 670d19fee27c..7cfbfbcacdc6 100644
--- a/databases/postgresql90-server/pkg-plist-contrib
+++ b/databases/postgresql90-server/pkg-plist-contrib
@@ -124,9 +124,3 @@ lib/postgresql/uuid-ossp.so
 %%DATADIR%%/contrib/uninstall_unaccent.sql
 %%DATADIR%%/tsearch_data/unaccent.rules
 %%DATADIR%%/tsearch_data/xsyn_sample.rules
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%/contrib
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%/contrib
-@dir %%DOCSDIR%%
-@dir lib/postgresql
diff --git a/databases/postgresql90-server/pkg-plist-plperl b/databases/postgresql90-server/pkg-plist-plperl
index adde929c872c..3828f76055ff 100644
--- a/databases/postgresql90-server/pkg-plist-plperl
+++ b/databases/postgresql90-server/pkg-plist-plperl
@@ -1,4 +1,2 @@
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dir lib/postgresql
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql90-server/pkg-plist-plpython b/databases/postgresql90-server/pkg-plist-plpython
index 29bb50598fdc..2ae8672237d8 100644
--- a/databases/postgresql90-server/pkg-plist-plpython
+++ b/databases/postgresql90-server/pkg-plist-plpython
@@ -1,5 +1,3 @@
 %%DOCSDIR%%/README-plpython
 lib/postgresql/plpython.so
 lib/postgresql/plpython2.so
-@dir lib/postgresql
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql90-server/pkg-plist-pltcl b/databases/postgresql90-server/pkg-plist-pltcl
index 7acdbbce50e8..d988cf018a45 100644
--- a/databases/postgresql90-server/pkg-plist-pltcl
+++ b/databases/postgresql90-server/pkg-plist-pltcl
@@ -1,9 +1,6 @@
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dir lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
 %%DATADIR%%/unknown.pltcl
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server
index d947cb98059f..de2414412154 100644
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-server/pkg-plist-server
@@ -35,7 +35,6 @@ lib/postgresql/utf8_and_sjis2004.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
 %%DOCSDIR%%/README-server
-@dir %%DOCSDIR%%
 %%DATADIR%%/conversion_create.sql
 %%DATADIR%%/information_schema.sql
 %%DATADIR%%/pg_hba.conf.sample
@@ -734,28 +733,6 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/timezonesets/India
 %%DATADIR%%/timezonesets/Indian.txt
 %%DATADIR%%/timezonesets/Pacific.txt
-%%TZDATA%%@dir %%DATADIR%%/timezone/Africa
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Argentina
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Indiana
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Kentucky
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/North_Dakota
-%%TZDATA%%@dir %%DATADIR%%/timezone/America
-%%TZDATA%%@dir %%DATADIR%%/timezone/Antarctica
-%%TZDATA%%@dir %%DATADIR%%/timezone/Arctic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Asia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Atlantic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Australia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Brazil
-%%TZDATA%%@dir %%DATADIR%%/timezone/Canada
-%%TZDATA%%@dir %%DATADIR%%/timezone/Chile
-%%TZDATA%%@dir %%DATADIR%%/timezone/Etc
-%%TZDATA%%@dir %%DATADIR%%/timezone/Europe
-%%TZDATA%%@dir %%DATADIR%%/timezone/Indian
-%%TZDATA%%@dir %%DATADIR%%/timezone/Mexico
-%%TZDATA%%@dir %%DATADIR%%/timezone/Pacific
-%%TZDATA%%@dir %%DATADIR%%/timezone/US
-%%TZDATA%%@dir %%DATADIR%%/timezone
-@dir %%DATADIR%%/timezonesets
 %%DATADIR%%/tsearch_data/danish.stop
 %%DATADIR%%/tsearch_data/dutch.stop
 %%DATADIR%%/tsearch_data/english.stop
@@ -775,11 +752,4 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/tsearch_data/ispell_sample.dict
 %%DATADIR%%/tsearch_data/synonym_sample.syn
 %%DATADIR%%/tsearch_data/thesaurus_sample.ths
-@exec /bin/mkdir -p %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@exec /usr/sbin/chown %%PG_USER%%:%%PG_GROUP%% %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%
-@dir etc/periodic/daily
-@dir etc/periodic
-@dir lib/postgresql
-@dir %%PG_USER%%
+@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 90a47b9a120d..efcc15965a21 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	9.1.18
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client
index 687e49d8aa37..4c2d22a36065 100644
--- a/databases/postgresql91-server/pkg-plist-client
+++ b/databases/postgresql91-server/pkg-plist-client
@@ -498,54 +498,16 @@ include/postgresql/server/windowapi.h
 include/sqlda-compat.h
 include/sqlda-native.h
 include/sqlda.h
-@dir include/postgresql/server/utils
-@dir include/postgresql/server/tsearch/dicts
-@dir include/postgresql/server/tsearch
-@dir include/postgresql/server/tcop
-@dir include/postgresql/server/storage
-@dir include/postgresql/server/snowball/libstemmer
-@dir include/postgresql/server/snowball
-@dir include/postgresql/server/rewrite
-@dir include/postgresql/server/replication
-@dir include/postgresql/server/regex
-@dir include/postgresql/server/postmaster
-@dir include/postgresql/server/portability
-@dir include/postgresql/server/port/win32_msvc/sys
-@dir include/postgresql/server/port/win32_msvc
-@dir include/postgresql/server/port/win32/sys
-@dir include/postgresql/server/port/win32/netinet
-@dir include/postgresql/server/port/win32/arpa
-@dir include/postgresql/server/port/win32
-@dir include/postgresql/server/port
-@dir include/postgresql/server/parser
-@dir include/postgresql/server/optimizer
-@dir include/postgresql/server/nodes
-@dir include/postgresql/server/mb
-@dir include/postgresql/server/libpq
-@dir include/postgresql/server/lib
-@dir include/postgresql/server/foreign
-@dir include/postgresql/server/executor
-@dir include/postgresql/server/commands
-@dir include/postgresql/server/catalog
-@dir include/postgresql/server/bootstrap
-@dir include/postgresql/server/access
-@dir include/postgresql/server
 include/libpq/libpq-fs.h
-@dir include/libpq
 include/postgresql/internal/libpq/pqcomm.h
-@dir include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqltypes.h
-@dir include/postgresql/informix/esql
-@dir include/postgresql/informix
 include/postgresql/internal/c.h
 include/postgresql/internal/libpq-int.h
 include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
-@dir include/postgresql/internal
-@dir include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@@ -581,11 +543,6 @@ lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib
 lib/postgresql/pgxs/src/nls-global.mk
-@dir lib/postgresql/pgxs/src/makefiles
-@dir lib/postgresql/pgxs/config
-@dir lib/postgresql/pgxs/src
-@dir lib/postgresql/pgxs
-@dir lib/postgresql
 man/man1/clusterdb.1.gz
 man/man1/createdb.1.gz
 man/man1/createlang.1.gz
@@ -823,10 +780,8 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%DOCSDIR%%/README-client
-@dir %%DOCSDIR%%
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
-@dir %%DATADIR%%
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.1.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.1.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.1.mo
diff --git a/databases/postgresql91-server/pkg-plist-contrib b/databases/postgresql91-server/pkg-plist-contrib
index b39a23f3d2d0..7c15624ee2f2 100644
--- a/databases/postgresql91-server/pkg-plist-contrib
+++ b/databases/postgresql91-server/pkg-plist-contrib
@@ -175,9 +175,3 @@ share/doc/postgresql/extension/timetravel.example
 %%DATADIR%%/extension/xml2.control
 %%DATADIR%%/tsearch_data/unaccent.rules
 %%DATADIR%%/tsearch_data/xsyn_sample.rules
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%/extension
-@dir %%DOCSDIR%%
-@dir lib/postgresql
diff --git a/databases/postgresql91-server/pkg-plist-plperl b/databases/postgresql91-server/pkg-plist-plperl
index feaadbf119d2..5cdf261fae45 100644
--- a/databases/postgresql91-server/pkg-plist-plperl
+++ b/databases/postgresql91-server/pkg-plist-plperl
@@ -6,7 +6,3 @@
 %%DATADIR%%/extension/plperl--unpackaged--1.0.sql
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dir lib/postgresql
-@dir %%DOCSDIR%%
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
diff --git a/databases/postgresql91-server/pkg-plist-plpython b/databases/postgresql91-server/pkg-plist-plpython
index c7ffa81d313c..083d330d22c4 100644
--- a/databases/postgresql91-server/pkg-plist-plpython
+++ b/databases/postgresql91-server/pkg-plist-plpython
@@ -10,6 +10,3 @@
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-@dir %%DATADIR%%/extension
-@dir lib/postgresql
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql91-server/pkg-plist-pltcl b/databases/postgresql91-server/pkg-plist-pltcl
index 7cd8d90db4e9..f5fe8c74be5c 100644
--- a/databases/postgresql91-server/pkg-plist-pltcl
+++ b/databases/postgresql91-server/pkg-plist-pltcl
@@ -6,11 +6,7 @@
 %%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dir lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
 %%DATADIR%%/unknown.pltcl
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server
index b298513a06e6..507f5a0e50a4 100644
--- a/databases/postgresql91-server/pkg-plist-server
+++ b/databases/postgresql91-server/pkg-plist-server
@@ -36,7 +36,6 @@ lib/postgresql/utf8_and_sjis2004.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
 %%DOCSDIR%%/README-server
-@dir %%DOCSDIR%%
 %%DATADIR%%/conversion_create.sql
 %%DATADIR%%/information_schema.sql
 %%DATADIR%%/pg_hba.conf.sample
@@ -50,7 +49,6 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/extension/plpgsql--1.0.sql
 %%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
 %%DATADIR%%/extension/plpgsql.control
-@dir %%DATADIR%%/extension
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-9.1.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_basebackup-9.1.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata-9.1.mo
@@ -741,28 +739,6 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/timezonesets/India
 %%DATADIR%%/timezonesets/Indian.txt
 %%DATADIR%%/timezonesets/Pacific.txt
-%%TZDATA%%@dir %%DATADIR%%/timezone/Africa
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Argentina
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Indiana
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Kentucky
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/North_Dakota
-%%TZDATA%%@dir %%DATADIR%%/timezone/America
-%%TZDATA%%@dir %%DATADIR%%/timezone/Antarctica
-%%TZDATA%%@dir %%DATADIR%%/timezone/Arctic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Asia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Atlantic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Australia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Brazil
-%%TZDATA%%@dir %%DATADIR%%/timezone/Canada
-%%TZDATA%%@dir %%DATADIR%%/timezone/Chile
-%%TZDATA%%@dir %%DATADIR%%/timezone/Etc
-%%TZDATA%%@dir %%DATADIR%%/timezone/Europe
-%%TZDATA%%@dir %%DATADIR%%/timezone/Indian
-%%TZDATA%%@dir %%DATADIR%%/timezone/Mexico
-%%TZDATA%%@dir %%DATADIR%%/timezone/Pacific
-%%TZDATA%%@dir %%DATADIR%%/timezone/US
-%%TZDATA%%@dir %%DATADIR%%/timezone
-@dir %%DATADIR%%/timezonesets
 %%DATADIR%%/tsearch_data/danish.stop
 %%DATADIR%%/tsearch_data/dutch.stop
 %%DATADIR%%/tsearch_data/english.stop
@@ -782,11 +758,4 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/tsearch_data/ispell_sample.dict
 %%DATADIR%%/tsearch_data/synonym_sample.syn
 %%DATADIR%%/tsearch_data/thesaurus_sample.ths
-@exec /bin/mkdir -p %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@exec /usr/sbin/chown %%PG_USER%%:%%PG_GROUP%% %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%
-@dir etc/periodic/daily
-@dir etc/periodic
-@dir lib/postgresql
-@dir %%PG_USER%%
+@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index f45b2f48d5d3..8f6b18915ef8 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	9.2.13
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index fb650ef2ca82..cc4e23aeabcd 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -506,55 +506,16 @@ include/postgresql/server/windowapi.h
 include/sqlda-compat.h
 include/sqlda-native.h
 include/sqlda.h
-@dir include/postgresql/server/utils
-@dir include/postgresql/server/tsearch/dicts
-@dir include/postgresql/server/tsearch
-@dir include/postgresql/server/tcop
-@dir include/postgresql/server/storage
-@dir include/postgresql/server/snowball/libstemmer
-@dir include/postgresql/server/snowball
-@dir include/postgresql/server/rewrite
-@dir include/postgresql/server/replication
-@dir include/postgresql/server/regex
-@dir include/postgresql/server/postmaster
-@dir include/postgresql/server/portability
-@dir include/postgresql/server/port/win32_msvc/sys
-@dir include/postgresql/server/port/win32_msvc
-@dir include/postgresql/server/port/win32/sys
-@dir include/postgresql/server/port/win32/netinet
-@dir include/postgresql/server/port/win32/arpa
-@dir include/postgresql/server/port/win32
-@dir include/postgresql/server/port
-@dir include/postgresql/server/parser
-@dir include/postgresql/server/optimizer
-@dir include/postgresql/server/nodes
-@dir include/postgresql/server/mb
-@dir include/postgresql/server/libpq
-@dir include/postgresql/server/lib
-@dir include/postgresql/server/foreign
-@dir include/postgresql/server/executor
-@dir include/postgresql/server/datatype
-@dir include/postgresql/server/commands
-@dir include/postgresql/server/catalog
-@dir include/postgresql/server/bootstrap
-@dir include/postgresql/server/access
-@dir include/postgresql/server
 include/libpq/libpq-fs.h
-@dir include/libpq
 include/postgresql/internal/libpq/pqcomm.h
-@dir include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqltypes.h
-@dir include/postgresql/informix/esql
-@dir include/postgresql/informix
 include/postgresql/internal/c.h
 include/postgresql/internal/libpq-int.h
 include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
-@dir include/postgresql/internal
-@dir include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@@ -590,11 +551,6 @@ lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib
 lib/postgresql/pgxs/src/nls-global.mk
-@dir lib/postgresql/pgxs/src/makefiles
-@dir lib/postgresql/pgxs/config
-@dir lib/postgresql/pgxs/src
-@dir lib/postgresql/pgxs
-@dir lib/postgresql
 man/man1/clusterdb.1.gz
 man/man1/createdb.1.gz
 man/man1/createlang.1.gz
@@ -842,10 +798,8 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%DOCSDIR%%/README-client
-@dir %%DOCSDIR%%
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
-@dir %%DATADIR%%
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.2.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.2.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.2.mo
diff --git a/databases/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib
index 3f7d52e541ea..5dad6dfae50e 100644
--- a/databases/postgresql92-server/pkg-plist-contrib
+++ b/databases/postgresql92-server/pkg-plist-contrib
@@ -181,9 +181,3 @@ share/doc/postgresql/extension/timetravel.example
 %%DATADIR%%/extension/xml2.control
 %%DATADIR%%/tsearch_data/unaccent.rules
 %%DATADIR%%/tsearch_data/xsyn_sample.rules
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%/extension
-@dir %%DOCSDIR%%
-@dir lib/postgresql
diff --git a/databases/postgresql92-server/pkg-plist-plperl b/databases/postgresql92-server/pkg-plist-plperl
index feaadbf119d2..5cdf261fae45 100644
--- a/databases/postgresql92-server/pkg-plist-plperl
+++ b/databases/postgresql92-server/pkg-plist-plperl
@@ -6,7 +6,3 @@
 %%DATADIR%%/extension/plperl--unpackaged--1.0.sql
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dir lib/postgresql
-@dir %%DOCSDIR%%
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
diff --git a/databases/postgresql92-server/pkg-plist-plpython b/databases/postgresql92-server/pkg-plist-plpython
index c7ffa81d313c..083d330d22c4 100644
--- a/databases/postgresql92-server/pkg-plist-plpython
+++ b/databases/postgresql92-server/pkg-plist-plpython
@@ -10,6 +10,3 @@
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-@dir %%DATADIR%%/extension
-@dir lib/postgresql
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql92-server/pkg-plist-pltcl b/databases/postgresql92-server/pkg-plist-pltcl
index 7cd8d90db4e9..f5fe8c74be5c 100644
--- a/databases/postgresql92-server/pkg-plist-pltcl
+++ b/databases/postgresql92-server/pkg-plist-pltcl
@@ -6,11 +6,7 @@
 %%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dir lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
 %%DATADIR%%/unknown.pltcl
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 4a83b95345e1..41f923554aa6 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -38,7 +38,6 @@ lib/postgresql/utf8_and_sjis2004.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
 %%DOCSDIR%%/README-server
-@dir %%DOCSDIR%%
 %%DATADIR%%/conversion_create.sql
 %%DATADIR%%/information_schema.sql
 %%DATADIR%%/pg_hba.conf.sample
@@ -52,7 +51,6 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/extension/plpgsql--1.0.sql
 %%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
 %%DATADIR%%/extension/plpgsql.control
-@dir %%DATADIR%%/extension
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-9.2.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_basebackup-9.2.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata-9.2.mo
@@ -738,28 +736,6 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/timezonesets/India
 %%DATADIR%%/timezonesets/Indian.txt
 %%DATADIR%%/timezonesets/Pacific.txt
-%%TZDATA%%@dir %%DATADIR%%/timezone/Africa
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Argentina
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Indiana
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Kentucky
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/North_Dakota
-%%TZDATA%%@dir %%DATADIR%%/timezone/America
-%%TZDATA%%@dir %%DATADIR%%/timezone/Antarctica
-%%TZDATA%%@dir %%DATADIR%%/timezone/Arctic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Asia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Atlantic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Australia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Brazil
-%%TZDATA%%@dir %%DATADIR%%/timezone/Canada
-%%TZDATA%%@dir %%DATADIR%%/timezone/Chile
-%%TZDATA%%@dir %%DATADIR%%/timezone/Etc
-%%TZDATA%%@dir %%DATADIR%%/timezone/Europe
-%%TZDATA%%@dir %%DATADIR%%/timezone/Indian
-%%TZDATA%%@dir %%DATADIR%%/timezone/Mexico
-%%TZDATA%%@dir %%DATADIR%%/timezone/Pacific
-%%TZDATA%%@dir %%DATADIR%%/timezone/US
-%%TZDATA%%@dir %%DATADIR%%/timezone
-@dir %%DATADIR%%/timezonesets
 %%DATADIR%%/tsearch_data/danish.stop
 %%DATADIR%%/tsearch_data/dutch.stop
 %%DATADIR%%/tsearch_data/english.stop
@@ -779,11 +755,4 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/tsearch_data/ispell_sample.dict
 %%DATADIR%%/tsearch_data/synonym_sample.syn
 %%DATADIR%%/tsearch_data/thesaurus_sample.ths
-@exec /bin/mkdir -p %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@exec /usr/sbin/chown %%PG_USER%%:%%PG_GROUP%% %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%
-@dir etc/periodic/daily
-@dir etc/periodic
-@dir lib/postgresql
-@dir %%PG_USER%%
+@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile
index f55827440aac..79604c55a95d 100644
--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 DISTVERSION?=	9.3.9
-PORTREVISION?=	0
+PORTREVISION?=	1
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql93-server/pkg-plist-client b/databases/postgresql93-server/pkg-plist-client
index 6ce8837a6d2d..d1c276ff9b17 100644
--- a/databases/postgresql93-server/pkg-plist-client
+++ b/databases/postgresql93-server/pkg-plist-client
@@ -531,56 +531,16 @@ include/postgresql/server/windowapi.h
 include/sqlda-compat.h
 include/sqlda-native.h
 include/sqlda.h
-@dir include/postgresql/server/utils
-@dir include/postgresql/server/tsearch/dicts
-@dir include/postgresql/server/tsearch
-@dir include/postgresql/server/tcop
-@dir include/postgresql/server/storage
-@dir include/postgresql/server/snowball/libstemmer
-@dir include/postgresql/server/snowball
-@dir include/postgresql/server/rewrite
-@dir include/postgresql/server/replication
-@dir include/postgresql/server/regex
-@dir include/postgresql/server/postmaster
-@dir include/postgresql/server/portability
-@dir include/postgresql/server/port/win32_msvc/sys
-@dir include/postgresql/server/port/win32_msvc
-@dir include/postgresql/server/port/win32/sys
-@dir include/postgresql/server/port/win32/netinet
-@dir include/postgresql/server/port/win32/arpa
-@dir include/postgresql/server/port/win32
-@dir include/postgresql/server/port
-@dir include/postgresql/server/parser
-@dir include/postgresql/server/optimizer
-@dir include/postgresql/server/nodes
-@dir include/postgresql/server/mb
-@dir include/postgresql/server/libpq
-@dir include/postgresql/server/lib
-@dir include/postgresql/server/foreign
-@dir include/postgresql/server/executor
-@dir include/postgresql/server/datatype
-@dir include/postgresql/server/common
-@dir include/postgresql/server/commands
-@dir include/postgresql/server/catalog
-@dir include/postgresql/server/bootstrap
-@dir include/postgresql/server/access
-@dir include/postgresql/server
 include/libpq/libpq-fs.h
-@dir include/libpq
 include/postgresql/internal/libpq/pqcomm.h
-@dir include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqltypes.h
-@dir include/postgresql/informix/esql
-@dir include/postgresql/informix
 include/postgresql/internal/c.h
 include/postgresql/internal/libpq-int.h
 include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/port.h
 include/postgresql/internal/pqexpbuffer.h
-@dir include/postgresql/internal
-@dir include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@@ -620,11 +580,6 @@ lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib
 lib/postgresql/pgxs/src/nls-global.mk
-@dir lib/postgresql/pgxs/src/makefiles
-@dir lib/postgresql/pgxs/config
-@dir lib/postgresql/pgxs/src
-@dir lib/postgresql/pgxs
-@dir lib/postgresql
 man/man1/clusterdb.1.gz
 man/man1/createdb.1.gz
 man/man1/createlang.1.gz
@@ -882,10 +837,8 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%DOCSDIR%%/README-client
-@dir %%DOCSDIR%%
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
-@dir %%DATADIR%%
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.3.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.3.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.3.mo
diff --git a/databases/postgresql93-server/pkg-plist-contrib b/databases/postgresql93-server/pkg-plist-contrib
index f3c537f500a6..f8595f774b17 100644
--- a/databases/postgresql93-server/pkg-plist-contrib
+++ b/databases/postgresql93-server/pkg-plist-contrib
@@ -192,9 +192,3 @@ share/doc/postgresql/extension/timetravel.example
 %%DATADIR%%/extension/xml2.control
 %%DATADIR%%/tsearch_data/unaccent.rules
 %%DATADIR%%/tsearch_data/xsyn_sample.rules
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%/extension
-@dir %%DOCSDIR%%
-@dir lib/postgresql
diff --git a/databases/postgresql93-server/pkg-plist-plperl b/databases/postgresql93-server/pkg-plist-plperl
index feaadbf119d2..5cdf261fae45 100644
--- a/databases/postgresql93-server/pkg-plist-plperl
+++ b/databases/postgresql93-server/pkg-plist-plperl
@@ -6,7 +6,3 @@
 %%DATADIR%%/extension/plperl--unpackaged--1.0.sql
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dir lib/postgresql
-@dir %%DOCSDIR%%
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
diff --git a/databases/postgresql93-server/pkg-plist-plpython b/databases/postgresql93-server/pkg-plist-plpython
index c7ffa81d313c..083d330d22c4 100644
--- a/databases/postgresql93-server/pkg-plist-plpython
+++ b/databases/postgresql93-server/pkg-plist-plpython
@@ -10,6 +10,3 @@
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-@dir %%DATADIR%%/extension
-@dir lib/postgresql
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql93-server/pkg-plist-pltcl b/databases/postgresql93-server/pkg-plist-pltcl
index 7cd8d90db4e9..f5fe8c74be5c 100644
--- a/databases/postgresql93-server/pkg-plist-pltcl
+++ b/databases/postgresql93-server/pkg-plist-pltcl
@@ -6,11 +6,7 @@
 %%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dir lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
 %%DATADIR%%/unknown.pltcl
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql93-server/pkg-plist-server b/databases/postgresql93-server/pkg-plist-server
index dd74142c482a..f64c97944ffc 100644
--- a/databases/postgresql93-server/pkg-plist-server
+++ b/databases/postgresql93-server/pkg-plist-server
@@ -39,7 +39,6 @@ lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
 lib/libpgcommon.a
 %%DOCSDIR%%/README-server
-@dir %%DOCSDIR%%
 %%DATADIR%%/conversion_create.sql
 %%DATADIR%%/information_schema.sql
 %%DATADIR%%/pg_hba.conf.sample
@@ -53,7 +52,6 @@ lib/libpgcommon.a
 %%DATADIR%%/extension/plpgsql--1.0.sql
 %%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
 %%DATADIR%%/extension/plpgsql.control
-@dir %%DATADIR%%/extension
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-9.3.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_basebackup-9.3.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata-9.3.mo
@@ -727,28 +725,6 @@ lib/libpgcommon.a
 %%DATADIR%%/timezonesets/India
 %%DATADIR%%/timezonesets/Indian.txt
 %%DATADIR%%/timezonesets/Pacific.txt
-%%TZDATA%%@dir %%DATADIR%%/timezone/Africa
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Argentina
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Indiana
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Kentucky
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/North_Dakota
-%%TZDATA%%@dir %%DATADIR%%/timezone/America
-%%TZDATA%%@dir %%DATADIR%%/timezone/Antarctica
-%%TZDATA%%@dir %%DATADIR%%/timezone/Arctic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Asia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Atlantic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Australia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Brazil
-%%TZDATA%%@dir %%DATADIR%%/timezone/Canada
-%%TZDATA%%@dir %%DATADIR%%/timezone/Chile
-%%TZDATA%%@dir %%DATADIR%%/timezone/Etc
-%%TZDATA%%@dir %%DATADIR%%/timezone/Europe
-%%TZDATA%%@dir %%DATADIR%%/timezone/Indian
-%%TZDATA%%@dir %%DATADIR%%/timezone/Mexico
-%%TZDATA%%@dir %%DATADIR%%/timezone/Pacific
-%%TZDATA%%@dir %%DATADIR%%/timezone/US
-%%TZDATA%%@dir %%DATADIR%%/timezone
-@dir %%DATADIR%%/timezonesets
 %%DATADIR%%/tsearch_data/danish.stop
 %%DATADIR%%/tsearch_data/dutch.stop
 %%DATADIR%%/tsearch_data/english.stop
@@ -768,11 +744,4 @@ lib/libpgcommon.a
 %%DATADIR%%/tsearch_data/ispell_sample.dict
 %%DATADIR%%/tsearch_data/synonym_sample.syn
 %%DATADIR%%/tsearch_data/thesaurus_sample.ths
-@exec /bin/mkdir -p %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@exec /usr/sbin/chown %%PG_USER%%:%%PG_GROUP%% %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%
-@dir etc/periodic/daily
-@dir etc/periodic
-@dir lib/postgresql
-@dir %%PG_USER%%
+@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile
index 5b35c963e82b..9686c6c30e86 100644
--- a/databases/postgresql94-server/Makefile
+++ b/databases/postgresql94-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 DISTVERSION?=	9.4.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
diff --git a/databases/postgresql94-server/pkg-plist-client b/databases/postgresql94-server/pkg-plist-client
index ac29b4694b28..cc6b08a18769 100644
--- a/databases/postgresql94-server/pkg-plist-client
+++ b/databases/postgresql94-server/pkg-plist-client
@@ -946,50 +946,3 @@ man/man7/WITH.7.gz
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-9.4.mo
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
-@dir include/libpq
-@dir include/postgresql/informix/esql
-@dir include/postgresql/informix
-@dir include/postgresql/internal/libpq
-@dir include/postgresql/internal
-@dir include/postgresql/server/access
-@dir include/postgresql/server/bootstrap
-@dir include/postgresql/server/catalog
-@dir include/postgresql/server/commands
-@dir include/postgresql/server/common
-@dir include/postgresql/server/datatype
-@dir include/postgresql/server/executor
-@dir include/postgresql/server/foreign
-@dir include/postgresql/server/lib
-@dir include/postgresql/server/libpq
-@dir include/postgresql/server/mb
-@dir include/postgresql/server/nodes
-@dir include/postgresql/server/optimizer
-@dir include/postgresql/server/parser
-@dir include/postgresql/server/port/win32/arpa
-@dir include/postgresql/server/port/win32/netinet
-@dir include/postgresql/server/port/win32/sys
-@dir include/postgresql/server/port/win32
-@dir include/postgresql/server/port/win32_msvc/sys
-@dir include/postgresql/server/port/win32_msvc
-@dir include/postgresql/server/port
-@dir include/postgresql/server/portability
-@dir include/postgresql/server/postmaster
-@dir include/postgresql/server/regex
-@dir include/postgresql/server/replication
-@dir include/postgresql/server/rewrite
-@dir include/postgresql/server/snowball/libstemmer
-@dir include/postgresql/server/snowball
-@dir include/postgresql/server/storage
-@dir include/postgresql/server/tcop
-@dir include/postgresql/server/tsearch/dicts
-@dir include/postgresql/server/tsearch
-@dir include/postgresql/server/utils
-@dir include/postgresql/server
-@dir include/postgresql
-@dir lib/postgresql/pgxs/config
-@dir lib/postgresql/pgxs/src/makefiles
-@dir lib/postgresql/pgxs/src
-@dir lib/postgresql/pgxs
-@dir lib/postgresql
-%%PORTDOCS%%@dir %%DOCSDIR%%
-@dir %%DATADIR%%
diff --git a/databases/postgresql94-server/pkg-plist-contrib b/databases/postgresql94-server/pkg-plist-contrib
index 0b3aeda218c2..9810a6293104 100644
--- a/databases/postgresql94-server/pkg-plist-contrib
+++ b/databases/postgresql94-server/pkg-plist-contrib
@@ -206,9 +206,3 @@ share/doc/postgresql/extension/timetravel.example
 %%DATADIR%%/extension/xml2.control
 %%DATADIR%%/tsearch_data/unaccent.rules
 %%DATADIR%%/tsearch_data/xsyn_sample.rules
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%/extension
-@dir %%DOCSDIR%%
-@dir lib/postgresql
diff --git a/databases/postgresql94-server/pkg-plist-plperl b/databases/postgresql94-server/pkg-plist-plperl
index feaadbf119d2..5cdf261fae45 100644
--- a/databases/postgresql94-server/pkg-plist-plperl
+++ b/databases/postgresql94-server/pkg-plist-plperl
@@ -6,7 +6,3 @@
 %%DATADIR%%/extension/plperl--unpackaged--1.0.sql
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dir lib/postgresql
-@dir %%DOCSDIR%%
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
diff --git a/databases/postgresql94-server/pkg-plist-plpython b/databases/postgresql94-server/pkg-plist-plpython
index c7ffa81d313c..083d330d22c4 100644
--- a/databases/postgresql94-server/pkg-plist-plpython
+++ b/databases/postgresql94-server/pkg-plist-plpython
@@ -10,6 +10,3 @@
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
 %%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-@dir %%DATADIR%%/extension
-@dir lib/postgresql
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql94-server/pkg-plist-pltcl b/databases/postgresql94-server/pkg-plist-pltcl
index 7cd8d90db4e9..f5fe8c74be5c 100644
--- a/databases/postgresql94-server/pkg-plist-pltcl
+++ b/databases/postgresql94-server/pkg-plist-pltcl
@@ -6,11 +6,7 @@
 %%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dir lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
 %%DATADIR%%/unknown.pltcl
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%
-@dir %%DOCSDIR%%
diff --git a/databases/postgresql94-server/pkg-plist-server b/databases/postgresql94-server/pkg-plist-server
index 54b074bea9fe..8f10e533bf40 100644
--- a/databases/postgresql94-server/pkg-plist-server
+++ b/databases/postgresql94-server/pkg-plist-server
@@ -40,7 +40,6 @@ lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
 lib/libpgcommon.a
 %%PORTDOCS%%%%DOCSDIR%%/README-server
-%%PORTDOCS%%@dir %%DOCSDIR%%
 %%DATADIR%%/conversion_create.sql
 %%DATADIR%%/information_schema.sql
 %%DATADIR%%/pg_hba.conf.sample
@@ -727,27 +726,6 @@ lib/libpgcommon.a
 %%DATADIR%%/timezonesets/India
 %%DATADIR%%/timezonesets/Indian.txt
 %%DATADIR%%/timezonesets/Pacific.txt
-%%TZDATA%%@dir %%DATADIR%%/timezone/Africa
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Argentina
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Indiana
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/Kentucky
-%%TZDATA%%@dir %%DATADIR%%/timezone/America/North_Dakota
-%%TZDATA%%@dir %%DATADIR%%/timezone/America
-%%TZDATA%%@dir %%DATADIR%%/timezone/Antarctica
-%%TZDATA%%@dir %%DATADIR%%/timezone/Arctic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Asia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Atlantic
-%%TZDATA%%@dir %%DATADIR%%/timezone/Australia
-%%TZDATA%%@dir %%DATADIR%%/timezone/Brazil
-%%TZDATA%%@dir %%DATADIR%%/timezone/Canada
-%%TZDATA%%@dir %%DATADIR%%/timezone/Chile
-%%TZDATA%%@dir %%DATADIR%%/timezone/Etc
-%%TZDATA%%@dir %%DATADIR%%/timezone/Europe
-%%TZDATA%%@dir %%DATADIR%%/timezone/Indian
-%%TZDATA%%@dir %%DATADIR%%/timezone/Mexico
-%%TZDATA%%@dir %%DATADIR%%/timezone/Pacific
-%%TZDATA%%@dir %%DATADIR%%/timezone/US
-%%TZDATA%%@dir %%DATADIR%%/timezone
 %%DATADIR%%/tsearch_data/danish.stop
 %%DATADIR%%/tsearch_data/dutch.stop
 %%DATADIR%%/tsearch_data/english.stop
@@ -767,13 +745,4 @@ lib/libpgcommon.a
 %%DATADIR%%/tsearch_data/ispell_sample.dict
 %%DATADIR%%/tsearch_data/synonym_sample.syn
 %%DATADIR%%/tsearch_data/thesaurus_sample.ths
-@dir %%DATADIR%%/extension
-@dir %%DATADIR%%/timezonesets
-@exec /bin/mkdir -p %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@exec /usr/sbin/chown %%PG_USER%%:%%PG_GROUP%% %%PREFIX%%/%%PG_USER%% || /usr/bin/true
-@dir %%DATADIR%%/tsearch_data
-@dir %%DATADIR%%
-@dir etc/periodic/daily
-@dir etc/periodic
-@dir lib/postgresql
-@dir %%PG_USER%%
+@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%