moving saslv1 includes files to make it easier to add saslv2

PR: ports/40288 Submitted by: Mathieu Arnold <m@absolight.net> Approved by: knu
svn path=/head/; revision=63671
2025-01-22 08:58:47 +00:00 · 2002-07-28 17:26:12 +00:00 · 2002-07-28 17:26:12 +00:00 · b211a1e6c4 · 2021-03-31 03:12:20 +00:00
commit b211a1e6c4
parent bacab599c3
73 changed files with 123 additions and 123 deletions
--- a/databases/cyrus-imspd/files/patch-aa
+++ b/databases/cyrus-imspd/files/patch-aa
@ -5,7 +5,7 @@
 #include "dispatch.h"
 
 -#include <sasl.h>
-+#include <sasl/sasl.h>
+#include <sasl1/sasl.h>
 
 #ifndef HAVE_GETDTABLESIZE
 #define getdtablesize() 32
--- a/databases/cyrus-imspd/files/patch-ab
+++ b/databases/cyrus-imspd/files/patch-ab
@ -5,7 +5,7 @@
 #define MAX_BUF 4096
 
 -#include <sasl.h>
-+#include <sasl/sasl.h>
+#include <sasl1/sasl.h>
 
 /* a file buffer structure
  */
--- a/databases/cyrus-imspd/files/patch-ac
+++ b/databases/cyrus-imspd/files/patch-ac
@ -5,7 +5,7 @@
 #include <syslog.h>
 #include <fcntl.h>
 -#include <sasl.h>
-+#include <sasl/sasl.h>
+#include <sasl1/sasl.h>
 #include <netdb.h>
 #include "version.h"
 #include "dispatch.h"
--- a/databases/cyrus-imspd/files/patch-ad
+++ b/databases/cyrus-imspd/files/patch-ad
@ -5,7 +5,7 @@
 #include <syslog.h>
 #include "xmalloc.h"
 -#include <sasl.h>
-+#include <sasl/sasl.h>
+#include <sasl1/sasl.h>
 
 #include "util.h"
 #include "syncdb.h"
--- a/databases/cyrus-imspd/files/patch-ae
+++ b/databases/cyrus-imspd/files/patch-ae
@ -5,7 +5,7 @@
 #endif
 
 -#include <sasl.h>
-+#include <sasl/sasl.h>
+#include <sasl1/sasl.h>
 
 #ifdef HAVE_SSL
 #include <openssl/lhash.h>
--- a/databases/cyrus-imspd/files/patch-af
+++ b/databases/cyrus-imspd/files/patch-af
@ -5,7 +5,7 @@
 #define INCLUDED_IMCLIENT_H
 
 -#include <sasl.h>
-+#include <sasl/sasl.h>
+#include <sasl1/sasl.h>
 
 struct imclient;
 struct sasl_client; /* to avoid having to include sasl sometimes */
--- a/databases/cyrus-imspd/files/patch-ag
+++ b/databases/cyrus-imspd/files/patch-ag
@ -5,7 +5,7 @@
 #include <stdlib.h>
 
 -#include <sasl.h>
-+#include <sasl/sasl.h>
+#include <sasl1/sasl.h>
 
 #ifdef HAVE_SSL
 #include <openssl/ssl.h>
--- a/japanese/mutt-devel/files/patch-aj
+++ b/japanese/mutt-devel/files/patch-aj
@ -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
 
--- a/japanese/mutt/files/patch-aj
+++ b/japanese/mutt/files/patch-aj
@ -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
 
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
 
--- 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
 
--- 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
 
