Support PKGMANDIR.

3 files changed, 31 insertions, 16 deletions

diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index e77a23d5f67..3f9188c53cd 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/11/19 09:08:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2020/11/30 13:42:04 schmonz Exp $
 #
 
 DISTNAME=		qmailanalog-0.70
@@ -13,6 +13,11 @@ LICENSE=		djb-nonlicense
 
 SUBST_CLASSES+=		djberrno
 
+SUBST_CLASSES+=		pkgmandir
+SUBST_STAGE.pkgmandir=	pre-configure
+SUBST_FILES.pkgmandir=	hier.c
+SUBST_VARS.pkgmandir=	PKGMANDIR
+
 INSTALLATION_DIRS=	share/doc
 
 .include "../../mk/djbware.mk"
diff --git a/mail/qmailanalog/distinfo b/mail/qmailanalog/distinfo
index 9067f208508..985a8a73a4e 100644
--- a/mail/qmailanalog/distinfo
+++ b/mail/qmailanalog/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2020/11/19 09:08:06 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2020/11/30 13:42:04 schmonz Exp $
 
 SHA1 (qmailanalog-0.70.tar.gz) = d9f47b6c5348759aeba3873b6b7653b823b2f92c
 RMD160 (qmailanalog-0.70.tar.gz) = 2f67793dc46930a4375dc481341d33b3406525d0
 SHA512 (qmailanalog-0.70.tar.gz) = 0a4991a9ac13b64494b15a6ad42df1bee273a7a3c5ead923450d5516d747989e80e3a0f88e29203dce24dc833cc3bb46d5935633f67bed547f27ac22ad866f3d
 Size (qmailanalog-0.70.tar.gz) = 28416 bytes
 SHA1 (patch-Makefile) = 146c0fba8350c63eb5de97fe42738eecddee8ecc
-SHA1 (patch-hier.c) = 8ff000882059f33782ed342a5eda5bcfe631d705
+SHA1 (patch-hier.c) = 3aa7de1a49d6eedd655b15879fff4180c2fa15c8
diff --git a/mail/qmailanalog/patches/patch-hier.c b/mail/qmailanalog/patches/patch-hier.c
index 8ea9cd8f6fa..f7f77275378 100644
--- a/mail/qmailanalog/patches/patch-hier.c
+++ b/mail/qmailanalog/patches/patch-hier.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-hier.c,v 1.3 2020/11/19 09:08:06 schmonz Exp $
+$NetBSD: patch-hier.c,v 1.4 2020/11/30 13:42:04 schmonz Exp $
 
 Follow hier(7).
+Support PKGMANDIR.
 Don't install catpages.
 
 --- hier.c.orig	1998-08-30 21:39:27.000000000 +0000
@@ -10,26 +11,35 @@ Don't install catpages.
  
    d(auto_home,"bin",-1,-1,02755);
 -  d(auto_home,"doc",-1,-1,02755);
-+  d(auto_home,"share/doc/qmailanalog",-1,-1,02755);
-   d(auto_home,"man",-1,-1,02755);
-   d(auto_home,"man/man1",-1,-1,02755);
+-  d(auto_home,"man",-1,-1,02755);
+-  d(auto_home,"man/man1",-1,-1,02755);
 -  d(auto_home,"man/cat1",-1,-1,02755);
- 
+-
 -  c(auto_home,"doc","MATCHUP",-1,-1,0644);
 -  c(auto_home,"doc","ACCOUNTING",-1,-1,0644);
-+  c(auto_home,"share/doc/qmailanalog","MATCHUP",-1,-1,0644);
-+  c(auto_home,"share/doc/qmailanalog","ACCOUNTING",-1,-1,0644);
- 
-   c(auto_home,"man/man1","matchup.1",-1,-1,0644);
+-
+-  c(auto_home,"man/man1","matchup.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","matchup.0",-1,-1,0644);
-   c(auto_home,"man/man1","xqp.1",-1,-1,0644);
+-  c(auto_home,"man/man1","xqp.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","xqp.0",-1,-1,0644);
-   c(auto_home,"man/man1","xsender.1",-1,-1,0644);
+-  c(auto_home,"man/man1","xsender.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","xsender.0",-1,-1,0644);
-   c(auto_home,"man/man1","xrecipient.1",-1,-1,0644);
+-  c(auto_home,"man/man1","xrecipient.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","xrecipient.0",-1,-1,0644);
-   c(auto_home,"man/man1","columnt.1",-1,-1,0644);
+-  c(auto_home,"man/man1","columnt.1",-1,-1,0644);
 -  c(auto_home,"man/cat1","columnt.0",-1,-1,0644);
++  d(auto_home,"share/doc/qmailanalog",-1,-1,02755);
++  d(auto_home,"@PKGMANDIR@",-1,-1,02755);
++  d(auto_home,"@PKGMANDIR@/man1",-1,-1,02755);
++
++  c(auto_home,"share/doc/qmailanalog","MATCHUP",-1,-1,0644);
++  c(auto_home,"share/doc/qmailanalog","ACCOUNTING",-1,-1,0644);
++
++  c(auto_home,"@PKGMANDIR@/man1","matchup.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","xqp.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","xsender.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","xrecipient.1",-1,-1,0644);
++  c(auto_home,"@PKGMANDIR@/man1","columnt.1",-1,-1,0644);
  
    c(auto_home,"bin","matchup",-1,-1,0755);
    c(auto_home,"bin","columnt",-1,-1,0755);