Fri Sep 1 03:50:12 2017 UTC ()
Really don't build catpages.


(schmonz)
diff -r1.15 -r1.16 pkgsrc/mail/qmailanalog/Makefile
diff -r1.5 -r1.6 pkgsrc/mail/qmailanalog/distinfo
diff -r1.1 -r1.2 pkgsrc/mail/qmailanalog/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/mail/qmailanalog/patches/patch-hier.c
cvs diff -r1.15 -r1.16 pkgsrc/mail/qmailanalog/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmailanalog/Makefile 2017/07/26 00:36:44 1.15
+++ pkgsrc/mail/qmailanalog/Makefile 2017/09/01 03:50:11 1.16
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.15 2017/07/26 00:36:44 schmonz Exp $ 1# $NetBSD: Makefile,v 1.16 2017/09/01 03:50:11 schmonz Exp $
2# 2#
3 3
4DISTNAME= qmailanalog-0.70 4DISTNAME= qmailanalog-0.70
5PKGREVISION= 1 5PKGREVISION= 1
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= http://cr.yp.to/qmailanalog.html 10HOMEPAGE= http://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
12 12
13DJB_RESTRICTED= YES 13DJB_RESTRICTED= YES
14DJB_CONFIG_PREFIX= ${PREFIX}/qmailanalog 14DJB_CONFIG_PREFIX= ${PREFIX}/qmailanalog
15BUILD_TARGET= prog install instcheck 
16 15
17.include "../../mk/djbware.mk" 16.include "../../mk/djbware.mk"
18.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/mail/qmailanalog/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/qmailanalog/distinfo 2015/11/03 23:27:18 1.5
+++ pkgsrc/mail/qmailanalog/distinfo 2017/09/01 03:50:11 1.6
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.5 2015/11/03 23:27:18 agc Exp $ 1$NetBSD: distinfo,v 1.6 2017/09/01 03:50:11 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-aa) = be5c86804cb3ba9fcbff3bf58997ae7a2d87b84c 7SHA1 (patch-aa) = 146c0fba8350c63eb5de97fe42738eecddee8ecc
8SHA1 (patch-hier.c) = 2e26e4717560e5a38eb662e64cdcd05e0fe355fe 8SHA1 (patch-hier.c) = c761a5fc8ce88092981e3035088c64904de07012
cvs diff -r1.1 -r1.2 pkgsrc/mail/qmailanalog/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/qmailanalog/patches/Attic/patch-aa 2010/03/15 17:30:45 1.1
+++ pkgsrc/mail/qmailanalog/patches/Attic/patch-aa 2017/09/01 03:50:12 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.1 2010/03/15 17:30:45 schmonz Exp $ 1$NetBSD: patch-aa,v 1.2 2017/09/01 03:50:12 schmonz Exp $
 2
 3DESTDIR support, and avoid building catpages.
2 4
3--- Makefile.orig 1998-08-30 21:39:26.000000000 +0000 5--- Makefile.orig 1998-08-30 21:39:26.000000000 +0000
4+++ Makefile 6+++ Makefile
5@@ -35,6 +35,14 @@ auto-str.o: \ 7@@ -35,6 +35,14 @@ auto-str.o: \
6 compile auto-str.c substdio.h readwrite.h exit.h 8 compile auto-str.c substdio.h readwrite.h exit.h
7 ./compile auto-str.c 9 ./compile auto-str.c
8  10
9+auto_destdir.c: \ 11+auto_destdir.c: \
10+auto-str conf-destdir 12+auto-str conf-destdir
11+ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c 13+ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
12+ 14+
13+auto_destdir.o: \ 15+auto_destdir.o: \
14+compile auto_destdir.c 16+compile auto_destdir.c
@@ -30,13 +32,22 @@ $NetBSD: patch-aa,v 1.1 2010/03/15 17:30 @@ -30,13 +32,22 @@ $NetBSD: patch-aa,v 1.1 2010/03/15 17:30
30  32
31 install.o: \ 33 install.o: \
32@@ -205,8 +213,8 @@ exit.h 34@@ -205,8 +213,8 @@ exit.h
33 ./compile install.c 35 ./compile install.c
34  36
35 instcheck: \ 37 instcheck: \
36-load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a 38-load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
37- ./load instcheck hier.o auto_home.o strerr.a substdio.a \ 39- ./load instcheck hier.o auto_home.o strerr.a substdio.a \
38+load instcheck.o hier.o auto_destdir.o strerr.a substdio.a error.a str.a 40+load instcheck.o hier.o auto_destdir.o strerr.a substdio.a error.a str.a
39+ ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \ 41+ ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \
40 error.a str.a  42 error.a str.a
41  43
42 instcheck.o: \ 44 instcheck.o: \
 45@@ -214,7 +222,7 @@ compile instcheck.c strerr.h error.h rea
 46 ./compile instcheck.c
 47
 48 it: \
 49-man prog install instcheck
 50+prog install instcheck
 51
 52 load: \
 53 make-load warn-auto.sh systype
cvs diff -r1.1 -r1.2 pkgsrc/mail/qmailanalog/patches/patch-hier.c (expand / switch to unified diff)

--- pkgsrc/mail/qmailanalog/patches/patch-hier.c 2012/03/14 23:15:16 1.1
+++ pkgsrc/mail/qmailanalog/patches/patch-hier.c 2017/09/01 03:50:12 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-hier.c,v 1.1 2012/03/14 23:15:16 joerg Exp $ 1$NetBSD: patch-hier.c,v 1.2 2017/09/01 03:50:12 schmonz Exp $
 2
 3Don't install catpages.
2 4
3--- hier.c.orig 2012-03-13 17:48:44.000000000 +0000 5--- hier.c.orig 2012-03-13 17:48:44.000000000 +0000
4+++ hier.c 6+++ hier.c
5@@ -8,21 +8,15 @@ void hier() 7@@ -8,21 +8,15 @@ void hier()
6 d(auto_home,"doc",-1,-1,02755); 8 d(auto_home,"doc",-1,-1,02755);
7 d(auto_home,"man",-1,-1,02755); 9 d(auto_home,"man",-1,-1,02755);
8 d(auto_home,"man/man1",-1,-1,02755); 10 d(auto_home,"man/man1",-1,-1,02755);
9- d(auto_home,"man/cat1",-1,-1,02755); 11- d(auto_home,"man/cat1",-1,-1,02755);
10  12
11 c(auto_home,"doc","MATCHUP",-1,-1,0644); 13 c(auto_home,"doc","MATCHUP",-1,-1,0644);
12 c(auto_home,"doc","ACCOUNTING",-1,-1,0644); 14 c(auto_home,"doc","ACCOUNTING",-1,-1,0644);
13  15
14 c(auto_home,"man/man1","matchup.1",-1,-1,0644); 16 c(auto_home,"man/man1","matchup.1",-1,-1,0644);