--- 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
 
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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
  
   /*
--- 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
  
   /*
--- 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
 
  /*
--- 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')
--- 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')
--- 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')
--- 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')
--- a/net/openldap2/Makefile
+++ b/net/openldap2/Makefile
@ -50,7 +50,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib

 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
+CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
 .endif

 .if defined(WITH_ODBC)
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@ -50,7 +50,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib

 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
+CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
 .endif

 .if defined(WITH_ODBC)
--- a/net/openldap20/Makefile
+++ b/net/openldap20/Makefile
@ -50,7 +50,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib

 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
+CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
 .endif

 .if defined(WITH_ODBC)
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@ -50,7 +50,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib

 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
+CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
 .endif

 .if defined(WITH_ODBC)
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@ -50,7 +50,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib

 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
+CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
 .endif

 .if defined(WITH_ODBC)
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@ -50,7 +50,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib

 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
+CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
 .endif

 .if defined(WITH_ODBC)
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@ -50,7 +50,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib

 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
+CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
 .endif

 .if defined(WITH_ODBC)
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@ -50,7 +50,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib

 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
+CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
 .endif

 .if defined(WITH_ODBC)
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@ -50,7 +50,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib

 .if defined(WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl
+CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
 .endif

 .if defined(WITH_ODBC)
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	cyrus-sasl
 PORTVERSION=	1.5.27
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		http://www.surf.org.uk/downloads/ \
@ -51,7 +51,7 @@ AUTOMAKE_ARGS=	--add-missing --include-deps
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl \
 		--with-dbpath=${PREFIX}/etc/sasldb \
-		--includedir=${PREFIX}/include/sasl \
+		--includedir=${PREFIX}/include/sasl1 \
 		--enable-static \
 		--enable-login \
 		--with-pwcheck=/var/pwcheck \
--- a/security/cyrus-sasl/files/Sendmail.README
+++ b/security/cyrus-sasl/files/Sendmail.README
@ -3,7 +3,7 @@ How to enable SMTP AUTH with FreeBSD default Sendmail
 1) Add the following to  /etc/make.conf:

    # Add SMTP AUTH support to Sendmail
-    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl -DSASL
+    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl1 -DSASL
    SENDMAIL_LDFLAGS+=	-L/usr/local/lib
    SENDMAIL_LDADD+=	-lsasl

--- a/security/cyrus-sasl/pkg-plist
+++ b/security/cyrus-sasl/pkg-plist
@ -1,12 +1,12 @@
@unexec if [ -f /var/run/pwcheck.pid ] ; then %D/etc/rc.d/pwcheck.sh stop ; echo " stopped." ; fi
 etc/rc.d/pwcheck.sh
-include/sasl/hmac-md5.h
-include/sasl/md5.h
-include/sasl/md5global.h
-include/sasl/sasl.h
-include/sasl/saslplug.h
-include/sasl/saslutil.h
-@dirrm include/sasl
+include/sasl1/hmac-md5.h
+include/sasl1/md5.h
+include/sasl1/md5global.h
+include/sasl1/sasl.h
+include/sasl1/saslplug.h
+include/sasl1/saslutil.h
+@dirrm include/sasl1
 %%JAVASASL%%lib/libjavasasl.a
 %%JAVASASL%%lib/libjavasasl.so
 %%JAVASASL%%lib/libjavasasl.so.1
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	cyrus-sasl
 PORTVERSION=	1.5.27
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		http://www.surf.org.uk/downloads/ \
@ -51,7 +51,7 @@ AUTOMAKE_ARGS=	--add-missing --include-deps
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-plugindir=${PREFIX}/lib/sasl \
 		--with-dbpath=${PREFIX}/etc/sasldb \
-		--includedir=${PREFIX}/include/sasl \
+		--includedir=${PREFIX}/include/sasl1 \
 		--enable-static \
 		--enable-login \
 		--with-pwcheck=/var/pwcheck \
--- a/security/cyrus-sasl2/files/Sendmail.README
+++ b/security/cyrus-sasl2/files/Sendmail.README
@ -3,7 +3,7 @@ How to enable SMTP AUTH with FreeBSD default Sendmail
 1) Add the following to  /etc/make.conf:

    # Add SMTP AUTH support to Sendmail
-    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl -DSASL
+    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl1 -DSASL
    SENDMAIL_LDFLAGS+=	-L/usr/local/lib
    SENDMAIL_LDADD+=	-lsasl

--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@ -1,12 +1,12 @@
@unexec if [ -f /var/run/pwcheck.pid ] ; then %D/etc/rc.d/pwcheck.sh stop ; echo " stopped." ; fi
 etc/rc.d/pwcheck.sh
-include/sasl/hmac-md5.h
-include/sasl/md5.h
-include/sasl/md5global.h
-include/sasl/sasl.h
-include/sasl/saslplug.h
-include/sasl/saslutil.h
-@dirrm include/sasl
+include/sasl1/hmac-md5.h
+include/sasl1/md5.h
+include/sasl1/md5global.h
+include/sasl1/sasl.h
+include/sasl1/saslplug.h
+include/sasl1/saslutil.h
+@dirrm include/sasl1
 %%JAVASASL%%lib/libjavasasl.a
 %%JAVASASL%%lib/libjavasasl.so
 %%JAVASASL%%lib/libjavasasl.so.1