moving saslv1 includes files to make it easier to add saslv2

PR:		ports/40288
Submitted by:	Mathieu Arnold <m@absolight.net>
Approved by:	knu

49 files changed, 85 insertions, 85 deletions

diff --git a/mail/cyrus-imapd/files/patch-ac b/mail/cyrus-imapd/files/patch-ac
index c9a2a9eb6353..630aaec33cc9 100644
--- a/mail/cyrus-imapd/files/patch-ac
+++ b/mail/cyrus-imapd/files/patch-ac
@@ -7,7 +7,7 @@ diff -u configure.orig configure
  	if test -d ${with_sasl}; then
            ac_cv_sasl_where_lib=${with_sasl}/lib
 -          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl
++          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
  
  	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
  	  LIB_SASL="-L$ac_cv_sasl_where_lib"
diff --git a/mail/cyrus-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac
index c9a2a9eb6353..630aaec33cc9 100644
--- a/mail/cyrus-imapd2/files/patch-ac
+++ b/mail/cyrus-imapd2/files/patch-ac
@@ -7,7 +7,7 @@ diff -u configure.orig configure
  	if test -d ${with_sasl}; then
            ac_cv_sasl_where_lib=${with_sasl}/lib
 -          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl
++          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
  
  	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
  	  LIB_SASL="-L$ac_cv_sasl_where_lib"
diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac
index c9a2a9eb6353..630aaec33cc9 100644
--- a/mail/cyrus-imapd22/files/patch-ac
+++ b/mail/cyrus-imapd22/files/patch-ac
@@ -7,7 +7,7 @@ diff -u configure.orig configure
  	if test -d ${with_sasl}; then
            ac_cv_sasl_where_lib=${with_sasl}/lib
 -          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl
++          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
  
  	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
  	  LIB_SASL="-L$ac_cv_sasl_where_lib"
diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac
index c9a2a9eb6353..630aaec33cc9 100644
--- a/mail/cyrus-imapd23/files/patch-ac
+++ b/mail/cyrus-imapd23/files/patch-ac
@@ -7,7 +7,7 @@ diff -u configure.orig configure
  	if test -d ${with_sasl}; then
            ac_cv_sasl_where_lib=${with_sasl}/lib
 -          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl
++          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
  
  	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
  	  LIB_SASL="-L$ac_cv_sasl_where_lib"
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
index c9a2a9eb6353..630aaec33cc9 100644
--- a/mail/cyrus-imapd24/files/patch-ac
+++ b/mail/cyrus-imapd24/files/patch-ac
@@ -7,7 +7,7 @@ diff -u configure.orig configure
  	if test -d ${with_sasl}; then
            ac_cv_sasl_where_lib=${with_sasl}/lib
 -          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl
++          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
  
  	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
  	  LIB_SASL="-L$ac_cv_sasl_where_lib"
diff --git a/mail/cyrus/files/patch-ac b/mail/cyrus/files/patch-ac
index ab7854846479..8e79599cca36 100644
--- a/mail/cyrus/files/patch-ac
+++ b/mail/cyrus/files/patch-ac
@@ -5,7 +5,7 @@
      LIB_SASL="-L$sasldir/lib -lsasl"
      
 -    SASLFLAGS="-I$sasldir/include"
-+    SASLFLAGS="-I$sasldir/include/sasl"
++    SASLFLAGS="-I$sasldir/include/sasl1"
          
    fi
  
diff --git a/mail/mutt-devel/files/patch-01 b/mail/mutt-devel/files/patch-01
index c199f9d04c52..8a1327d543ee 100644
--- a/mail/mutt-devel/files/patch-01
+++ b/mail/mutt-devel/files/patch-01
@@ -5,7 +5,7 @@
            if test "$with_sasl" != "yes"
            then
 -            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
++            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
              LDFLAGS="$LDFLAGS -L$with_sasl/lib"
            fi
  
diff --git a/mail/mutt/files/patch-configure.in b/mail/mutt/files/patch-configure.in
index 88e89b063d73..20909e07a9a0 100644
--- a/mail/mutt/files/patch-configure.in
+++ b/mail/mutt/files/patch-configure.in
@@ -14,7 +14,7 @@
            if test "$with_sasl" != "yes"
            then
 -            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
