CVS commit: pkgsrc/mail/qmailanalog

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Nov 19 09:08:06 UTC 2020

Modified Files:
        pkgsrc/mail/qmailanalog: Makefile PLIST distinfo
        pkgsrc/mail/qmailanalog/patches: patch-hier.c
Removed Files:
        pkgsrc/mail/qmailanalog: MESSAGE

Log Message:
None of the command names appear anywhere else in a pkgsrc-wide PLIST
grep. Install directly to ${PREFIX}. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 pkgsrc/mail/qmailanalog/MESSAGE
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/qmailanalog/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/qmailanalog/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/qmailanalog/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/qmailanalog/patches/patch-hier.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmailanalog/Makefile
diff -u pkgsrc/mail/qmailanalog/Makefile:1.19 pkgsrc/mail/qmailanalog/Makefile:1.20
--- pkgsrc/mail/qmailanalog/Makefile:1.19       Thu Nov 19 08:11:18 2020
+++ pkgsrc/mail/qmailanalog/Makefile    Thu Nov 19 09:08:06 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2020/11/19 08:11:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.20 2020/11/19 09:08:06 schmonz Exp $
 #
 
 DISTNAME=              qmailanalog-0.70
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail
 MASTER_SITES=          http://cr.yp.to/software/
 
@@ -11,9 +11,9 @@ HOMEPAGE=             https://cr.yp.to/qmailanalog.
 COMMENT=               Collection of tools to help analyze qmail's activity
 LICENSE=               djb-nonlicense
 
-DJB_CONFIG_PREFIX=     ${PREFIX}/qmailanalog
-
 SUBST_CLASSES+=                djberrno
 
+INSTALLATION_DIRS=     share/doc
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/qmailanalog/PLIST
diff -u pkgsrc/mail/qmailanalog/PLIST:1.4 pkgsrc/mail/qmailanalog/PLIST:1.5
--- pkgsrc/mail/qmailanalog/PLIST:1.4   Mon Jan  1 22:29:41 2018
+++ pkgsrc/mail/qmailanalog/PLIST       Thu Nov 19 09:08:06 2020
@@ -1,33 +1,33 @@
-@comment $NetBSD: PLIST,v 1.4 2018/01/01 22:29:41 rillig Exp $
-qmailanalog/bin/columnt
-qmailanalog/bin/ddist
-qmailanalog/bin/deferrals
-qmailanalog/bin/failures
-qmailanalog/bin/matchup
-qmailanalog/bin/recipients
-qmailanalog/bin/rhosts
-qmailanalog/bin/rxdelay
-qmailanalog/bin/senders
-qmailanalog/bin/successes
-qmailanalog/bin/suids
-qmailanalog/bin/xqp
-qmailanalog/bin/xrecipient
-qmailanalog/bin/xsender
-qmailanalog/bin/zddist
-qmailanalog/bin/zdeferrals
-qmailanalog/bin/zfailures
-qmailanalog/bin/zoverall
-qmailanalog/bin/zrecipients
-qmailanalog/bin/zrhosts
-qmailanalog/bin/zrxdelay
-qmailanalog/bin/zsenders
-qmailanalog/bin/zsendmail
-qmailanalog/bin/zsuccesses
-qmailanalog/bin/zsuids
-qmailanalog/doc/ACCOUNTING
-qmailanalog/doc/MATCHUP
-qmailanalog/man/man1/columnt.1
-qmailanalog/man/man1/matchup.1
-qmailanalog/man/man1/xqp.1
-qmailanalog/man/man1/xrecipient.1
-qmailanalog/man/man1/xsender.1
+@comment $NetBSD: PLIST,v 1.5 2020/11/19 09:08:06 schmonz Exp $
+bin/columnt
+bin/ddist
+bin/deferrals
+bin/failures
+bin/matchup
+bin/recipients
+bin/rhosts
+bin/rxdelay
+bin/senders
+bin/successes
+bin/suids
+bin/xqp
+bin/xrecipient
+bin/xsender
+bin/zddist
+bin/zdeferrals
+bin/zfailures
+bin/zoverall
+bin/zrecipients
+bin/zrhosts
+bin/zrxdelay
+bin/zsenders
+bin/zsendmail
+bin/zsuccesses
+bin/zsuids
+man/man1/columnt.1
+man/man1/matchup.1
+man/man1/xqp.1
+man/man1/xrecipient.1
+man/man1/xsender.1
+share/doc/qmailanalog/ACCOUNTING
+share/doc/qmailanalog/MATCHUP

Index: pkgsrc/mail/qmailanalog/distinfo
diff -u pkgsrc/mail/qmailanalog/distinfo:1.7 pkgsrc/mail/qmailanalog/distinfo:1.8
--- pkgsrc/mail/qmailanalog/distinfo:1.7        Fri Sep  1 03:51:26 2017
+++ pkgsrc/mail/qmailanalog/distinfo    Thu Nov 19 09:08:06 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2017/09/01 03:51:26 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2020/11/19 09:08:06 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) = c761a5fc8ce88092981e3035088c64904de07012
+SHA1 (patch-hier.c) = 8ff000882059f33782ed342a5eda5bcfe631d705

Index: pkgsrc/mail/qmailanalog/patches/patch-hier.c
diff -u pkgsrc/mail/qmailanalog/patches/patch-hier.c:1.2 pkgsrc/mail/qmailanalog/patches/patch-hier.c:1.3
--- pkgsrc/mail/qmailanalog/patches/patch-hier.c:1.2    Fri Sep  1 03:50:12 2017
+++ pkgsrc/mail/qmailanalog/patches/patch-hier.c        Thu Nov 19 09:08:06 2020
@@ -1,17 +1,24 @@
-$NetBSD: patch-hier.c,v 1.2 2017/09/01 03:50:12 schmonz Exp $
+$NetBSD: patch-hier.c,v 1.3 2020/11/19 09:08:06 schmonz Exp $
 
+Follow hier(7).
 Don't install catpages.
 
---- hier.c.orig        2012-03-13 17:48:44.000000000 +0000
+--- hier.c.orig        1998-08-30 21:39:27.000000000 +0000
 +++ hier.c
-@@ -8,21 +8,15 @@ void hier()
-   d(auto_home,"doc",-1,-1,02755);
+@@ -5,24 +5,18 @@ void hier()
+   h(auto_home,-1,-1,02755);
+ 
+   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/cat1",-1,-1,02755);
  
-   c(auto_home,"doc","MATCHUP",-1,-1,0644);
-   c(auto_home,"doc","ACCOUNTING",-1,-1,0644);
+-  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/cat1","matchup.0",-1,-1,0644);