From ce93c84ea1964dd43594cf12dee88916e31a8e87 Mon Sep 17 00:00:00 2001 From: Sheldon Hearn Date: Wed, 25 Jul 2001 08:07:44 +0000 Subject: Fix mtree errors preventing automated package building: * Take a stab at removing the pgsql user's home directory on deinstall. * Only remove man/manl and others when PG_PREFIX is set. Submitted by: maintainer --- databases/postgresql-devel-server/pkg-plist | 11 ++++++----- databases/postgresql-devel/pkg-plist | 11 ++++++----- databases/postgresql7/pkg-plist | 11 ++++++----- databases/postgresql73-server/pkg-plist | 11 ++++++----- databases/postgresql73/pkg-plist | 11 ++++++----- databases/postgresql74-server/pkg-plist | 11 ++++++----- databases/postgresql80-server/pkg-plist | 11 ++++++----- databases/postgresql81-server/pkg-plist | 11 ++++++----- databases/postgresql82-server/pkg-plist | 11 ++++++----- databases/postgresql83-server/pkg-plist | 11 ++++++----- databases/postgresql84-server/pkg-plist | 11 ++++++----- databases/postgresql90-server/pkg-plist | 11 ++++++----- databases/postgresql91-server/pkg-plist | 11 ++++++----- databases/postgresql92-server/pkg-plist | 11 ++++++----- 14 files changed, 84 insertions(+), 70 deletions(-) (limited to 'databases') diff --git a/databases/postgresql-devel-server/pkg-plist b/databases/postgresql-devel-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql-devel-server/pkg-plist +++ b/databases/postgresql-devel-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql-devel/pkg-plist b/databases/postgresql-devel/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql-devel/pkg-plist +++ b/databases/postgresql-devel/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql7/pkg-plist b/databases/postgresql7/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql7/pkg-plist +++ b/databases/postgresql7/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql73-server/pkg-plist b/databases/postgresql73-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql73-server/pkg-plist +++ b/databases/postgresql73-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql73/pkg-plist b/databases/postgresql73/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql73/pkg-plist +++ b/databases/postgresql73/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql74-server/pkg-plist b/databases/postgresql74-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql74-server/pkg-plist +++ b/databases/postgresql74-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql80-server/pkg-plist b/databases/postgresql80-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql80-server/pkg-plist +++ b/databases/postgresql80-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql81-server/pkg-plist b/databases/postgresql81-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql81-server/pkg-plist +++ b/databases/postgresql81-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql82-server/pkg-plist b/databases/postgresql82-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql82-server/pkg-plist +++ b/databases/postgresql82-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql83-server/pkg-plist b/databases/postgresql83-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql83-server/pkg-plist +++ b/databases/postgresql83-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql84-server/pkg-plist b/databases/postgresql84-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql84-server/pkg-plist +++ b/databases/postgresql84-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql90-server/pkg-plist b/databases/postgresql90-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql90-server/pkg-plist +++ b/databases/postgresql90-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql91-server/pkg-plist b/databases/postgresql91-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql91-server/pkg-plist +++ b/databases/postgresql91-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." diff --git a/databases/postgresql92-server/pkg-plist b/databases/postgresql92-server/pkg-plist index 24bd7d94be10..a7493ddb7898 100644 --- a/databases/postgresql92-server/pkg-plist +++ b/databases/postgresql92-server/pkg-plist @@ -82,9 +82,10 @@ share/postgresql/dot.cshrc.dist @exec [ -f %D/share/postgresql/dot.cshrc.dist ] && cp %D/share/postgresql/dot.cshrc.dist ~pgsql/. @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile) @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc) -@unexec rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true -@unexec rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%bin 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%lib 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/man1 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man/manl 2> /dev/null || true +@unexec [ X%%PG_PREFIX%% != X ] && rmdir %D/%%PG_PREFIX%%man 2> /dev/null || true +@unexec rmdir ~pgsql 2> /dev/null || true @unexec echo "Warning: If you will *NOT* use this package anymore, please remove %D/pgsql and the pgsql user manually." -- cgit v1.2.3