Support PKGMANDIR and quell pkglint.

6 files changed, 71 insertions, 19 deletions

diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index 822ccc7872b..702dc591cc5 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:39 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/02 03:40:21 schmonz Exp $
 #
 
 DISTNAME=		mess822-0.58
@@ -32,5 +32,10 @@ AUTO_MKDIRS=		yes
 
 SUBST_FILES.djbware+=	cdb_seek.c leapsecs_read.c
 
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	do-configure
+SUBST_FILES.paths=	hier.c
+SUBST_SED.paths=	-e 's,@PKGMANDIR@,${PKGMANDIR},g'
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mess822/distinfo b/mail/mess822/distinfo
index 58c6010daa8..1a55b211c58 100644
--- a/mail/mess822/distinfo
+++ b/mail/mess822/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:27:09 agc Exp $
+$NetBSD: distinfo,v 1.8 2017/01/02 03:40:21 schmonz Exp $
 
 SHA1 (mess822-0.58.tar.gz) = ef3380c793c852d40688c108d164234ecf8a5362
 RMD160 (mess822-0.58.tar.gz) = 40fbcb5af92882e133ab3653c6119022180caedb
 SHA512 (mess822-0.58.tar.gz) = 5fb30f06dfa08f60dc8760f9c5d692e59397ff848441bc94313a079bac8fb53b779133b48abae9b487dff6fbb277d5210a9690a138366bf4d34f052d661be65e
 Size (mess822-0.58.tar.gz) = 64287 bytes
-SHA1 (patch-aa) = 868dd45091c5992b3891451cb10b63a3d695279b
-SHA1 (patch-ab) = b947129046bbef7012208db39a341648c13ff68f
-SHA1 (patch-ac) = af02dc2acf416ae63f93de08bdafdad80faebc12
-SHA1 (patch-ad) = 2d3e489b2cac3fc580200f0ecc61f3987ffaebf0
+SHA1 (patch-aa) = 9333469af2636d97917bfff768954e36a8026733
+SHA1 (patch-ab) = 81ad05a71e8caa01302768c2bd7837c644adbeb3
+SHA1 (patch-ac) = e9325df21f6dd114c0bc9327708c82f8b692c1d5
+SHA1 (patch-ad) = bc5df5f91e8451a0cf414ec1e2de83d1244f119f
diff --git a/mail/mess822/patches/patch-aa b/mail/mess822/patches/patch-aa
index dc5ad526910..db533b0c21d 100644
--- a/mail/mess822/patches/patch-aa
+++ b/mail/mess822/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2012/03/26 14:04:00 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2017/01/02 03:40:21 schmonz Exp $
+
+Install docs following hier(7), don't install catpages, and set
+reasonable permissions.
 
 --- hier.c.orig	1998-09-05 02:33:37.000000000 +0000
 +++ hier.c
@@ -24,18 +27,36 @@ $NetBSD: patch-aa,v 1.2 2012/03/26 14:04:00 joerg Exp $
 +  d(auto_home,"bin",-1,-1,0755);
 +  d(auto_home,"lib",-1,-1,0755);
 +  d(auto_home,"include",-1,-1,0755);
-+  d(auto_home,"man",-1,-1,0755);
-+  d(auto_home,"man/man1",-1,-1,0755);
-+  d(auto_home,"man/man3",-1,-1,0755);
-+  d(auto_home,"man/man5",-1,-1,0755);
-+  d(auto_home,"man/man8",-1,-1,0755);
++  d(auto_home,"@PKGMANDIR@",-1,-1,0755);
++  d(auto_home,"@PKGMANDIR@/man1",-1,-1,0755);
++  d(auto_home,"@PKGMANDIR@/man3",-1,-1,0755);
++  d(auto_home,"@PKGMANDIR@/man5",-1,-1,0755);
++  d(auto_home,"@PKGMANDIR@/man8",-1,-1,0755);
  
    c(auto_home,"lib","mess822.a",-1,-1,0644);
    c(auto_home,"include","mess822.h",-1,-1,0644);
