From 9fc0a4b07494c751628c6462d0ecd3f6473ac5a8 Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Tue, 30 Mar 2004 15:28:07 +0000
Subject: [PATCH] cosmetic changes.

---
 mail/cyrus-imapd/pkg-deinstall     | 20 ++++++++++----------
 mail/cyrus-imapd/pkg-install       |  6 +++---
 mail/cyrus-imapd2/pkg-deinstall    | 20 ++++++++++----------
 mail/cyrus-imapd2/pkg-install      |  6 +++---
 mail/cyrus-imapd22/pkg-deinstall   | 20 ++++++++++----------
 mail/cyrus-imapd22/pkg-install     |  6 +++---
 mail/cyrus-imapd23/pkg-deinstall   | 20 ++++++++++----------
 mail/cyrus-imapd23/pkg-install     |  6 +++---
 mail/cyrus-imapd24/pkg-deinstall   | 20 ++++++++++----------
 mail/cyrus-imapd24/pkg-install     |  6 +++---
 security/cyrus-sasl2/pkg-deinstall |  2 +-
 security/cyrus-sasl2/pkg-install   | 12 ++++++------
 12 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/mail/cyrus-imapd/pkg-deinstall b/mail/cyrus-imapd/pkg-deinstall
index 07501c786c70..1dbd7611e293 100644
--- a/mail/cyrus-imapd/pkg-deinstall
+++ b/mail/cyrus-imapd/pkg-deinstall
@@ -11,16 +11,16 @@ PKG_BATCH=${BATCH:=NO}
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 
 checkfile() {
-        diff -bBqw $1 $1.dist >/dev/null 2>&1
-        case $? in
-                0)      # config file exists, but is the same
+	diff -bBqw $1 $1.dist >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
 			rm $1
-                        ;;
-                1)      # config file exists and differs
-                        ;;
-                *)      # no config file exists
-                        ;;
-        esac
+			;;
+		1)	# config file exists and differs
+			;;
+		*)	# no config file exists
+			;;
+	esac
 }
 
 # Uninstall timseived's Cyrus.conf file.
@@ -49,7 +49,7 @@ modify_cyrus_user() {
 	fi
 	uhome=/nonexistent
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 		e=$?
 		echo "*** Failed to update user \`${USER}'."
 		exit ${e}
diff --git a/mail/cyrus-imapd/pkg-install b/mail/cyrus-imapd/pkg-install
index 154d83b03038..9578149d63a6 100644
--- a/mail/cyrus-imapd/pkg-install
+++ b/mail/cyrus-imapd/pkg-install
@@ -16,7 +16,7 @@ modify_cyrus_user() {
 	shell=/bin/csh
 	uhome=${PKG_PREFIX}/cyrus
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 			e=$?
 			echo "*** Failed to update user \`${USER}'."
 			exit ${e}
@@ -31,8 +31,8 @@ checkfile() {
 		0)	# config file exists, but is the same
 			;;
 		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version"; 
-			echo "   of the port.  See $1.dist for details."; 
+			echo "** Make sure $1 is in sync with this version";
+			echo "   of the port.  See $1.dist for details.";
 			;;
 		*)	# no config file exists, copy it
 			install -c -m 644 $1.dist $1
diff --git a/mail/cyrus-imapd2/pkg-deinstall b/mail/cyrus-imapd2/pkg-deinstall
index aed34d1fec6e..8bb9e0f75812 100644
--- a/mail/cyrus-imapd2/pkg-deinstall
+++ b/mail/cyrus-imapd2/pkg-deinstall
@@ -13,16 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
 
 checkfile() {
-        diff -bBqw $1 $1.dist >/dev/null 2>&1
-        case $? in
-                0)      # config file exists, but is the same
+	diff -bBqw $1 $1.dist >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
 			rm $1
-                        ;;
-                1)      # config file exists and differs
-                        ;;
-                *)      # no config file exists
-                        ;;
-        esac
+			;;
+		1)	# config file exists and differs
+			;;
+		*)	# no config file exists
+			;;
+	esac
 }
 
 #
@@ -39,7 +39,7 @@ modify_cyrus_user() {
 	fi
 	uhome=/nonexistent
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 		e=$?
 		echo "*** Failed to update user \`${USER}'."
 		exit ${e}
diff --git a/mail/cyrus-imapd2/pkg-install b/mail/cyrus-imapd2/pkg-install
index 8bbe09d840f5..a4a1d6837d0a 100644
--- a/mail/cyrus-imapd2/pkg-install
+++ b/mail/cyrus-imapd2/pkg-install
@@ -18,7 +18,7 @@ modify_cyrus_user() {
 	shell=/bin/csh
 	uhome=${PKG_PREFIX}/cyrus
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 			e=$?
 			echo "*** Failed to update user \`${USER}'."
 			exit ${e}
@@ -33,8 +33,8 @@ checkfile() {
 		0)	# config file exists, but is the same
 			;;
 		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version"; 
-			echo "   of the port.  See $1.dist for details."; 
+			echo "** Make sure $1 is in sync with this version";
+			echo "   of the port.  See $1.dist for details.";
 			;;
 		*)	# no config file exists, copy it
 			install -c -m 644 $1.dist $1
diff --git a/mail/cyrus-imapd22/pkg-deinstall b/mail/cyrus-imapd22/pkg-deinstall
index aed34d1fec6e..8bb9e0f75812 100644
--- a/mail/cyrus-imapd22/pkg-deinstall
+++ b/mail/cyrus-imapd22/pkg-deinstall
@@ -13,16 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
 
 checkfile() {
-        diff -bBqw $1 $1.dist >/dev/null 2>&1
-        case $? in
-                0)      # config file exists, but is the same
+	diff -bBqw $1 $1.dist >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
 			rm $1
-                        ;;
-                1)      # config file exists and differs
-                        ;;
-                *)      # no config file exists
-                        ;;
-        esac
+			;;
+		1)	# config file exists and differs
+			;;
+		*)	# no config file exists
+			;;
+	esac
 }
 
 #
@@ -39,7 +39,7 @@ modify_cyrus_user() {
 	fi
 	uhome=/nonexistent
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 		e=$?
 		echo "*** Failed to update user \`${USER}'."
 		exit ${e}
diff --git a/mail/cyrus-imapd22/pkg-install b/mail/cyrus-imapd22/pkg-install
index 8bbe09d840f5..a4a1d6837d0a 100644
--- a/mail/cyrus-imapd22/pkg-install
+++ b/mail/cyrus-imapd22/pkg-install
@@ -18,7 +18,7 @@ modify_cyrus_user() {
 	shell=/bin/csh
 	uhome=${PKG_PREFIX}/cyrus
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 			e=$?
 			echo "*** Failed to update user \`${USER}'."
 			exit ${e}
@@ -33,8 +33,8 @@ checkfile() {
 		0)	# config file exists, but is the same
 			;;
 		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version"; 
-			echo "   of the port.  See $1.dist for details."; 
+			echo "** Make sure $1 is in sync with this version";
+			echo "   of the port.  See $1.dist for details.";
 			;;
 		*)	# no config file exists, copy it
 			install -c -m 644 $1.dist $1
diff --git a/mail/cyrus-imapd23/pkg-deinstall b/mail/cyrus-imapd23/pkg-deinstall
index aed34d1fec6e..8bb9e0f75812 100644
--- a/mail/cyrus-imapd23/pkg-deinstall
+++ b/mail/cyrus-imapd23/pkg-deinstall
@@ -13,16 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
 
 checkfile() {
-        diff -bBqw $1 $1.dist >/dev/null 2>&1
-        case $? in
-                0)      # config file exists, but is the same
+	diff -bBqw $1 $1.dist >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
 			rm $1
-                        ;;
-                1)      # config file exists and differs
-                        ;;
-                *)      # no config file exists
-                        ;;
-        esac
+			;;
+		1)	# config file exists and differs
+			;;
+		*)	# no config file exists
+			;;
+	esac
 }
 
 #
