Index: head/security/cyrus-sasl2/pkg-message
===================================================================
--- head/security/cyrus-sasl2/pkg-message	(revision 398372)
+++ head/security/cyrus-sasl2/pkg-message	(nonexistent)
@@ -1,20 +0,0 @@
-
-You can use sasldb2 for authentication, to add users use:
-
-	saslpasswd2 -c username
-
-If you want to enable SMTP AUTH with the system Sendmail, read
-Sendmail.README
-
-NOTE: This port has been compiled with a default pwcheck_method of
-      auxprop.  If you want to authenticate your user by /etc/passwd,
-      PAM or LDAP, install ports/security/cyrus-sasl2-saslauthd and
-      set sasl_pwcheck_method to saslauthd after installing the
-      Cyrus-IMAPd 2.X port.  You should also check the
-      %%PREFIX%%/lib/sasl2/*.conf files for the correct
-      pwcheck_method.
-      If you want to use GSSAPI mechanism, install
-      ports/security/cyrus-sasl2-gssapi.
-      If you want to use LDAP auxprop plugin, install
-      ports/security/cyrus-sasl2-ldapdb.
-

Property changes on: head/security/cyrus-sasl2/pkg-message
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/cyrus-sasl2/pkg-deinstall
===================================================================
--- head/security/cyrus-sasl2/pkg-deinstall	(revision 398372)
+++ head/security/cyrus-sasl2/pkg-deinstall	(nonexistent)
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
-
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
-
-# delete sasldb database
-
-delete_sasldb() {
-	if [ -f ${SASLDB_NAME} ] ; 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"
-		fi
-	fi
-}
-
-delete_user() {
-	if pw usershow ${CYRUS_USER} 2>/dev/null 1>&2; then
-		echo "To delete Cyrus user permanently, use 'pw userdel ${CYRUS_USER}'"
-	fi
-	if pw groupshow ${CYRUS_GROUP} 2>/dev/null 1>&2; then
-		echo "To delete Cyrus group permanently, use 'pw groupdel ${CYRUS_GROUP}'"
-	fi
-
-}
-
-case $2 in
-	DEINSTALL)
-		delete_sasldb
-		;;
-	POST-DEINSTALL)
-		delete_user
-		;;
-
-esac

Property changes on: head/security/cyrus-sasl2/pkg-deinstall
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/cyrus-sasl2/pkg-install
===================================================================
--- head/security/cyrus-sasl2/pkg-install	(revision 398372)
+++ head/security/cyrus-sasl2/pkg-install	(nonexistent)
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: stb@FreeBSD.org for the cyrus imap server
-# Added to the cyrus-sasl port by hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
-
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
-
-#
-# create 'cyrus' user and group before installing
-#
-
-create_user() {
-	USER=${CYRUS_USER}
-	GROUP=${CYRUS_GROUP}
-	PW=/usr/sbin/pw
-
-	if [ -x /usr/sbin/nologin ]; then
-		shell=/usr/sbin/nologin
-	elif [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	uhome="/nonexistent"
-
-	if ! ${PW} show group ${GROUP} -q >/dev/null; then
-		gid=60
-		while ${PW} show group -g ${gid} -q >/dev/null; do
-			gid=`expr ${gid} + 1`
-		done
-		if ! ${PW} add group ${GROUP} -g ${gid}; then
-			e=$?
-			echo "*** Failed to add group \`${GROUP}'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added group \`${GROUP}' (id ${gid})"
-	else
-		gid=`${PW} show group ${GROUP} 2>/dev/null | cut -d: -f3`
-	fi
-
-	if ! ${PW} show user ${USER} -q >/dev/null; then
-		uid=60
-		while ${PW} show user -u ${uid} -q >/dev/null; do
-			uid=`expr ${uid} + 1`
-		done
-		if ! ${PW} add user ${USER} -u ${uid} -g ${gid} -d "${uhome}" \
-				-c "the cyrus mail server" -s "${shell}" -w no \
-				; then
-			e=$?
-			echo "*** Failed to add user \`${USER}'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added user \`${USER}' (id ${uid})"
-	else
-		if ! ${PW} mod user ${USER} -g ${gid}; then
-			e=$?
-			echo "*** Failed to update user \`${USER}'."
-			exit ${e}
-		fi
-		echo "*** Updated user \`${USER}'."
-	fi
-}
-
-create_sasldb() {
-	if [ ! -f ${SASLDB_NAME} ]; then
-		echo "test" | ${PKG_PREFIX}/sbin/saslpasswd2 -p -c ${CYRUS_USER}
-		if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ] ; then
-                        echo "WARNING: Failed to create ${SASLDB_NAME}"
-                else
-			${PKG_PREFIX}/sbin/saslpasswd2 -d ${CYRUS_USER}
-			chown ${CYRUS_USER}:mail ${SASLDB_NAME}
-			chmod 640 ${SASLDB_NAME}
-		fi
-	fi
-}
-
-case $2 in
-	PRE-INSTALL)
-		create_user
-		;;
-	POST-INSTALL)
-		if [ "${PKG_BATCH}" = "NO" ]; then
-			create_sasldb
-		elif [ ! -f ${SASLDB_NAME} ]; then
-			echo "*** We do not create ${SASLDB_NAME} automatically in"
-			echo "*** BATCH mode.  Please create it by yourself.  It should be"
-			echo "*** owner: ${CYRUS_USER}, group: mail, mode: 0640."
-		fi
-		;;
-
-esac

Property changes on: head/security/cyrus-sasl2/pkg-install
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/cyrus-sasl2/Makefile
===================================================================
--- head/security/cyrus-sasl2/Makefile	(revision 398372)
+++ head/security/cyrus-sasl2/Makefile	(revision 398373)
@@ -1,185 +1,174 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-sasl2
 PORTVERSION=	2.1.26
 PORTREVISION=	11
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
 DISTNAME=	cyrus-sasl-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe libtool:keepla pathfix perl5
 USE_PERL5=	patch
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-configdir=${PREFIX}/lib/sasl2:${PREFIX}/etc/sasl2 \
 		--with-plugindir=${PREFIX}/lib/sasl2 \
 		--with-dbpath=${PREFIX}/etc/sasldb2 \
 		--with-lib-subdir=lib \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--includedir=${PREFIX}/include \
 		--enable-static \
 		--enable-auth-sasldb \
 		--with-rc4=openssl \
 		--with-saslauthd=${SASLAUTHD_RUNPATH} \
 		--disable-gssapi \
 		--disable-krb4
 MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
 
 CPE_VENDOR=	cmu
 
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \
 			OBSOLETE_CRAM_ATTR BDB MYSQL PGSQL
 OPTIONS_RADIO=		SQLITE
 OPTIONS_RADIO_SQLITE=	SQLITE2 SQLITE3
 OPTIONS_GROUP=		MECH
 OPTIONS_GROUP_MECH=	CRAM DIGEST LOGIN NTLM OTP PLAIN SCRAM
 OPTIONS_DEFAULT=	AUTHDAEMOND OBSOLETE_CRAM_ATTR CRAM DIGEST \
 			LOGIN NTLM OTP PLAIN SCRAM
 OPTIONS_SUB=		yes
 ALWAYSTRUE_DESC=	the alwaystrue password verifier
 ALWAYSTRUE_CONFIGURE_ENABLE=alwaystrue
 AUTHDAEMOND_DESC=	use of authdaemon
 AUTHDAEMOND_CONFIGURE_ON=--with-authdaemond=/var/run/authdaemond/socket
 AUTHDAEMOND_CONFIGURE_OFF=--with-authdaemond=no
 KEEP_DB_OPEN_DESC=	Keep handle to Berkeley DB open
 KEEP_DB_OPEN_CONFIGURE_ENABLE=keep-db-open
 OBSOLETE_CRAM_ATTR_DESC=cmusaslsecretCRAM-MD5 property
 OBSOLETE_CRAM_ATTR_CONFIGURE_OFF=--enable-obsolete_cram_attr=no
 BDB_USE=		BDB=yes
 BDB_CONFIGURE_ON=	--with-dblib=berkeley \
 			--with-bdb-libdir=${BDB_LIB_DIR} \
 			--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb=${BDB_LIB_NAME}
 BDB_CONFIGURE_OFF=	--with-dblib=ndbm
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
 SQLITE2_DESC=		SQLite 2 database
 SQLITE2_USE=		SQLITE=2
 SQLITE2_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE2_CONFIGURE_OFF=	--without-sqlite
 SQLITE3_USE=		SQLITE=3
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=${LOCALBASE}
 SQLITE3_CONFIGURE_OFF=	--without-sqlite3
 CRAM_DESC=		CRAM-MD5 authentication
 CRAM_CONFIGURE_ENABLE=	cram
 DIGEST_DESC=		DIGEST-MD5 authentication
 DIGEST_CONFIGURE_ENABLE=digest
 LOGIN_DESC=		LOGIN authentication
 LOGIN_CONFIGURE_ENABLE=	login
 NTLM_DESC=		NTLM authentication
 NTLM_CONFIGURE_ENABLE=	ntlm
 OTP_DESC=		OTP authentication
 OTP_CONFIGURE_ENABLE=	otp
 PLAIN_DESC=		PLAIN authentication
 PLAIN_CONFIGURE_ENABLE=	plain
 SCRAM_DESC=		SCRAM authentication
 SCRAM_CONFIGURE_ENABLE=	scram
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MBDB}
 INVALID_BDB_VER=2
 SASLDB_NAME=	sasldb2
 .else
 SASLDB_NAME=	sasldb2.db
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL} || \
     ${PORT_OPTIONS:MSQLITE2} || ${PORT_OPTIONS:MSQLITE3}
 CONFIGURE_ARGS+=--enable-sql
 .else
 SQL=	"@comment "
 .endif
 
 .if ${ARCH} == "amd64"
 CPPFLAGS+=	-fPIC
 .endif
 
 .if ${OPENSSLBASE} == /usr
 CONFIGURE_ARGS+=--with-openssl=yes
 .else
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 .endif
 
 SASLAUTHD_RUNPATH?=	/var/run/saslauthd
 
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
 DOCS=	AUTHORS COPYING ChangeLog INSTALL INSTALL.TXT NEWS README
 
 DOC2=	ONEWS TODO draft-burdis-cat-srp-sasl-xx.txt \
 	draft-ietf-sasl-anon-xx.txt draft-ietf-sasl-crammd5-xx.txt \
 	draft-ietf-sasl-gssapi-xx.txt draft-ietf-sasl-plain-xx.txt \
 	draft-ietf-sasl-rfc2222bis-xx.txt draft-ietf-sasl-rfc2831bis-xx.txt \
 	draft-ietf-sasl-saslprep-xx.txt draft-murchison-sasl-login-xx.txt \
 	draft-newman-sasl-c-api-xx.txt rfc1321.txt rfc1939.txt rfc2104.txt \
 	rfc2195.txt rfc2222.txt rfc2243.txt rfc2245.txt rfc2289.txt \
 	rfc2444.txt rfc2595.txt rfc2831.txt rfc2945.txt rfc3174.txt \
 	server-plugin-flow.fig testing.txt
 
 HTDOCS=	advanced appconvert components gssapi index install macosx \
 	mechanisms options plugprog programming readme sysadmin upgrading \
 	windows
 
+SUB_FILES=	pkg-deinstall pkg-install pkg-message
+SUB_LIST=	CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} \
+		SASLDB=${SASLDB_NAME}
+
 PLIST_SUB+=	PREFIX=${PREFIX} \
 		SQL=${SQL} \
 		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///}
 
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
 post-patch:
-# Fix sasldb name in pkg-install/deinstall scripts
-	@${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
-		-e "s;%%CYRUS_USER%%;${CYRUS_USER};g" \
-		-e "s;%%CYRUS_GROUP%%;${CYRUS_GROUP};g" \
-		${.CURDIR}/pkg-install > ${PKGINSTALL}
-	@${SED} -e "s;%%SASLDB%%;${SASLDB_NAME};g" \
-		-e "s;%%CYRUS_USER%%;${CYRUS_USER};g" \
-		-e "s;%%CYRUS_GROUP%%;${CYRUS_GROUP};g" \
-		${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
-	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" \
-		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 # Try to unbreak parallel (-jX) builds, part 1: make build commands atomic
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${PERL} -w0pi.bak \
 		-e 's/(^\@am__fastdepCC_TRUE\@.*?) \
 		\n\@am__fastdepCC_TRUE\@\s+(.*?)$$/$$1 && $$2/mgx'
 # Part 2: prevent intermediate *.Tpo output files clash (use unique names)
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${PERL} -wpi.bak \
 		-e 's/\$$\*\.Tpo/$$&.$$./g'
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for f in ${DOC2}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for f in ${HTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${f}.html \
 		${STAGEDIR}${DOCSDIR}/html
 .endfor
 	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README \
 		${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/security/cyrus-sasl2/files/pkg-deinstall.in
===================================================================
--- head/security/cyrus-sasl2/files/pkg-deinstall.in	(nonexistent)
+++ head/security/cyrus-sasl2/files/pkg-deinstall.in	(revision 398373)
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+#	$FreeBSD$
+#
+# Created by: hetzels@westbend.net
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
+
+SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
+
+CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
+CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
+
+# delete sasldb database
+
+delete_sasldb() {
+	if [ -f ${SASLDB_NAME} ] ; 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"
+		fi
+	fi
+}
+
+delete_user() {
+	if pw usershow ${CYRUS_USER} 2>/dev/null 1>&2; then
+		echo "To delete Cyrus user permanently, use 'pw userdel ${CYRUS_USER}'"
+	fi
+	if pw groupshow ${CYRUS_GROUP} 2>/dev/null 1>&2; then
+		echo "To delete Cyrus group permanently, use 'pw groupdel ${CYRUS_GROUP}'"
+	fi
+
+}
+
+case $2 in
+	DEINSTALL)
+		delete_sasldb
+		;;
+	POST-DEINSTALL)
+		delete_user
+		;;
+
+esac

Property changes on: head/security/cyrus-sasl2/files/pkg-deinstall.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/security/cyrus-sasl2/files/pkg-install.in
===================================================================
--- head/security/cyrus-sasl2/files/pkg-install.in	(nonexistent)
+++ head/security/cyrus-sasl2/files/pkg-install.in	(revision 398373)
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+#	$FreeBSD$
+#
+# Created by: stb@FreeBSD.org for the cyrus imap server
+# Added to the cyrus-sasl port by hetzels@westbend.net
+
+#set -vx
+
+PKG_BATCH=${BATCH:=NO}
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/local}
+
+SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%%
+
+CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
+CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%}
+
+#
+# create 'cyrus' user and group before installing
+#
+
+create_user() {
+	USER=${CYRUS_USER}
+	GROUP=${CYRUS_GROUP}
+	PW=/usr/sbin/pw
+
+	if [ -x /usr/sbin/nologin ]; then
+		shell=/usr/sbin/nologin
+	elif [ -x /sbin/nologin ]; then
+		shell=/sbin/nologin
+	else
+		shell=/nonexistent
+	fi
+	uhome="/nonexistent"
+
+	if ! ${PW} show group ${GROUP} -q >/dev/null; then
+		gid=60
+		while ${PW} show group -g ${gid} -q >/dev/null; do
+			gid=`expr ${gid} + 1`
+		done
+		if ! ${PW} add group ${GROUP} -g ${gid}; then
+			e=$?
+			echo "*** Failed to add group \`${GROUP}'. Please add it manually."
+			exit ${e}
+		fi
+		echo "*** Added group \`${GROUP}' (id ${gid})"
+	else
+		gid=`${PW} show group ${GROUP} 2>/dev/null | cut -d: -f3`
+	fi
+
+	if ! ${PW} show user ${USER} -q >/dev/null; then
+		uid=60
+		while ${PW} show user -u ${uid} -q >/dev/null; do
+			uid=`expr ${uid} + 1`
+		done
+		if ! ${PW} add user ${USER} -u ${uid} -g ${gid} -d "${uhome}" \
+				-c "the cyrus mail server" -s "${shell}" -w no \
+				; then
+			e=$?
+			echo "*** Failed to add user \`${USER}'. Please add it manually."
+			exit ${e}
+		fi
+		echo "*** Added user \`${USER}' (id ${uid})"
+	else
+		if ! ${PW} mod user ${USER} -g ${gid}; then
+			e=$?
+			echo "*** Failed to update user \`${USER}'."
+			exit ${e}
+		fi
+		echo "*** Updated user \`${USER}'."
+	fi
+}
+
+create_sasldb() {
+	if [ ! -f ${SASLDB_NAME} ]; then
+		echo "test" | ${PKG_PREFIX}/sbin/saslpasswd2 -p -c ${CYRUS_USER}
+		if [ `${PKG_PREFIX}/sbin/sasldblistusers2 | wc -l` -eq 0 ] ; then
+                        echo "WARNING: Failed to create ${SASLDB_NAME}"
+                else
+			${PKG_PREFIX}/sbin/saslpasswd2 -d ${CYRUS_USER}
+			chown ${CYRUS_USER}:mail ${SASLDB_NAME}
+			chmod 640 ${SASLDB_NAME}
+		fi
+	fi
+}
+
+case $2 in
+	PRE-INSTALL)
+		create_user
+		;;
+	POST-INSTALL)
+		if [ "${PKG_BATCH}" = "NO" ]; then
+			create_sasldb
+		elif [ ! -f ${SASLDB_NAME} ]; then
+			echo "*** We do not create ${SASLDB_NAME} automatically in"
+			echo "*** BATCH mode.  Please create it by yourself.  It should be"
+			echo "*** owner: ${CYRUS_USER}, group: mail, mode: 0640."
+		fi
+		;;
+
+esac

Property changes on: head/security/cyrus-sasl2/files/pkg-install.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/security/cyrus-sasl2/files/pkg-message.in
===================================================================
--- head/security/cyrus-sasl2/files/pkg-message.in	(nonexistent)
+++ head/security/cyrus-sasl2/files/pkg-message.in	(revision 398373)
@@ -0,0 +1,20 @@
+
+You can use sasldb2 for authentication, to add users use:
+
+	saslpasswd2 -c username
+
+If you want to enable SMTP AUTH with the system Sendmail, read
+Sendmail.README
+
+NOTE: This port has been compiled with a default pwcheck_method of
+      auxprop.  If you want to authenticate your user by /etc/passwd,
+      PAM or LDAP, install ports/security/cyrus-sasl2-saslauthd and
+      set sasl_pwcheck_method to saslauthd after installing the
+      Cyrus-IMAPd 2.X port.  You should also check the
+      %%PREFIX%%/lib/sasl2/*.conf files for the correct
+      pwcheck_method.
+      If you want to use GSSAPI mechanism, install
+      ports/security/cyrus-sasl2-gssapi.
+      If you want to use LDAP auxprop plugin, install
+      ports/security/cyrus-sasl2-ldapdb.
+

Property changes on: head/security/cyrus-sasl2/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property