-@@ -48,23 +44,5 @@ void hier()
-   c(auto_home,"man/man3","mess822_token.3",-1,-1,0644);
-   c(auto_home,"man/man3","mess822_when.3",-1,-1,0644);
+@@ -30,41 +26,23 @@ void hier()
+   c(auto_home,"bin","822received",-1,-1,0755);
+   c(auto_home,"bin","822print",-1,-1,0755);
  
+-  c(auto_home,"man/man1","iftocc.1",-1,-1,0644);
+-  c(auto_home,"man/man1","new-inject.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822field.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822header.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822date.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822received.1",-1,-1,0644);
+-  c(auto_home,"man/man1","822print.1",-1,-1,0644);
+-  c(auto_home,"man/man5","rewriting.5",-1,-1,0644);
+-  c(auto_home,"man/man8","ofmipd.8",-1,-1,0644);
+-  c(auto_home,"man/man8","ofmipname.8",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_addr.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_date.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_fold.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_quote.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_token.3",-1,-1,0644);
+-  c(auto_home,"man/man3","mess822_when.3",-1,-1,0644);
+-
 -  c(auto_home,"man/cat1","iftocc.0",-1,-1,0644);
 -  c(auto_home,"man/cat1","new-inject.0",-1,-1,0644);
 -  c(auto_home,"man/cat1","822field.0",-1,-1,0644);
@@ -53,7 +74,24 @@ $NetBSD: patch-aa,v 1.2 2012/03/26 14:04:00 joerg Exp $
 -  c(auto_home,"man/cat3","mess822_quote.0",-1,-1,0644);
 -  c(auto_home,"man/cat3","mess822_token.0",-1,-1,0644);
 -  c(auto_home,"man/cat3","mess822_when.0",-1,-1,0644);
--
++  c(auto_home,"@PKGMANDIR@/man1","iftocc.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","new-inject.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","822field.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","822header.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","822date.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","822received.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","822print.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man5","rewriting.5",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man8","ofmipd.8",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man8","ofmipname.8",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man3","mess822.3",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man3","mess822_addr.3",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man3","mess822_date.3",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man3","mess822_fold.3",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man3","mess822_quote.3",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man3","mess822_token.3",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man3","mess822_when.3",-1,-1,0644);
+ 
 -  c("/etc",".","leapsecs.dat",-1,-1,0644);
 +  c(auto_home,"share/examples/mess822","leapsecs.dat",-1,-1,0644);
  }
diff --git a/mail/mess822/patches/patch-ab b/mail/mess822/patches/patch-ab
index 4e7d6b05c9e..2e1b923fdc9 100644
--- a/mail/mess822/patches/patch-ab
+++ b/mail/mess822/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2004/08/30 14:03:49 schmonz Exp $
+$NetBSD: patch-ab,v 1.2 2017/01/02 03:40:21 schmonz Exp $
+
+Initialize strerr_sys to build on Mac OS X (modeled after the patch
+for qmail).
 
 --- strerr_sys.c.orig	Fri Sep  4 22:33:37 1998
 +++ strerr_sys.c
diff --git a/mail/mess822/patches/patch-ac b/mail/mess822/patches/patch-ac
index 90666664dfe..00b9b39a409 100644
--- a/mail/mess822/patches/patch-ac
+++ b/mail/mess822/patches/patch-ac
@@ -1,4 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2008/07/30 10:40:56 schmonz Exp $
+$NetBSD: patch-ac,v 1.2 2017/01/02 03:40:21 schmonz Exp $
+
+Fix to the included libtai, brought over from devel/libtai:
+
+#include <unistd.h> in leapsecs_read.c so we can read leapsecs.dat.
 
 --- leapsecs_read.c.orig	1998-09-04 22:33:37.000000000 -0400
 +++ leapsecs_read.c
diff --git a/mail/mess822/patches/patch-ad b/mail/mess822/patches/patch-ad
index 505a75e5ac9..22bafc239fa 100644
--- a/mail/mess822/patches/patch-ad
+++ b/mail/mess822/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2010/03/15 17:30:02 schmonz Exp $
+$NetBSD: patch-ad,v 1.2 2017/01/02 03:40:21 schmonz Exp $
+
+DESTDIR support.
 
 --- Makefile.orig	1998-09-05 02:33:37.000000000 +0000
 +++ Makefile