summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2012-09-22 06:20:21 +0000
committerobache <obache@pkgsrc.org>2012-09-22 06:20:21 +0000
commitf911730ab3a701ed58cfe52804ee395e2942eeea (patch)
treef055cc3377392ac40a43a6f818e202c62ddfc3db
parent7f86260f375282dd9969c7d214d0db31655cb6ad (diff)
downloadpkgsrc-f911730ab3a701ed58cfe52804ee395e2942eeea.tar.gz
Install man source into $(mandir)/man8 instead of catman for saslauthd(8),
or manpage will not displayed correctly with man(1). It also fixes installation failure for platforms missing `nroff -mandoc'. Bump PKGREVISION.
-rw-r--r--security/cyrus-sasl/distinfo3
-rw-r--r--security/cyrus-sasl/patches/patch-saslauthd_Makefile.in19
-rw-r--r--security/cyrus-saslauthd/Makefile3
3 files changed, 23 insertions, 2 deletions
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 4c7d1f20884..0e5ecb0aa80 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.20 2012/01/02 03:25:56 obache Exp $
+$NetBSD: distinfo,v 1.21 2012/09/22 06:20:21 obache Exp $
SHA1 (cyrus-sasl-2.1.25.tar.gz) = b6c34426012d9b5d448d5646cbecd818a5eeacbf
RMD160 (cyrus-sasl-2.1.25.tar.gz) = c9ed9093828f7f7bb1b35c8a690cadbcd44f3862
Size (cyrus-sasl-2.1.25.tar.gz) = 5209240 bytes
SHA1 (patch-plugins_gssapi.c) = 05c5dcad2b3cc793edbd128aff95146d9923a21c
+SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20
SHA1 (patch-saslauthd_md5global.h) = fc200c6aee12bf58877c7a755c121441ebaa1bde
SHA1 (patch-saslauthd_saslcache.c) = 725db77c5d56f58331255957a65d385267ddcaed
diff --git a/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in b/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in
new file mode 100644
index 00000000000..e4eeeb9898c
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-saslauthd_Makefile.in,v 1.1 2012/09/22 06:20:21 obache Exp $
+
+* install man source into $(mandir)/man8 instead of catman.
+ https://bugzilla.cyrusimap.org/show_bug.cgi?id=3740
+
+--- saslauthd/Makefile.in.orig 2011-09-07 13:13:56.000000000 +0000
++++ saslauthd/Makefile.in
+@@ -720,9 +720,9 @@ dist-hook: saslauthd.8
+ saslauthd.8: saslauthd.mdoc
+ nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
+
+-install-data-local: saslauthd.8
++install-data-local: saslauthd.mdoc
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8
+- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
++ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
+
+ # 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.
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index 88ab42014cd..71e61115916 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2011/09/17 11:32:02 obache Exp $
+# $NetBSD: Makefile,v 1.42 2012/09/22 06:20:21 obache Exp $
PKGNAME= ${DISTNAME:S/sasl/saslauthd/}
+PKGREVISION= 1
CONFLICTS+= cyrus-sasl<2.1.15nb2