- Modernize plist

Approved by:	portmgr blanket

6 files changed, 1 insertions, 88 deletions

diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client
index 5746b9183c19..505294e0dfc2 100644
--- a/databases/postgresql84-server/pkg-plist-client
+++ b/databases/postgresql84-server/pkg-plist-client
@@ -459,54 +459,17 @@ include/postgresql/server/utils/uuid.h
 include/postgresql/server/utils/varbit.h
 include/postgresql/server/utils/xml.h
 include/postgresql/server/windowapi.h
-@dirrm include/postgresql/server/utils
-@dirrm include/postgresql/server/tsearch/dicts
-@dirrm include/postgresql/server/tsearch
-@dirrm include/postgresql/server/tcop
-@dirrm include/postgresql/server/storage
-@dirrm include/postgresql/server/snowball/libstemmer
-@dirrm include/postgresql/server/snowball
-@dirrm include/postgresql/server/rewrite
-@dirrm include/postgresql/server/regex
-@dirrm include/postgresql/server/postmaster
-@dirrm include/postgresql/server/portability
-@dirrm include/postgresql/server/port/win32_msvc/sys
-@dirrm include/postgresql/server/port/win32_msvc
-@dirrm include/postgresql/server/port/win32/sys
-@dirrm include/postgresql/server/port/win32/netinet
-@dirrm include/postgresql/server/port/win32/arpa
-@dirrm include/postgresql/server/port/win32
-@dirrm include/postgresql/server/port
-@dirrm include/postgresql/server/parser
-@dirrm include/postgresql/server/optimizer
-@dirrm include/postgresql/server/nodes
-@dirrm include/postgresql/server/mb
-@dirrm include/postgresql/server/libpq
-@dirrm include/postgresql/server/lib
-@dirrm include/postgresql/server/foreign
-@dirrm include/postgresql/server/executor
-@dirrm include/postgresql/server/commands
-@dirrm include/postgresql/server/catalog
-@dirrm include/postgresql/server/bootstrap
-@dirrm include/postgresql/server/access
-@dirrm include/postgresql/server
 include/libpq/libpq-fs.h
-@dirrm include/libpq
 include/postgresql/internal/libpq/pqcomm.h
-@dirrm include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
 include/postgresql/informix/esql/sqlda.h
 include/postgresql/informix/esql/sqltypes.h
-@dirrm include/postgresql/informix/esql
-@dirrm 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
-@dirrm include/postgresql/internal
-@dirrm include/postgresql
 include/ecpg_informix.h
 include/ecpgerrno.h
 include/ecpglib.h
@@ -543,11 +506,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
-@dirrm lib/postgresql/pgxs/src/makefiles
-@dirrm lib/postgresql/pgxs/config
-@dirrm lib/postgresql/pgxs/src
-@dirrm lib/postgresql/pgxs
-@dirrm lib/postgresql
 man/man1/clusterdb.1.gz
 man/man1/createdb.1.gz
 man/man1/createlang.1.gz
@@ -710,10 +668,8 @@ man/man7/vacuum.7.gz
 man/man7/values.7.gz
 man/man7/with.7.gz
 %%DOCSDIR%%/README-client
-@dirrmtry %%DOCSDIR%%
 share/postgresql/pg_service.conf.sample
 share/postgresql/psqlrc.sample
-@dirrmtry share/postgresql
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-8.4.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts-8.4.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql-8.4.mo
diff --git a/databases/postgresql84-server/pkg-plist-contrib b/databases/postgresql84-server/pkg-plist-contrib
index 52fddbc11b9f..80c7e0f1222d 100644
--- a/databases/postgresql84-server/pkg-plist-contrib
+++ b/databases/postgresql84-server/pkg-plist-contrib
@@ -116,9 +116,3 @@ share/postgresql/contrib/uninstall_tsearch2.sql
 share/postgresql/contrib/uninstall_uuid-ossp.sql
 share/postgresql/contrib/uuid-ossp.sql
 share/postgresql/tsearch_data/xsyn_sample.rules
