Install the saslauthd manpage as cat8/saslauthd.0 as it should be on BSD

systems.

4 files changed, 66 insertions, 3 deletions

diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST.common
index 4001b3b7953..43e7a2d9750 100644
--- a/security/cyrus-sasl2/PLIST.common
+++ b/security/cyrus-sasl2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2003/08/16 09:06:41 recht Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2003/11/21 13:41:58 jlam Exp $
 etc/rc.d/saslauthd
 include/sasl/hmac-md5.h
 include/sasl/md5.h
@@ -12,7 +12,7 @@ lib/libsasl2.la
 lib/libsasl2.so
 lib/libsasl2.so.2
 lib/libsasl2.so.2.15
-man/cat8/saslauthd.8
+man/cat8/saslauthd.0
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
 man/man3/sasl_auxprop.3
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index df443c0c70d..4279a4e24f1 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/10/06 16:31:18 christos Exp $
+$NetBSD: distinfo,v 1.10 2003/11/21 13:41:58 jlam Exp $
 
 SHA1 (cyrus-sasl-2.1.15.tar.gz) = 747101ffec482ca566f00a9d34124ec8e79f6589
 Size (cyrus-sasl-2.1.15.tar.gz) = 1390131 bytes
@@ -7,7 +7,9 @@ SHA1 (patch-ab) = 711dd3d73da611bb5679bc8415e96517bf239778
 SHA1 (patch-ad) = 808255d61cb9340fc500a12f74a91d9c8dceda4c
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
 SHA1 (patch-af) = eed25b6db859720bb35f4ef5623b85a3a95e359e
+SHA1 (patch-ag) = 24455c9641078b36a270b50f844cfb4a89ea7925
 SHA1 (patch-ah) = 50ff4e8ec0f4232bd8c2121b105d4818b978b950
 SHA1 (patch-ai) = 687bc372ef32af473668b63d465dc59a73700181
 SHA1 (patch-aj) = e841641a92dacd0f38fc0f86391b54b394e5a54c
+SHA1 (patch-ak) = 20c163758267d90d93f6d1ec0fce78fa4a12f670
 SHA1 (patch-as) = c8d35da93afe8be5e535b88681b23b169e813c02
diff --git a/security/cyrus-sasl2/patches/patch-ag b/security/cyrus-sasl2/patches/patch-ag
new file mode 100644
index 00000000000..56b7dd6dc76
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ag
@@ -0,0 +1,28 @@
+$NetBSD: patch-ag,v 1.4 2003/11/21 13:41:58 jlam Exp $
+
+--- saslauthd/Makefile.am.orig	Fri Mar 28 11:59:23 2003
++++ saslauthd/Makefile.am	Fri Nov 21 05:32:39 2003
+@@ -24,17 +24,17 @@
+ saslcache_DEPENDENCIES = @COMPAT_OBJ@
+ saslcache_LDADD = @COMPAT_OBJ@
+ 
+-EXTRA_DIST	= saslauthd.8 saslauthd.mdoc config include \
++EXTRA_DIST	= saslauthd.0 saslauthd.mdoc config include \
+ 		  getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
+ INCLUDES	= -I$(top_srcdir)/include -I../include
+ DEFS            = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
+ 
+ 
+-dist-hook: saslauthd.8
++dist-hook: saslauthd.0
+ 
+-saslauthd.8: saslauthd.mdoc
+-	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
++saslauthd.0: saslauthd.mdoc
++	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.0
+ 
+-install-data-local: saslauthd.8
++install-data-local: saslauthd.0
+ 	$(mkinstalldirs) $(DESTDIR)$(mandir)/cat8
+-	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8
++	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.0
diff --git a/security/cyrus-sasl2/patches/patch-ak b/security/cyrus-sasl2/patches/patch-ak
new file mode 100644
index 00000000000..848cb8b56de
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ak
@@ -0,0 +1,33 @@
+$NetBSD: patch-ak,v 1.1 2003/11/21 13:41:58 jlam Exp $
+
+--- saslauthd/Makefile.in.orig	Fri Nov 21 05:24:06 2003
++++ saslauthd/Makefile.in	Fri Nov 21 05:33:09 2003
+@@ -126,7 +126,7 @@
+ saslcache_DEPENDENCIES = @COMPAT_OBJ@
+ saslcache_LDADD = @COMPAT_OBJ@
+ 
+-EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include 		  getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
++EXTRA_DIST = saslauthd.0 saslauthd.mdoc config include 		  getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
+ 
+ INCLUDES = -I$(top_srcdir)/include -I../include
+ DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
+@@ -423,14 +423,14 @@
+ maintainer-clean
+ 
+ 
+-dist-hook: saslauthd.8
++dist-hook: saslauthd.0
+ 
+-saslauthd.8: saslauthd.mdoc
+-	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
++saslauthd.0: saslauthd.mdoc
++	nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.0
+ 
+-install-data-local: saslauthd.8
++install-data-local: saslauthd.0
+ 	$(mkinstalldirs) $(DESTDIR)$(mandir)/cat8
+-	$(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8
++	$(INSTALL_DATA) $(srcdir)/saslauthd.0 $(DESTDIR)$(mandir)/cat8/saslauthd.0
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.