++            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
              LDFLAGS="$LDFLAGS -L$with_sasl/lib"
            fi
  
diff --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in
index 88e89b063d73..20909e07a9a0 100644
--- a/mail/mutt14/files/patch-configure.in
+++ b/mail/mutt14/files/patch-configure.in
@@ -14,7 +14,7 @@
            if test "$with_sasl" != "yes"
            then
 -            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
++            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
              LDFLAGS="$LDFLAGS -L$with_sasl/lib"
            fi
  
diff --git a/mail/postfix-current/files/patch-ei b/mail/postfix-current/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix-current/files/patch-ei
+++ b/mail/postfix-current/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix-current/files/patch-ej b/mail/postfix-current/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix-current/files/patch-ej
+++ b/mail/postfix-current/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix-current/files/patch-lmtp.h b/mail/postfix-current/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix-current/files/patch-lmtp.h
+++ b/mail/postfix-current/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix/files/patch-ei b/mail/postfix/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix/files/patch-ei
+++ b/mail/postfix/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix/files/patch-ej b/mail/postfix/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix/files/patch-ej
+++ b/mail/postfix/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix/files/patch-lmtp.h b/mail/postfix/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix/files/patch-lmtp.h
+++ b/mail/postfix/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix1/files/patch-ei b/mail/postfix1/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix1/files/patch-ei
+++ b/mail/postfix1/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix1/files/patch-ej b/mail/postfix1/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix1/files/patch-ej
+++ b/mail/postfix1/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix1/files/patch-lmtp.h b/mail/postfix1/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix1/files/patch-lmtp.h
+++ b/mail/postfix1/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix20/files/patch-ei b/mail/postfix20/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix20/files/patch-ei
+++ b/mail/postfix20/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix20/files/patch-ej b/mail/postfix20/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix20/files/patch-ej
+++ b/mail/postfix20/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix20/files/patch-lmtp.h b/mail/postfix20/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix20/files/patch-lmtp.h
+++ b/mail/postfix20/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix21/files/patch-ei b/mail/postfix21/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix21/files/patch-ei
+++ b/mail/postfix21/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix21/files/patch-ej b/mail/postfix21/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix21/files/patch-ej
+++ b/mail/postfix21/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix21/files/patch-lmtp.h b/mail/postfix21/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix21/files/patch-lmtp.h
+++ b/mail/postfix21/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix22/files/patch-ei b/mail/postfix22/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix22/files/patch-ei
+++ b/mail/postfix22/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix22/files/patch-ej b/mail/postfix22/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix22/files/patch-ej
+++ b/mail/postfix22/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix22/files/patch-lmtp.h b/mail/postfix22/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix22/files/patch-lmtp.h
+++ b/mail/postfix22/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix23/files/patch-ei b/mail/postfix23/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix23/files/patch-ei
+++ b/mail/postfix23/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix23/files/patch-ej b/mail/postfix23/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix23/files/patch-ej
+++ b/mail/postfix23/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix23/files/patch-lmtp.h b/mail/postfix23/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix23/files/patch-lmtp.h
+++ b/mail/postfix23/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix24/files/patch-ei b/mail/postfix24/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix24/files/patch-ei
+++ b/mail/postfix24/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix24/files/patch-ej b/mail/postfix24/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix24/files/patch-ej
+++ b/mail/postfix24/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix24/files/patch-lmtp.h b/mail/postfix24/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix24/files/patch-lmtp.h
+++ b/mail/postfix24/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix25/files/patch-ei b/mail/postfix25/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix25/files/patch-ei
+++ b/mail/postfix25/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix25/files/patch-ej b/mail/postfix25/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix25/files/patch-ej
+++ b/mail/postfix25/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix25/files/patch-lmtp.h b/mail/postfix25/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix25/files/patch-lmtp.h
+++ b/mail/postfix25/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix26/files/patch-ei b/mail/postfix26/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix26/files/patch-ei
+++ b/mail/postfix26/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix26/files/patch-ej b/mail/postfix26/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix26/files/patch-ej
+++ b/mail/postfix26/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix26/files/patch-lmtp.h b/mail/postfix26/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix26/files/patch-lmtp.h
+++ b/mail/postfix26/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix27/files/patch-ei b/mail/postfix27/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix27/files/patch-ei
+++ b/mail/postfix27/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix27/files/patch-ej b/mail/postfix27/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix27/files/patch-ej
+++ b/mail/postfix27/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix27/files/patch-lmtp.h b/mail/postfix27/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix27/files/patch-lmtp.h
+++ b/mail/postfix27/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/postfix28/files/patch-ei b/mail/postfix28/files/patch-ei
index 3029372b746e..8f03b69ccc52 100644
--- a/mail/postfix28/files/patch-ei
+++ b/mail/postfix28/files/patch-ei
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix28/files/patch-ej b/mail/postfix28/files/patch-ej
index 6c5cf2e23758..329d7bb1cf96 100644
--- a/mail/postfix28/files/patch-ej
+++ b/mail/postfix28/files/patch-ej
@@ -14,8 +14,8 @@
     * SASL library.
     */
   #ifdef USE_SASL_AUTH
