- Remove unnecessary line from files/pkg-deinstall.in

- Fix files/pkg-install.in

Pointed out by:	riggs@
MFH:		2018Q1

2 files changed, 8 insertions, 1 deletions

diff --git a/japanese/mailman/files/pkg-deinstall.in b/japanese/mailman/files/pkg-deinstall.in
index f8a389e8d545..38dfbf7cd9d7 100644
--- a/japanese/mailman/files/pkg-deinstall.in
+++ b/japanese/mailman/files/pkg-deinstall.in
@@ -40,7 +40,6 @@ POST-DEINSTALL)
   echo "---> Starting post-deinstall script"
 
   # try to kill all empty directories - necessary on pkg_add-based systems
-  find "%%MAILMANDIR%%" -depth -type d -exec rmdir '{}' + >/dev/null 2>&1 || :
   if [ -d "%%MAILMANDIR%%" ]; then
     echo '---> %%MAILMANDIR%% is not empty - this installation may have active lists!'
     ls -lRB "%%MAILMANDIR%%" | head -n200 || :
diff --git a/japanese/mailman/files/pkg-install.in b/japanese/mailman/files/pkg-install.in
index 53564cac299f..6b3b5be4e8eb 100644
--- a/japanese/mailman/files/pkg-install.in
+++ b/japanese/mailman/files/pkg-install.in
@@ -16,6 +16,14 @@ POST-INSTALL)
 
   echo "---> Running update"
 
+  for DIR in logs archives lists locks data spam qfiles \
+             archives/private archives/public
+  do
+      if [ ! -e "%%MAILMANDIR%%/$DIR" ]; then
+          /bin/mkdir -p "%%MAILMANDIR%%/$DIR"
+      fi
+  done
+
   LC_ALL=C "%%MAILMANDIR%%/bin/update" || exit 1
 
   echo "---> Checking crontab(5) file for user \"%%USER%%\""