1 files changed, 78 insertions, 80 deletions

diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index b3c88df17818..74216f9896ab 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -1,94 +1,92 @@
-@unexec if [ -f /var/run/pwcheck.pid ] ; then %D/etc/rc.d/pwcheck.sh stop ; echo " stopped." ; fi
-etc/rc.d/pwcheck.sh
-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
-lib/libsasl.a
-lib/libsasl.so
-lib/libsasl.so.8
-lib/sasl/libanonymous.a
-lib/sasl/libanonymous.so
-lib/sasl/libanonymous.so.1
-lib/sasl/libcrammd5.a
-lib/sasl/libcrammd5.so
-lib/sasl/libcrammd5.so.1
-lib/sasl/libdigestmd5.a
-lib/sasl/libdigestmd5.so
-lib/sasl/libdigestmd5.so.0
-%%GSSAPI%%lib/sasl/libgssapiv2.a
-%%GSSAPI%%lib/sasl/libgssapiv2.so
-%%GSSAPI%%lib/sasl/libgssapiv2.so.1
-%%EBONES%%lib/sasl/libkerberos4.a
-%%EBONES%%lib/sasl/libkerberos4.so
-%%EBONES%%lib/sasl/libkerberos4.so.1
-lib/sasl/liblogin.a
-lib/sasl/liblogin.so
-lib/sasl/liblogin.so.0
-lib/sasl/libplain.a
-lib/sasl/libplain.so
-lib/sasl/libplain.so.1
-sbin/sasldblistusers
-sbin/saslpasswd
-sbin/pwcheck
-sbin/pwcheck_pam
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/ClientFactory.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericClient.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericCommon.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/GenericServer.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/Sasl.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslClient.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslClientFactory.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslException.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslInputStream.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslOutputStream.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslServer.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslServerFactory.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/SaslUtils.class
-%%JAVASASL%%share/java/classes/sasl/CyrusSasl/ServerFactory.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/Callback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/CallbackHandler.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/NameCallback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/PasswordCallback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/RealmCallback.class
-%%JAVASASL%%share/java/classes/sasl/javax/security/auth/callback/UnsupportedCallbackException.class
+etc/rc.d/saslauthd.sh
+include/sasl/hmac-md5.h
+include/sasl/md5.h
+include/sasl/md5global.h
+include/sasl/prop.h
+include/sasl/sasl.h
+include/sasl/saslplug.h
+include/sasl/saslutil.h
+@dirrm include/sasl
+lib/libsasl2.a
+lib/libsasl2.so
+lib/libsasl2.so.2
+lib/sasl2/libanonymous.a
+lib/sasl2/libanonymous.so
+lib/sasl2/libanonymous.so.2
+lib/sasl2/libcrammd5.a
+lib/sasl2/libcrammd5.so
+lib/sasl2/libcrammd5.so.2
+lib/sasl2/libdigestmd5.a
+lib/sasl2/libdigestmd5.so
+lib/sasl2/libdigestmd5.so.2
+%%GSSAPI%%lib/sasl2/libgssapiv2.a
+%%GSSAPI%%lib/sasl2/libgssapiv2.so
+%%GSSAPI%%lib/sasl2/libgssapiv2.so.2
+%%EBONES%%lib/sasl2/libkerberos4.a
+%%EBONES%%lib/sasl2/libkerberos4.so
+%%EBONES%%lib/sasl2/libkerberos4.so.2
+lib/sasl2/liblogin.a
+lib/sasl2/liblogin.so
+lib/sasl2/liblogin.so.2
+lib/sasl2/libotp.a
+lib/sasl2/libotp.so
+lib/sasl2/libotp.so.2
+lib/sasl2/libplain.a
+lib/sasl2/libplain.so
+lib/sasl2/libplain.so.2
+lib/sasl2/libsasldb.a
+lib/sasl2/libsasldb.so
+lib/sasl2/libsasldb.so.2
+sbin/saslauthd
+sbin/sasldblistusers2
+sbin/saslpasswd2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/Sendmail.README
+%%PORTDOCS%%%%DOCSDIR%%/ONEWS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/draft-newman-auth-scram-03.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-weltman-java-sasl-02.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-06.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-cat-sasl-gssapi-05.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-myers-saslrev-02.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-sasl-login.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc2095.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc1939.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2195.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2222.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2243.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2245.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2289.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2444.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2595.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc2831.txt
-%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/programming.html
-%%PORTDOCS%%%%DOCSDIR%%/sysadmin.html
+%%PORTDOCS%%%%DOCSDIR%%/rfc2945.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc3174.txt
+%%PORTDOCS%%%%DOCSDIR%%/server-plugin-flow.fig
+%%PORTDOCS%%%%DOCSDIR%%/testing.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/html/appconvert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gssapi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/macosx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/options.html
+%%PORTDOCS%%%%DOCSDIR%%/html/plugprog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/programming.html
+%%PORTDOCS%%%%DOCSDIR%%/html/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sysadmin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax/security/auth/callback
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax/security/auth
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax/security
-%%JAVASASL%%@dirrm share/java/classes/sasl/javax
-%%JAVASASL%%@dirrm share/java/classes/sasl/CyrusSasl
-%%JAVASASL%%@dirrm share/java/classes/sasl
-@dirrm lib/sasl
-@cwd /var
-@exec install -d -m 770 -o cyrus -g cyrus %D/pwcheck
-@comment This file gets created by the pwcheck program
-@unexec rm -f %D/pwcheck/pwcheck
-@dirrm pwcheck
+@dirrm lib/sasl2
+@mode ug=rwx,o=
+@exec mkdir -p state/saslauthd
+@exec chown -R cyrus:cyrus state
+@exec chmod -R o= state
+@comment This file gets created by the state/saslauthd program
+@unexec rm -fr /var/state/saslauthd
+@dirrm state
 @cwd %%PREFIX%%