-@dirrmtry share/postgresql/tsearch_data
-@dirrmtry share/postgresql/contrib
-@dirrmtry share/postgresql
-@dirrmtry %%DOCSDIR%%/contrib
-@dirrmtry %%DOCSDIR%%
-@dirrmtry lib/postgresql
diff --git a/databases/postgresql84-server/pkg-plist-plperl b/databases/postgresql84-server/pkg-plist-plperl
index c84ea2e6d16c..3828f76055ff 100644
--- a/databases/postgresql84-server/pkg-plist-plperl
+++ b/databases/postgresql84-server/pkg-plist-plperl
@@ -1,4 +1,2 @@
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql84-server/pkg-plist-plpython b/databases/postgresql84-server/pkg-plist-plpython
index d3c29953b6b5..2dce739ca0eb 100644
--- a/databases/postgresql84-server/pkg-plist-plpython
+++ b/databases/postgresql84-server/pkg-plist-plpython
@@ -1,4 +1,2 @@
 %%DOCSDIR%%/README-plpython
 lib/postgresql/plpython.so
-@dirrmtry lib/postgresql
-@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql84-server/pkg-plist-pltcl b/databases/postgresql84-server/pkg-plist-pltcl
index 47036c2a4e2a..25fc17cafad5 100644
--- a/databases/postgresql84-server/pkg-plist-pltcl
+++ b/databases/postgresql84-server/pkg-plist-pltcl
@@ -1,9 +1,6 @@
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@dirrmtry lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
 share/postgresql/unknown.pltcl
-@dirrmtry share/postgresql
-@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 944101267e75..c2b3aa92f243 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -34,7 +34,6 @@ lib/postgresql/utf8_and_sjis.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
 %%DOCSDIR%%/README-server
-@dirrmtry %%DOCSDIR%%
 share/postgresql/conversion_create.sql
 share/postgresql/information_schema.sql
 share/postgresql/pg_hba.conf.sample
@@ -723,28 +722,6 @@ share/postgresql/timezonesets/Europe.txt
 share/postgresql/timezonesets/India
 share/postgresql/timezonesets/Indian.txt
 share/postgresql/timezonesets/Pacific.txt
-%%TZDATA%%@dirrm share/postgresql/timezone/Africa
-%%TZDATA%%@dirrm share/postgresql/timezone/America/Argentina
-%%TZDATA%%@dirrm share/postgresql/timezone/America/Indiana
-%%TZDATA%%@dirrm share/postgresql/timezone/America/Kentucky
-%%TZDATA%%@dirrm share/postgresql/timezone/America/North_Dakota
-%%TZDATA%%@dirrm share/postgresql/timezone/America
-%%TZDATA%%@dirrm share/postgresql/timezone/Antarctica
-%%TZDATA%%@dirrm share/postgresql/timezone/Arctic
-%%TZDATA%%@dirrm share/postgresql/timezone/Asia
-%%TZDATA%%@dirrm share/postgresql/timezone/Atlantic
-%%TZDATA%%@dirrm share/postgresql/timezone/Australia
-%%TZDATA%%@dirrm share/postgresql/timezone/Brazil
-%%TZDATA%%@dirrm share/postgresql/timezone/Canada
-%%TZDATA%%@dirrm share/postgresql/timezone/Chile
-%%TZDATA%%@dirrm share/postgresql/timezone/Etc
-%%TZDATA%%@dirrm share/postgresql/timezone/Europe
-%%TZDATA%%@dirrm share/postgresql/timezone/Indian
-%%TZDATA%%@dirrm share/postgresql/timezone/Mexico
-%%TZDATA%%@dirrm share/postgresql/timezone/Pacific
-%%TZDATA%%@dirrm share/postgresql/timezone/US
-%%TZDATA%%@dirrm share/postgresql/timezone
-@dirrm share/postgresql/timezonesets
 share/postgresql/tsearch_data/danish.stop
 share/postgresql/tsearch_data/dutch.stop
 share/postgresql/tsearch_data/english.stop
@@ -764,11 +741,4 @@ share/postgresql/tsearch_data/ispell_sample.affix
 share/postgresql/tsearch_data/ispell_sample.dict
 share/postgresql/tsearch_data/synonym_sample.syn
 share/postgresql/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
-@dirrmtry share/postgresql/tsearch_data
-@dirrmtry share/postgresql
-@dirrmtry etc/periodic/daily
-@dirrmtry etc/periodic
-@dirrmtry lib/postgresql
-@dirrmtry %%PG_USER%%
+@dir(%%PG_USER%%,%%PG_GROUP%%) %%PG_USER%%