Mon Nov 30 13:42:04 2020 UTC ()
Support PKGMANDIR.


(schmonz)
diff -r1.20 -r1.21 pkgsrc/mail/qmailanalog/Makefile
diff -r1.8 -r1.9 pkgsrc/mail/qmailanalog/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/qmailanalog/patches/patch-hier.c
cvs diff -r1.20 -r1.21 pkgsrc/mail/qmailanalog/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmailanalog/Makefile 2020/11/19 09:08:06 1.20
+++ pkgsrc/mail/qmailanalog/Makefile 2020/11/30 13:42:04 1.21
@@ -1,19 +1,24 @@ @@ -1,19 +1,24 @@
1# $NetBSD: Makefile,v 1.20 2020/11/19 09:08:06 schmonz Exp $ 1# $NetBSD: Makefile,v 1.21 2020/11/30 13:42:04 schmonz Exp $
2# 2#
3 3
4DISTNAME= qmailanalog-0.70 4DISTNAME= qmailanalog-0.70
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= http://cr.yp.to/software/ 7MASTER_SITES= http://cr.yp.to/software/
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://cr.yp.to/qmailanalog.html 10HOMEPAGE= https://cr.yp.to/qmailanalog.html
11COMMENT= Collection of tools to help analyze qmail's activity 11COMMENT= Collection of tools to help analyze qmail's activity
12LICENSE= djb-nonlicense 12LICENSE= djb-nonlicense
13 13
14SUBST_CLASSES+= djberrno 14SUBST_CLASSES+= djberrno
15 15
 16SUBST_CLASSES+= pkgmandir
 17SUBST_STAGE.pkgmandir= pre-configure
 18SUBST_FILES.pkgmandir= hier.c
 19SUBST_VARS.pkgmandir= PKGMANDIR
 20
16INSTALLATION_DIRS= share/doc 21INSTALLATION_DIRS= share/doc
17 22
18.include "../../mk/djbware.mk" 23.include "../../mk/djbware.mk"
19.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/mail/qmailanalog/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/qmailanalog/distinfo 2020/11/19 09:08:06 1.8
+++ pkgsrc/mail/qmailanalog/distinfo 2020/11/30 13:42:04 1.9
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.8 2020/11/19 09:08:06 schmonz Exp $ 1$NetBSD: distinfo,v 1.9 2020/11/30 13:42:04 schmonz Exp $
2 2
3SHA1 (qmailanalog-0.70.tar.gz) = d9f47b6c5348759aeba3873b6b7653b823b2f92c 3SHA1 (qmailanalog-0.70.tar.gz) = d9f47b6c5348759aeba3873b6b7653b823b2f92c
4RMD160 (qmailanalog-0.70.tar.gz) = 2f67793dc46930a4375dc481341d33b3406525d0 4RMD160 (qmailanalog-0.70.tar.gz) = 2f67793dc46930a4375dc481341d33b3406525d0
5SHA512 (qmailanalog-0.70.tar.gz) = 0a4991a9ac13b64494b15a6ad42df1bee273a7a3c5ead923450d5516d747989e80e3a0f88e29203dce24dc833cc3bb46d5935633f67bed547f27ac22ad866f3d 5SHA512 (qmailanalog-0.70.tar.gz) = 0a4991a9ac13b64494b15a6ad42df1bee273a7a3c5ead923450d5516d747989e80e3a0f88e29203dce24dc833cc3bb46d5935633f67bed547f27ac22ad866f3d
6Size (qmailanalog-0.70.tar.gz) = 28416 bytes 6Size (qmailanalog-0.70.tar.gz) = 28416 bytes
7SHA1 (patch-Makefile) = 146c0fba8350c63eb5de97fe42738eecddee8ecc 7SHA1 (patch-Makefile) = 146c0fba8350c63eb5de97fe42738eecddee8ecc
8SHA1 (patch-hier.c) = 8ff000882059f33782ed342a5eda5bcfe631d705 8SHA1 (patch-hier.c) = 3aa7de1a49d6eedd655b15879fff4180c2fa15c8
cvs diff -r1.3 -r1.4 pkgsrc/mail/qmailanalog/patches/patch-hier.c (expand / switch to unified diff)

--- pkgsrc/mail/qmailanalog/patches/patch-hier.c 2020/11/19 09:08:06 1.3
+++ pkgsrc/mail/qmailanalog/patches/patch-hier.c 2020/11/30 13:42:04 1.4
@@ -1,35 +1,45 @@ @@ -1,35 +1,45 @@
1$NetBSD: patch-hier.c,v 1.3 2020/11/19 09:08:06 schmonz Exp $ 1$NetBSD: patch-hier.c,v 1.4 2020/11/30 13:42:04 schmonz Exp $
2 2
3Follow hier(7). 3Follow hier(7).
 4Support PKGMANDIR.
