diff options
73 files changed, 123 insertions, 123 deletions
diff --git a/databases/cyrus-imspd/files/patch-aa b/databases/cyrus-imspd/files/patch-aa index 0ce3fd73eeb3..3fab656d9fde 100644 --- 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 diff --git a/databases/cyrus-imspd/files/patch-ab b/databases/cyrus-imspd/files/patch-ab index 35aa38f3aca7..06384ea5745f 100644 --- 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 */ diff --git a/databases/cyrus-imspd/files/patch-ac b/databases/cyrus-imspd/files/patch-ac index 6d19c4971d63..fd0212524328 100644 --- 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" diff --git a/databases/cyrus-imspd/files/patch-ad b/databases/cyrus-imspd/files/patch-ad index 05ea0c29220b..f7779d5e3f05 100644 --- 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" diff --git a/databases/cyrus-imspd/files/patch-ae b/databases/cyrus-imspd/files/patch-ae index 0beb31f19783..83a945df2094 100644 --- 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> diff --git a/databases/cyrus-imspd/files/patch-af b/databases/cyrus-imspd/files/patch-af index 9995f7bf12d1..531cd660a558 100644 --- 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 */ diff --git a/databases/cyrus-imspd/files/patch-ag b/databases/cyrus-imspd/files/patch-ag index 4b6c60cf8b58..7ca5e997e188 100644 --- 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> diff --git a/japanese/mutt-devel/files/patch-aj b/japanese/mutt-devel/files/patch-aj index 7eadf98f105d..c567936301ae 100644 --- 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 diff --git a/japanese/mutt/files/patch-aj b/japanese/mutt/files/patch-aj index 7bdc3d43aa1e..577526473681 100644 --- 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 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') diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile index 2f2aadd2d6c5..25c94e488a7a 100644 --- 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) diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile index 2f2aadd2d6c5..25c94e488a7a 100644 --- 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) diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile index 2f2aadd2d6c5..25c94e488a7a 100644 --- 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) diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile index 2f2aadd2d6c5..25c94e488a7a 100644 --- 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) diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile index 2f2aadd2d6c5..25c94e488a7a 100644 --- 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) diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile index 2f2aadd2d6c5..25c94e488a7a 100644 --- 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) diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile index 2f2aadd2d6c5..25c94e488a7a 100644 --- 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) diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile index 2f2aadd2d6c5..25c94e488a7a 100644 --- 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) diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 2f2aadd2d6c5..25c94e488a7a 100644 --- 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) diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 410e5e3a1a00..5023c743bae0 100644 --- 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 \ diff --git a/security/cyrus-sasl/files/Sendmail.README b/security/cyrus-sasl/files/Sendmail.README index a4da7278f400..c88d2433e92e 100644 --- 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 diff --git a/security/cyrus-sasl/pkg-plist b/security/cyrus-sasl/pkg-plist index 7b8e18d814d4..b3c88df17818 100644 --- 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 diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 410e5e3a1a00..5023c743bae0 100644 --- 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 \ diff --git a/security/cyrus-sasl2/files/Sendmail.README b/security/cyrus-sasl2/files/Sendmail.README index a4da7278f400..c88d2433e92e 100644 --- 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 diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist index 7b8e18d814d4..b3c88df17818 100644 --- 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 |