Fri Jun 26 16:37:23 2020 UTC ()
Assign non-default SUBST_FILES.djberrno with =, not += (because it
doesn't actually append).


(schmonz)
diff -r1.21 -r1.22 pkgsrc/devel/libtai/Makefile
diff -r1.28 -r1.29 pkgsrc/mail/fastforward/Makefile
diff -r1.35 -r1.36 pkgsrc/mail/mess822/Makefile
diff -r1.36 -r1.37 pkgsrc/mail/qmail-conf/Makefile
diff -r1.44 -r1.45 pkgsrc/sysutils/daemontools/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/devel/libtai/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libtai/Makefile 2020/06/25 05:42:36 1.21
+++ pkgsrc/devel/libtai/Makefile 2020/06/26 16:37:22 1.22
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.21 2020/06/25 05:42:36 schmonz Exp $ 1# $NetBSD: Makefile,v 1.22 2020/06/26 16:37:22 schmonz Exp $
2# 2#
3 3
4DISTNAME= libtai-0.60 4DISTNAME= libtai-0.60
5PKGREVISION= 8 5PKGREVISION= 8
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://cr.yp.to/libtai/ 7MASTER_SITES= http://cr.yp.to/libtai/
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://cr.yp.to/libtai.html 10HOMEPAGE= https://cr.yp.to/libtai.html
11COMMENT= Library for storing and manipulating dates and times 11COMMENT= Library for storing and manipulating dates and times
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14CONFLICTS= libowfat<0.32nb1 14CONFLICTS= libowfat<0.32nb1
15 15
16DJB_RESTRICTED= NO 16DJB_RESTRICTED= NO
17 17
18EGDIR= share/examples/${PKGBASE} 18EGDIR= share/examples/${PKGBASE}
19 19
20SUBST_CLASSES+= djberrno 20SUBST_CLASSES+= djberrno
21SUBST_FILES.djberrno+= leapsecs_read.c 21SUBST_FILES.djberrno= leapsecs_read.c
22 22
23SUBST_CLASSES+= paths 23SUBST_CLASSES+= paths
24SUBST_STAGE.paths= do-configure 24SUBST_STAGE.paths= do-configure
25SUBST_FILES.paths= leapsecs.3 leapsecs_read.c 25SUBST_FILES.paths= leapsecs.3 leapsecs_read.c
26SUBST_VARS.paths= PKG_SYSCONFDIR 26SUBST_VARS.paths= PKG_SYSCONFDIR
27 27
28INSTALLATION_DIRS= bin include lib ${EGDIR} 28INSTALLATION_DIRS= bin include lib ${EGDIR}
29INSTALLATION_DIRS+= ${PKGMANDIR}/man3 29INSTALLATION_DIRS+= ${PKGMANDIR}/man3
30 30
31.include "options.mk" 31.include "options.mk"
32 32
33post-build: 33post-build:
34 cd ${WRKSRC} && ./leapsecs < leapsecs.txt > leapsecs.dat 34 cd ${WRKSRC} && ./leapsecs < leapsecs.txt > leapsecs.dat
cvs diff -r1.28 -r1.29 pkgsrc/mail/fastforward/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/fastforward/Makefile 2020/06/25 05:42:39 1.28
+++ pkgsrc/mail/fastforward/Makefile 2020/06/26 16:37:22 1.29
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.28 2020/06/25 05:42:39 schmonz Exp $ 1# $NetBSD: Makefile,v 1.29 2020/06/26 16:37:22 schmonz Exp $
2# 2#
3 3
4DISTNAME= fastforward-0.51 4DISTNAME= fastforward-0.51
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/fastforward.html 10HOMEPAGE= https://cr.yp.to/fastforward.html
11COMMENT= Sendmail-style /etc/aliases support for qmail 11COMMENT= Sendmail-style /etc/aliases support for qmail
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14DEPENDS+= qmail>=1.03nb7:../../mail/qmail 14DEPENDS+= qmail>=1.03nb7:../../mail/qmail
15 15
16CONFLICTS+= esmtp>=1.2 postfix-[0-9]* sendmail-[0-9]* 16CONFLICTS+= esmtp>=1.2 postfix-[0-9]* sendmail-[0-9]*
17 17
18DJB_BUILD_TARGETS= install instcheck 18DJB_BUILD_TARGETS= install instcheck
19 19
20DJB_RESTRICTED= no 20DJB_RESTRICTED= no
21 21
22SUBST_CLASSES+= djberrno 22SUBST_CLASSES+= djberrno
23SUBST_FILES.djberrno+= cdb_seek.c 23SUBST_FILES.djberrno= cdb_seek.c error.h
24 24
25SUBST_CLASSES+= paths 25SUBST_CLASSES+= paths
26SUBST_STAGE.paths= do-configure 26SUBST_STAGE.paths= do-configure
27SUBST_FILES.paths= hier.c 27SUBST_FILES.paths= hier.c
28SUBST_VARS.paths= PKGMANDIR 28SUBST_VARS.paths= PKGMANDIR
29 29
30.include "../../mk/djbware.mk" 30.include "../../mk/djbware.mk"
31.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.35 -r1.36 pkgsrc/mail/mess822/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mess822/Makefile 2020/06/25 05:42:38 1.35
+++ pkgsrc/mail/mess822/Makefile 2020/06/26 16:37:23 1.36
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.35 2020/06/25 05:42:38 schmonz Exp $ 1# $NetBSD: Makefile,v 1.36 2020/06/26 16:37:23 schmonz Exp $
2# 2#
3 3
4DISTNAME= mess822-0.58 4DISTNAME= mess822-0.58
5PKGREVISION= 8 5PKGREVISION= 8
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/mess822.html 10HOMEPAGE= https://cr.yp.to/mess822.html
11COMMENT= Library for parsing Internet mail messages 11COMMENT= Library for parsing Internet mail messages
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14DEPENDS+= libtai>=0.60nb5:../../devel/libtai 14DEPENDS+= libtai>=0.60nb5:../../devel/libtai
15DEPENDS+= qmail>=1.03nb7:../../mail/qmail 15DEPENDS+= qmail>=1.03nb7:../../mail/qmail
16 16
17DJB_RESTRICTED= no 17DJB_RESTRICTED= no
18 18
19DJB_BUILD_TARGETS= install instcheck 19DJB_BUILD_TARGETS= install instcheck
20 20
21AUTO_MKDIRS= yes 21AUTO_MKDIRS= yes
22 22
23SUBST_CLASSES+= djberrno 23SUBST_CLASSES+= djberrno
24SUBST_FILES.djberrno+= cdb_seek.c 24SUBST_FILES.djberrno= cdb_seek.c error.h
25 25
26SUBST_CLASSES+= paths 26SUBST_CLASSES+= paths
27SUBST_STAGE.paths= do-configure 27SUBST_STAGE.paths= do-configure
28SUBST_FILES.paths= hier.c 28SUBST_FILES.paths= hier.c
29SUBST_VARS.paths= PKGMANDIR 29SUBST_VARS.paths= PKGMANDIR
30 30
31MESS822PATCHES= qmailqueue:${QMAILQUEUE_PATCH} 31MESS822PATCHES= qmailqueue:${QMAILQUEUE_PATCH}
32QMAILQUEUE_PATCH= mess822-0.58-qmailqueue-20170527.patch 32QMAILQUEUE_PATCH= mess822-0.58-qmailqueue-20170527.patch
33PATCHFILES+= ${QMAILQUEUE_PATCH} 33PATCHFILES+= ${QMAILQUEUE_PATCH}
34SITES.${QMAILQUEUE_PATCH}= https://schmonz.com/qmail/mess822qmailqueue/ 34SITES.${QMAILQUEUE_PATCH}= https://schmonz.com/qmail/mess822qmailqueue/
35 35
36BUILD_DEFS+= MESS822PATCHES 36BUILD_DEFS+= MESS822PATCHES
37 37
cvs diff -r1.36 -r1.37 pkgsrc/mail/qmail-conf/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail-conf/Makefile 2020/06/25 05:42:38 1.36
+++ pkgsrc/mail/qmail-conf/Makefile 2020/06/26 16:37:23 1.37
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.36 2020/06/25 05:42:38 schmonz Exp $ 1# $NetBSD: Makefile,v 1.37 2020/06/26 16:37:23 schmonz Exp $
2# 2#
3 3
4DISTNAME= qmail-conf-0.60 4DISTNAME= qmail-conf-0.60
5PKGREVISION= 5 5PKGREVISION= 5
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= http://woodsheep.jp/qmail-conf/ 7MASTER_SITES= http://woodsheep.jp/qmail-conf/
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX}
9SITES.djbdns-1.05.tar.gz= http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/ 9SITES.djbdns-1.05.tar.gz= http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/
10 10
11MAINTAINER= schmonz@NetBSD.org 11MAINTAINER= schmonz@NetBSD.org
12HOMEPAGE= http://woodsheep.jp/qmail-conf.html 12HOMEPAGE= http://woodsheep.jp/qmail-conf.html
13COMMENT= Collection of tools for setting up qmail services 13COMMENT= Collection of tools for setting up qmail services
14 14
15DEPENDS+= daemontools>=0.70:../../sysutils/daemontools 15DEPENDS+= daemontools>=0.70:../../sysutils/daemontools
16DEPENDS+= qmail>=1.03nb7:../../mail/qmail 16DEPENDS+= qmail>=1.03nb7:../../mail/qmail
17 17
18DJB_RESTRICTED= NO 18DJB_RESTRICTED= NO
19DJB_CONFIG_CMDS= ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp; 19DJB_CONFIG_CMDS= ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp;
20 20
21SUBST_CLASSES+= djberrno 21SUBST_CLASSES+= djberrno
22SUBST_FILES.djberrno+= ../djbdns-1.05/error.h 22SUBST_FILES.djberrno= ../djbdns-1.05/error.h
23 23
24.include "options.mk" 24.include "options.mk"
25 25
26pre-build: 26pre-build:
27 cd ${WRKSRC} && ${MAKE} -f Makefile.ini djbdns="../djbdns-1.05" 27 cd ${WRKSRC} && ${MAKE} -f Makefile.ini djbdns="../djbdns-1.05"
28 28
29.include "../../mk/djbware.mk" 29.include "../../mk/djbware.mk"
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.44 -r1.45 pkgsrc/sysutils/daemontools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/daemontools/Makefile 2020/06/25 05:42:39 1.44
+++ pkgsrc/sysutils/daemontools/Makefile 2020/06/26 16:37:23 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.44 2020/06/25 05:42:39 schmonz Exp $ 1# $NetBSD: Makefile,v 1.45 2020/06/26 16:37:23 schmonz Exp $
2 2
3DISTNAME= daemontools-0.76 3DISTNAME= daemontools-0.76
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= http://cr.yp.to/daemontools/ ftp://cr.yp.to/daemontools/ 6MASTER_SITES= http://cr.yp.to/daemontools/ ftp://cr.yp.to/daemontools/
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES} 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://cr.yp.to/daemontools.html 10HOMEPAGE= https://cr.yp.to/daemontools.html
11COMMENT= Service monitoring and logging utilities by djb 11COMMENT= Service monitoring and logging utilities by djb
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14MANPAGES= ${DISTNAME}-man-20020131.tar.gz 14MANPAGES= ${DISTNAME}-man-20020131.tar.gz
@@ -18,27 +18,27 @@ CONFLICTS+= daemontools-encore-[0-9]* @@ -18,27 +18,27 @@ CONFLICTS+= daemontools-encore-[0-9]*
18 18
19DJB_RESTRICTED= no 19DJB_RESTRICTED= no
20 20
21WRKSRC= ${WRKDIR}/admin/${PKGNAME_NOREV} 21WRKSRC= ${WRKDIR}/admin/${PKGNAME_NOREV}
22DJB_SLASHPACKAGE= YES 22DJB_SLASHPACKAGE= YES
23 23
24CMDDIR= ${WRKSRC}/command 24CMDDIR= ${WRKSRC}/command
25 25
26USE_TOOLS+= file 26USE_TOOLS+= file
27 27
28INSTALLATION_DIRS= bin man ${PKGMANDIR}/man8 28INSTALLATION_DIRS= bin man ${PKGMANDIR}/man8
29 29
30SUBST_CLASSES+= djberrno 30SUBST_CLASSES+= djberrno
31SUBST_FILES.djberrno+= src/error.h 31SUBST_FILES.djberrno= src/error.h
32 32
33SUBST_CLASSES+= paths 33SUBST_CLASSES+= paths
34SUBST_STAGE.paths= do-configure 34SUBST_STAGE.paths= do-configure
35SUBST_FILES.paths= src/svscanboot.sh 35SUBST_FILES.paths= src/svscanboot.sh
36SUBST_SED.paths= -e 's|/usr/local/sbin:/bin|/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/bin|g' 36SUBST_SED.paths= -e 's|/usr/local/sbin:/bin|/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/bin|g'
37SUBST_SED.paths+= -e 's|/command/svc |${PREFIX}/bin/svc |g' 37SUBST_SED.paths+= -e 's|/command/svc |${PREFIX}/bin/svc |g'
38 38
39MAKE_ENV+= PKGSRC_SHELL=${TOOLS_PLATFORM.sh} 39MAKE_ENV+= PKGSRC_SHELL=${TOOLS_PLATFORM.sh}
40 40
41.include "options.mk" 41.include "options.mk"
42 42
43do-install: 43do-install:
44 (while read cmd; do \ 44 (while read cmd; do \