-! #include <sasl/sasl.h>
-! #include <sasl/saslutil.h>
+! #include <sasl1/sasl.h>
+! #include <sasl1/saslutil.h>
   #endif
   
    /*
diff --git a/mail/postfix28/files/patch-lmtp.h b/mail/postfix28/files/patch-lmtp.h
index 3d941c034198..86d5975b2b4d 100644
--- a/mail/postfix28/files/patch-lmtp.h
+++ b/mail/postfix28/files/patch-lmtp.h
@@ -6,8 +6,8 @@
  #ifdef USE_SASL_AUTH
 -#include <sasl.h>
 -#include <saslutil.h>
-+#include <sasl/sasl.h>
-+#include <sasl/saslutil.h>
++#include <sasl1/sasl.h>
++#include <sasl1/saslutil.h>
  #endif
  
   /*
diff --git a/mail/sendmail-old/files/site.config.m4.sasl b/mail/sendmail-old/files/site.config.m4.sasl
index 0eb90926903e..c1140b4d19f3 100644
--- a/mail/sendmail-old/files/site.config.m4.sasl
+++ b/mail/sendmail-old/files/site.config.m4.sasl
@@ -1,4 +1,4 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
+APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
 APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_UNSAFE_SASL -D_FFR_SASL_OPTS')
 APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
diff --git a/mail/sendmail/files/site.config.m4.sasl b/mail/sendmail/files/site.config.m4.sasl
index 9aac5e47921b..5c7e9ee0fac4 100644
--- a/mail/sendmail/files/site.config.m4.sasl
+++ b/mail/sendmail/files/site.config.m4.sasl
@@ -1,4 +1,4 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
+APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
 APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
 APPENDDEF(`conf_sendmail_LIBS', `-lsasl')
diff --git a/mail/sendmail811/files/site.config.m4.sasl b/mail/sendmail811/files/site.config.m4.sasl
index 0eb90926903e..c1140b4d19f3 100644
--- a/mail/sendmail811/files/site.config.m4.sasl
+++ b/mail/sendmail811/files/site.config.m4.sasl
@@ -1,4 +1,4 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
+APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
 APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_UNSAFE_SASL -D_FFR_SASL_OPTS')
 APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
diff --git a/mail/sendmail812/files/site.config.m4.sasl b/mail/sendmail812/files/site.config.m4.sasl
index 9aac5e47921b..5c7e9ee0fac4 100644
--- a/mail/sendmail812/files/site.config.m4.sasl
+++ b/mail/sendmail812/files/site.config.m4.sasl
@@ -1,4 +1,4 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
+APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
 APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
 APPENDDEF(`conf_sendmail_LIBS', `-lsasl')