@@ -39,7 +39,7 @@ modify_cyrus_user() {
 	fi
 	uhome=/nonexistent
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 		e=$?
 		echo "*** Failed to update user \`${USER}'."
 		exit ${e}
diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/pkg-install
index 8bbe09d840f5..a4a1d6837d0a 100644
--- a/mail/cyrus-imapd23/pkg-install
+++ b/mail/cyrus-imapd23/pkg-install
@@ -18,7 +18,7 @@ modify_cyrus_user() {
 	shell=/bin/csh
 	uhome=${PKG_PREFIX}/cyrus
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 			e=$?
 			echo "*** Failed to update user \`${USER}'."
 			exit ${e}
@@ -33,8 +33,8 @@ checkfile() {
 		0)	# config file exists, but is the same
 			;;
 		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version"; 
-			echo "   of the port.  See $1.dist for details."; 
+			echo "** Make sure $1 is in sync with this version";
+			echo "   of the port.  See $1.dist for details.";
 			;;
 		*)	# no config file exists, copy it
 			install -c -m 644 $1.dist $1
diff --git a/mail/cyrus-imapd24/pkg-deinstall b/mail/cyrus-imapd24/pkg-deinstall
index aed34d1fec6e..8bb9e0f75812 100644
--- a/mail/cyrus-imapd24/pkg-deinstall
+++ b/mail/cyrus-imapd24/pkg-deinstall
@@ -13,16 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
 
 checkfile() {
-        diff -bBqw $1 $1.dist >/dev/null 2>&1
-        case $? in
-                0)      # config file exists, but is the same
+	diff -bBqw $1 $1.dist >/dev/null 2>&1
+	case $? in
+		0)	# config file exists, but is the same
 			rm $1
-                        ;;
-                1)      # config file exists and differs
-                        ;;
-                *)      # no config file exists
-                        ;;
-        esac
+			;;
+		1)	# config file exists and differs
+			;;
+		*)	# no config file exists
+			;;
+	esac
 }
 
 #
@@ -39,7 +39,7 @@ modify_cyrus_user() {
 	fi
 	uhome=/nonexistent
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 		e=$?
 		echo "*** Failed to update user \`${USER}'."
 		exit ${e}
diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install
index 8bbe09d840f5..a4a1d6837d0a 100644
--- a/mail/cyrus-imapd24/pkg-install
+++ b/mail/cyrus-imapd24/pkg-install
@@ -18,7 +18,7 @@ modify_cyrus_user() {
 	shell=/bin/csh
 	uhome=${PKG_PREFIX}/cyrus
 
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
+	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
 			e=$?
 			echo "*** Failed to update user \`${USER}'."
 			exit ${e}
@@ -33,8 +33,8 @@ checkfile() {
 		0)	# config file exists, but is the same
 			;;
 		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version"; 
-			echo "   of the port.  See $1.dist for details."; 
+			echo "** Make sure $1 is in sync with this version";
+			echo "   of the port.  See $1.dist for details.";
 			;;
 		*)	# no config file exists, copy it
 			install -c -m 644 $1.dist $1
diff --git a/security/cyrus-sasl2/pkg-deinstall b/security/cyrus-sasl2/pkg-deinstall
index e12682e24418..77a3b09a06e1 100644
--- a/security/cyrus-sasl2/pkg-deinstall
+++ b/security/cyrus-sasl2/pkg-deinstall
@@ -19,7 +19,7 @@ CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
 
 delete_sasldb() {
 	if [ -f ${SASLDB_NAME} ] ; then
-		if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ] ; then
+		if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ]; then
 			rm ${SASLDB_NAME}
 		else
 			echo "WARNING: Users SASL passwords are in ${SASLDB_NAME}, keeping this file"
diff --git a/security/cyrus-sasl2/pkg-install b/security/cyrus-sasl2/pkg-install
index 25db3ba32891..0416dd08b99a 100644
--- a/security/cyrus-sasl2/pkg-install
+++ b/security/cyrus-sasl2/pkg-install
@@ -23,13 +23,13 @@ CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
 create_user() {
 	USER=${CYRUS_USER}
 	GROUP=${CYRUS_GROUP}
-	PW=/usr/sbin/pw 
+	PW=/usr/sbin/pw
 
-	if [ -x /sbin/nologin ]; then   
-		shell=/sbin/nologin   
-	else   
-		shell=/nonexistent   
-	fi 
+	if [ -x /sbin/nologin ]; then
+		shell=/sbin/nologin
+	else
+		shell=/nonexistent
+	fi
 	uhome="/nonexistent"
 
 	if ! ${PW} show group ${GROUP} -q >/dev/null; then