4Don't install catpages. 5Don't install catpages.
5 6
6--- hier.c.orig 1998-08-30 21:39:27.000000000 +0000 7--- hier.c.orig 1998-08-30 21:39:27.000000000 +0000
7+++ hier.c 8+++ hier.c
8@@ -5,24 +5,18 @@ void hier() 9@@ -5,24 +5,18 @@ void hier()
9 h(auto_home,-1,-1,02755); 10 h(auto_home,-1,-1,02755);
10  11
11 d(auto_home,"bin",-1,-1,02755); 12 d(auto_home,"bin",-1,-1,02755);
12- d(auto_home,"doc",-1,-1,02755); 13- d(auto_home,"doc",-1,-1,02755);
13+ d(auto_home,"share/doc/qmailanalog",-1,-1,02755); 14- d(auto_home,"man",-1,-1,02755);
14 d(auto_home,"man",-1,-1,02755); 15- d(auto_home,"man/man1",-1,-1,02755);
15 d(auto_home,"man/man1",-1,-1,02755); 
16- d(auto_home,"man/cat1",-1,-1,02755); 16- d(auto_home,"man/cat1",-1,-1,02755);
17  17-
18- c(auto_home,"doc","MATCHUP",-1,-1,0644); 18- c(auto_home,"doc","MATCHUP",-1,-1,0644);
19- c(auto_home,"doc","ACCOUNTING",-1,-1,0644); 19- c(auto_home,"doc","ACCOUNTING",-1,-1,0644);
20+ c(auto_home,"share/doc/qmailanalog","MATCHUP",-1,-1,0644); 20-
21+ c(auto_home,"share/doc/qmailanalog","ACCOUNTING",-1,-1,0644); 21- c(auto_home,"man/man1","matchup.1",-1,-1,0644);
22  
23 c(auto_home,"man/man1","matchup.1",-1,-1,0644); 
24- c(auto_home,"man/cat1","matchup.0",-1,-1,0644); 22- c(auto_home,"man/cat1","matchup.0",-1,-1,0644);
25 c(auto_home,"man/man1","xqp.1",-1,-1,0644); 23- c(auto_home,"man/man1","xqp.1",-1,-1,0644);
26- c(auto_home,"man/cat1","xqp.0",-1,-1,0644); 24- c(auto_home,"man/cat1","xqp.0",-1,-1,0644);
27 c(auto_home,"man/man1","xsender.1",-1,-1,0644); 25- c(auto_home,"man/man1","xsender.1",-1,-1,0644);
28- c(auto_home,"man/cat1","xsender.0",-1,-1,0644); 26- c(auto_home,"man/cat1","xsender.0",-1,-1,0644);
29 c(auto_home,"man/man1","xrecipient.1",-1,-1,0644); 27- c(auto_home,"man/man1","xrecipient.1",-1,-1,0644);
30- c(auto_home,"man/cat1","xrecipient.0",-1,-1,0644); 28- c(auto_home,"man/cat1","xrecipient.0",-1,-1,0644);
31 c(auto_home,"man/man1","columnt.1",-1,-1,0644); 29- c(auto_home,"man/man1","columnt.1",-1,-1,0644);
32- c(auto_home,"man/cat1","columnt.0",-1,-1,0644); 30- c(auto_home,"man/cat1","columnt.0",-1,-1,0644);
 31+ d(auto_home,"share/doc/qmailanalog",-1,-1,02755);
 32+ d(auto_home,"@PKGMANDIR@",-1,-1,02755);
 33+ d(auto_home,"@PKGMANDIR@/man1",-1,-1,02755);
 34+
 35+ c(auto_home,"share/doc/qmailanalog","MATCHUP",-1,-1,0644);
 36+ c(auto_home,"share/doc/qmailanalog","ACCOUNTING",-1,-1,0644);
 37+
 38+ c(auto_home,"@PKGMANDIR@/man1","matchup.1",-1,-1,0644);
 39+ c(auto_home,"@PKGMANDIR@/man1","xqp.1",-1,-1,0644);
 40+ c(auto_home,"@PKGMANDIR@/man1","xsender.1",-1,-1,0644);
 41+ c(auto_home,"@PKGMANDIR@/man1","xrecipient.1",-1,-1,0644);
 42+ c(auto_home,"@PKGMANDIR@/man1","columnt.1",-1,-1,0644);
33  43
34 c(auto_home,"bin","matchup",-1,-1,0755); 44 c(auto_home,"bin","matchup",-1,-1,0755);
35 c(auto_home,"bin","columnt",-1,-1,0755); 45 c(auto_home,"bin","columnt",-1,-1,0755);