- Spell fixes [1]

- Fix DOVECOT build [2]

Submitted by:	remko [1], Vivek Khera <vivek___khera.org> [2]

19 files changed, 37 insertions, 37 deletions

diff --git a/UPDATING b/UPDATING
index 440705fa9964..07207fa9bf7f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -10,12 +10,12 @@ upgrades.
   AFFECTS: users of mail/postfix
   AUTHOR: mnag@FreeBSD.org
 
-  mail/postfix are updated to 2.3.0, and now doesn't support POSTFIX_OPTIONS,
-  consider using "make config" to set your OPTIONS. Patch SPF are removed too,
-  this patch doesn't apply cleanly and have problems when use pipe(8). Consider
-  using mail/postfix-policyd-spf instead of patch SPF.
+  mail/postfix was updated to 2.3.0 and does no longer support POSTIX_OPTIONS,
+  please consider using "make config" to set your OPTIONS. The SPF patch was
+  removed since this does not apply cleanly and has problems when using
+  pipe(8).  Consider using mail/postfix-policyd-spf instead of the SPF patch.
 
-  If you need of Postfix 2.2 version you can found in mail/postfix22.
+  If you need the Postfix 2.2 version you can find this in mail/postfix22.
 
 20060715:
   AFFECTS: users of Aspell or its versions bundled with dictionaries
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index e3a9a798a59d..fcb598f5ad25 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -114,7 +114,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if defined(WITH_SASLKRB)
diff --git a/mail/postfix-current/pkg-message b/mail/postfix-current/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix-current/pkg-message
+++ b/mail/postfix-current/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 710b25b5f6d4..b867dd3befa5 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -126,7 +126,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if defined(WITH_SASLKRB)
@@ -227,8 +227,8 @@ pre-patch:
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
-	@${ECHO_MSG} "POSTFIX_OPTIONS is doesn't supported anymore"
-	@${ECHO_MSG} "${PORTNAME} uses OPTIONS, consider running:"
+	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
+	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
diff --git a/mail/postfix/pkg-message b/mail/postfix/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix/pkg-message
+++ b/mail/postfix/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix21/pkg-message b/mail/postfix21/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix21/pkg-message
+++ b/mail/postfix21/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix22/pkg-message b/mail/postfix22/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix22/pkg-message
+++ b/mail/postfix22/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 710b25b5f6d4..b867dd3befa5 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -126,7 +126,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if defined(WITH_SASLKRB)
@@ -227,8 +227,8 @@ pre-patch:
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
-	@${ECHO_MSG} "POSTFIX_OPTIONS is doesn't supported anymore"
-	@${ECHO_MSG} "${PORTNAME} uses OPTIONS, consider running:"
+	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
+	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
diff --git a/mail/postfix23/pkg-message b/mail/postfix23/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix23/pkg-message
+++ b/mail/postfix23/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 710b25b5f6d4..b867dd3befa5 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -126,7 +126,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if defined(WITH_SASLKRB)
@@ -227,8 +227,8 @@ pre-patch:
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
-	@${ECHO_MSG} "POSTFIX_OPTIONS is doesn't supported anymore"
-	@${ECHO_MSG} "${PORTNAME} uses OPTIONS, consider running:"
+	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
+	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
diff --git a/mail/postfix24/pkg-message b/mail/postfix24/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix24/pkg-message
+++ b/mail/postfix24/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 710b25b5f6d4..b867dd3befa5 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -126,7 +126,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if defined(WITH_SASLKRB)
@@ -227,8 +227,8 @@ pre-patch:
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
-	@${ECHO_MSG} "POSTFIX_OPTIONS is doesn't supported anymore"
-	@${ECHO_MSG} "${PORTNAME} uses OPTIONS, consider running:"
+	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
+	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
diff --git a/mail/postfix25/pkg-message b/mail/postfix25/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix25/pkg-message
+++ b/mail/postfix25/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 710b25b5f6d4..b867dd3befa5 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -126,7 +126,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if defined(WITH_SASLKRB)
@@ -227,8 +227,8 @@ pre-patch:
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
-	@${ECHO_MSG} "POSTFIX_OPTIONS is doesn't supported anymore"
-	@${ECHO_MSG} "${PORTNAME} uses OPTIONS, consider running:"
+	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
+	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
diff --git a/mail/postfix26/pkg-message b/mail/postfix26/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix26/pkg-message
+++ b/mail/postfix26/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 710b25b5f6d4..b867dd3befa5 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -126,7 +126,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if defined(WITH_SASLKRB)
@@ -227,8 +227,8 @@ pre-patch:
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
-	@${ECHO_MSG} "POSTFIX_OPTIONS is doesn't supported anymore"
-	@${ECHO_MSG} "${PORTNAME} uses OPTIONS, consider running:"
+	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
+	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
diff --git a/mail/postfix27/pkg-message b/mail/postfix27/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix27/pkg-message
+++ b/mail/postfix27/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf:
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 710b25b5f6d4..b867dd3befa5 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -126,7 +126,7 @@ POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 BROKEN=			Select only one SASL authentication method
 .endif
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\"
+POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 .endif
 
 .if defined(WITH_SASLKRB)
@@ -227,8 +227,8 @@ pre-patch:
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
-	@${ECHO_MSG} "POSTFIX_OPTIONS is doesn't supported anymore"
-	@${ECHO_MSG} "${PORTNAME} uses OPTIONS, consider running:"
+	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
+	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
diff --git a/mail/postfix28/pkg-message b/mail/postfix28/pkg-message
index 8efe52a59817..3b23f15a2cac 100644
--- a/mail/postfix28/pkg-message
+++ b/mail/postfix28/pkg-message
@@ -1,4 +1,4 @@
-To enable postfix rc startup script please add postfix_enable="YES" in
+To enable postfix startup script please add postfix_enable="YES" in
 your rc.conf
 
 If you not need sendmail anymore, please add in your rc.conf: