5 files changed, 55 insertions, 29 deletions

diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 5bed45abaf2f..68bf64c93122 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -133,5 +133,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} ${DOCSDIR}/saslauthd
 .endfor
 .endif
+	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} \
+		POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/security/cyrus-sasl2-saslauthd/pkg-deinstall b/security/cyrus-sasl2-saslauthd/pkg-deinstall
new file mode 100644
index 000000000000..db4488ed1b72
--- /dev/null
+++ b/security/cyrus-sasl2-saslauthd/pkg-deinstall
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+#	$FreeBSD$
+#
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
+
+remove_file()
+{
+	file=$1
+
+	if cmp -s ${file} ${file}.tmp; then
+		rm -f ${file}
+	fi
+	rm -f ${file}.tmp
+}
+
+# This should really be uninstalled by Sendmail
+sendmail_conf() {
+	if [ -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf ]; then
+		echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Sendmail.conf.tmp
+		remove_file ${PKG_PREFIX}/lib/sasl2/Sendmail.conf
+	fi
+}
+
+case $2 in
+DEINSTALL)
+	sendmail_conf
+	;;
+esac
diff --git a/security/cyrus-sasl2-saslauthd/pkg-install b/security/cyrus-sasl2-saslauthd/pkg-install
new file mode 100644
index 000000000000..65dea035f4f5
--- /dev/null
+++ b/security/cyrus-sasl2-saslauthd/pkg-install
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+#	$FreeBSD$
+#
+
+PKG_BATCH=${BATCH:=NO}
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
+
+# This should really be installed by Sendmail
+sendmail_conf() {
+	if [ ! -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf ]; then
+		echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Sendmail.conf
+	fi
+}
+
+case $2 in
+POST-INSTALL)
+	if [ "${PKG_BATCH}" = "NO" ]; then
+		sendmail_conf
+	fi
+	;;
+esac
diff --git a/security/cyrus-sasl2/pkg-deinstall b/security/cyrus-sasl2/pkg-deinstall
index 87d620928422..e12682e24418 100644
--- a/security/cyrus-sasl2/pkg-deinstall
+++ b/security/cyrus-sasl2/pkg-deinstall
@@ -15,16 +15,6 @@ SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
 CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
 CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
 
-remove_file()
-{
-	file=$1
-
-	if cmp -s ${file} ${file}.tmp; then
-		rm -f ${file}
-	fi
-	rm -f ${file}.tmp
-}
-
 # delete sasldb database
 
 delete_sasldb() {
@@ -47,19 +37,9 @@ delete_user() {
 
 }
 
-# This should really be uninstalled by Sendmail
-
-sendmail_conf() {
-	if [ -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf ]; then
-		echo "pwcheck_method: auxprop" > ${PKG_PREFIX}/lib/sasl2/Sendmail.conf.tmp
-		remove_file ${PKG_PREFIX}/lib/sasl2/Sendmail.conf
-	fi
-}
-
 case $2 in
 	DEINSTALL)
 		delete_sasldb
-		sendmail_conf
 		;;
 	POST-DEINSTALL)
 		delete_user
diff --git a/security/cyrus-sasl2/pkg-install b/security/cyrus-sasl2/pkg-install
index 627f039b6625..25db3ba32891 100644
--- a/security/cyrus-sasl2/pkg-install
+++ b/security/cyrus-sasl2/pkg-install
@@ -85,14 +85,6 @@ create_sasldb() {
 	fi
 }
 
-# This should really be installed by Sendmail
-
-sendmail_conf() {
-	if [ ! -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf ]; then
-		echo "pwcheck_method: auxprop" > ${PKG_PREFIX}/lib/sasl2/Sendmail.conf
-	fi
-}
-
 case $2 in
 	PRE-INSTALL)
 		create_user
@@ -100,7 +92,6 @@ case $2 in
 	POST-INSTALL)
 		if [ "${PKG_BATCH}" = "NO" ]; then
 			create_sasldb
-			sendmail_conf
 		fi
 		;;