From 8edb391ee5212704b314b0e9b6fce2c15916e8e4 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 25 Feb 2004 23:54:19 +0000
Subject: [PATCH] @extra removes user/group too

---
 databases/mysql/pkg/DEINSTALL-server | 30 +++++++++++++---------------
 databases/mysql/pkg/PLIST-server     |  4 +++-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/databases/mysql/pkg/DEINSTALL-server b/databases/mysql/pkg/DEINSTALL-server
index 7577872ab41..71ba8b0b8d8 100644
--- a/databases/mysql/pkg/DEINSTALL-server
+++ b/databases/mysql/pkg/DEINSTALL-server
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL-server,v 1.7 2004/01/31 03:08:49 brad Exp $
+# $OpenBSD: DEINSTALL-server,v 1.8 2004/02/25 23:54:19 brad Exp $
 #
 # MySQL de-installation
 
@@ -10,23 +10,21 @@ SOCKET_DIR=${SOCKET_DIR}
 MYSQLUSER=_mysql
 MYSQLGROUP=_mysql
 
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you need"
-echo "| to perform these steps as root:"
-echo "|"
-echo "|           userdel $MYSQLUSER"
-echo "|           groupdel $MYSQLGROUP"
-if [ "$PKG_DELETE_EXTRA" != Yes -a -d $DB_DIR ]; then
+if [ "$PKG_DELETE_EXTRA" != Yes ]; then
+    echo
+    echo "+---------------"
+    echo "| To completely deinstall the $1 package you need"
+    echo "| to perform these steps as root:"
+    echo "|"
+    echo "|           userdel $MYSQLUSER"
+    echo "|           groupdel $MYSQLGROUP"
     echo "|           rm -rf $DB_DIR"
-fi
-if [ "$PKG_DELETE_EXTRA" != Yes -a -d $SOCKET_DIR ]; then
     echo "|           rm -rf $SOCKET_DIR"
+    echo "|"
+    echo "| Do not do this if you plan on re-installing $1"
+    echo "| at some future time."
+    echo "+---------------"
+    echo
 fi
-echo "|"
-echo "| Do not do this if you plan on re-installing $1"
-echo "| at some future time."
-echo "+---------------"
-echo
 
 exit 0
diff --git a/databases/mysql/pkg/PLIST-server b/databases/mysql/pkg/PLIST-server
index c04c3ebee6f..fcfc936417e 100644
--- a/databases/mysql/pkg/PLIST-server
+++ b/databases/mysql/pkg/PLIST-server
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-server,v 1.10 2004/02/22 01:20:11 brad Exp $
+@comment $OpenBSD: PLIST-server,v 1.11 2004/02/25 23:54:19 brad Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -216,5 +216,7 @@ share/mysql/ukrainian/errmsg.txt
 @dirrm share/mysql
 @dirrm share/doc/mysql/Flags
 @dirrm share/doc/mysql
+@extraunexec userdel _mysql
+@extraunexec groupdel _mysql
 @extraunexec rm -rf ${DB_DIR}
 @extraunexec rm -rf ${SOCKET_DIR}