pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: schmonz
Date: Thu Jun 25 05:42:40 UTC 2020
Modified Files:
pkgsrc/databases/cdb: Makefile
pkgsrc/devel/bglibs: Makefile
pkgsrc/devel/libtai: Makefile
pkgsrc/mail/dot-forward: Makefile
pkgsrc/mail/ezmlm: Makefile
pkgsrc/mail/ezmlm-idx: Makefile
pkgsrc/mail/fastforward: Makefile
pkgsrc/mail/mailfront: Makefile
pkgsrc/mail/mess822: Makefile
pkgsrc/mail/qconfirm: Makefile
pkgsrc/mail/qmail: Makefile
pkgsrc/mail/qmail-acceptutils: Makefile
pkgsrc/mail/qmail-autoresponder: Makefile
pkgsrc/mail/qmail-conf: Makefile
pkgsrc/mail/qmail-qfilter: Makefile
pkgsrc/mail/qmail-rejectutils: Makefile
pkgsrc/mail/qmailanalog: Makefile
pkgsrc/mail/qtools: Makefile
pkgsrc/mail/queue-fix: Makefile
pkgsrc/mail/relay-ctrl: Makefile
pkgsrc/mail/safecat: Makefile
pkgsrc/mail/serialmail: Makefile
pkgsrc/math/djbfft: Makefile
pkgsrc/mk: djbware.mk
pkgsrc/mk/defaults: options.description
pkgsrc/net/djbdns: Makefile
pkgsrc/net/djbdnscurve6: Makefile
pkgsrc/net/publicfile: Makefile
pkgsrc/net/ucspi-ssl: Makefile
pkgsrc/net/ucspi-tcp: Makefile
pkgsrc/net/ucspi-tcp6: Makefile
pkgsrc/security/cvm: Makefile
pkgsrc/sysutils/checkpassword: Makefile
pkgsrc/sysutils/daemontools: Makefile
pkgsrc/sysutils/daemontools-encore: Makefile
pkgsrc/sysutils/fdtools: Makefile
pkgsrc/sysutils/memtester: Makefile
pkgsrc/sysutils/qlogtools: Makefile
pkgsrc/sysutils/qpasswd: Makefile
pkgsrc/sysutils/service-config: Makefile
pkgsrc/time/leapsunpack: Makefile
Log Message:
Retire 'djbware-errno-hack' and associated options.mk cleverness.
Instead:
1. Package makefiles including their own options.mk
2. Packages say "SUBST_CLASSES+=djberrno" to get the hack, if needed
3. Packages adjust SUBST_FILES.djberrno, if needed
Should fix bulk build failures due to multiple inclusions of options.mk
and/or incorrect definitions of DJB_ERRNO_HACK.
Approved during the freeze by wiz@.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/cdb/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/bglibs/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/libtai/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mail/dot-forward/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/ezmlm/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/mail/ezmlm-idx/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/fastforward/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/mailfront/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/mail/mess822/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/qconfirm/Makefile
cvs rdiff -u -r1.120 -r1.121 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/qmail-acceptutils/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/qmail-autoresponder/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/mail/qmail-conf/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mail/qmail-qfilter/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/qmail-rejectutils/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/qmailanalog/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/qtools/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/queue-fix/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/relay-ctrl/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/safecat/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/serialmail/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/math/djbfft/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/djbware.mk
cvs rdiff -u -r1.627 -r1.628 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.70 -r1.71 pkgsrc/net/djbdns/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/djbdnscurve6/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/publicfile/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/ucspi-ssl/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/ucspi-tcp/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/ucspi-tcp6/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/security/cvm/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/checkpassword/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/sysutils/daemontools/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/daemontools-encore/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/fdtools/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/memtester/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/qlogtools/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/qpasswd/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/service-config/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/time/leapsunpack/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/databases/cdb/Makefile
diff -u pkgsrc/databases/cdb/Makefile:1.25 pkgsrc/databases/cdb/Makefile:1.26
--- pkgsrc/databases/cdb/Makefile:1.25 Sun Jan 26 17:30:52 2020
+++ pkgsrc/databases/cdb/Makefile Thu Jun 25 05:42:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/01/26 17:30:52 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2020/06/25 05:42:36 schmonz Exp $
DISTNAME= cdb-0.75
CATEGORIES= databases
@@ -13,6 +13,8 @@ CONFLICTS+= tinycdb-[0-9]*
DJB_RESTRICTED= no
+SUBST_CLASSES+= djberrno
+
INSTALLATION_DIRS= bin include lib
do-install:
Index: pkgsrc/devel/bglibs/Makefile
diff -u pkgsrc/devel/bglibs/Makefile:1.37 pkgsrc/devel/bglibs/Makefile:1.38
--- pkgsrc/devel/bglibs/Makefile:1.37 Sun Mar 22 11:29:46 2020
+++ pkgsrc/devel/bglibs/Makefile Thu Jun 25 05:42:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/03/22 11:29:46 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2020/06/25 05:42:36 schmonz Exp $
#
DISTNAME= bglibs-2.04
@@ -18,7 +18,6 @@ USE_LIBTOOL= yes
DJB_RESTRICTED= NO
DJB_MAKE_TARGETS= NO
-DJB_ERRNO_HACK= NO
TEST_TARGET= selftests
DJB_CONFIG_CMDS= \
Index: pkgsrc/devel/libtai/Makefile
diff -u pkgsrc/devel/libtai/Makefile:1.20 pkgsrc/devel/libtai/Makefile:1.21
--- pkgsrc/devel/libtai/Makefile:1.20 Sat May 23 21:32:14 2020
+++ pkgsrc/devel/libtai/Makefile Thu Jun 25 05:42:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/05/23 21:32:14 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2020/06/25 05:42:36 schmonz Exp $
#
DISTNAME= libtai-0.60
@@ -14,11 +14,11 @@ LICENSE= public-domain
CONFLICTS= libowfat<0.32nb1
DJB_RESTRICTED= NO
-DJB_ERRNO_HACK= no
EGDIR= share/examples/${PKGBASE}
-SUBST_FILES.djbware+= leapsecs_read.c
+SUBST_CLASSES+= djberrno
+SUBST_FILES.djberrno+= leapsecs_read.c
SUBST_CLASSES+= paths
SUBST_STAGE.paths= do-configure
Index: pkgsrc/mail/dot-forward/Makefile
diff -u pkgsrc/mail/dot-forward/Makefile:1.28 pkgsrc/mail/dot-forward/Makefile:1.29
--- pkgsrc/mail/dot-forward/Makefile:1.28 Sun Jan 26 17:31:33 2020
+++ pkgsrc/mail/dot-forward/Makefile Thu Jun 25 05:42:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2020/01/26 17:31:33 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2020/06/25 05:42:38 schmonz Exp $
#
DISTNAME= dot-forward-0.71
@@ -19,6 +19,8 @@ DJB_RESTRICTED= no
INSTALLATION_DIRS= ${PKGMANDIR}
+SUBST_CLASSES+= djberrno
+
SUBST_CLASSES+= paths
SUBST_STAGE.paths= do-configure
SUBST_FILES.paths= hier.c
Index: pkgsrc/mail/ezmlm/Makefile
diff -u pkgsrc/mail/ezmlm/Makefile:1.27 pkgsrc/mail/ezmlm/Makefile:1.28
--- pkgsrc/mail/ezmlm/Makefile:1.27 Sun Jan 26 17:31:34 2020
+++ pkgsrc/mail/ezmlm/Makefile Thu Jun 25 05:42:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/01/26 17:31:34 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2020/06/25 05:42:38 schmonz Exp $
#
DISTNAME= ezmlm-0.53
@@ -20,7 +20,11 @@ DJB_CONFIG_CMDS= ${ECHO} ${DESTDIR:Q} >
DJB_BUILD_TARGETS= install
INSTALL_TARGET= setup
+SUBST_CLASSES+= djberrno
+
INSTALLATION_DIRS= bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat5
+.include "options.mk"
+
.include "../../mk/djbware.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/ezmlm-idx/Makefile
diff -u pkgsrc/mail/ezmlm-idx/Makefile:1.55 pkgsrc/mail/ezmlm-idx/Makefile:1.56
--- pkgsrc/mail/ezmlm-idx/Makefile:1.55 Tue Jun 2 08:24:14 2020
+++ pkgsrc/mail/ezmlm-idx/Makefile Thu Jun 25 05:42:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2020/06/02 08:24:14 adam Exp $
+# $NetBSD: Makefile,v 1.56 2020/06/25 05:42:38 schmonz Exp $
#
DISTNAME= ezmlm-idx-${IDXVERSION}
@@ -25,7 +25,6 @@ DJB_CONFIG_CMDS+= ${ECHO} ${DESTDIR:Q} >
${ECHO} ${EGDIR:Q} > conf-egdir; \
${ECHO} ${PKG_SYSCONFDIR:Q} > conf-etc; \
${ECHO} ${PREFIX:Q}/lib/ezmlm > conf-lib;
-DJB_ERRNO_HACK= no
LDFLAGS.Darwin+= -Wl,-U,_FATAL -Wl,-U,_USAGE
LDFLAGS.Linux+= -Wl,--export-dynamic
@@ -53,6 +52,8 @@ SPECIAL_PERMS+= ${PREFIX}/libexec/cgi-b
INSTALLATION_DIRS= bin lib libexec/cgi-bin ${PKGMANDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
INSTALLATION_DIRS+= share/doc/${PKGBASE} share/examples/${PKGBASE}
+.include "options.mk"
+
post-extract:
${GREP} -v '^#' < cf-files.mk | ${CUT} -f2 | ${SED} -e 's|^|share/examples/ezmlm-idx/|g' > ${WRKDIR}/PLIST.idxcf
Index: pkgsrc/mail/fastforward/Makefile
diff -u pkgsrc/mail/fastforward/Makefile:1.27 pkgsrc/mail/fastforward/Makefile:1.28
--- pkgsrc/mail/fastforward/Makefile:1.27 Sun Jan 26 17:31:34 2020
+++ pkgsrc/mail/fastforward/Makefile Thu Jun 25 05:42:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/01/26 17:31:34 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2020/06/25 05:42:39 schmonz Exp $
#
DISTNAME= fastforward-0.51
@@ -19,7 +19,8 @@ DJB_BUILD_TARGETS= install instcheck
DJB_RESTRICTED= no
-SUBST_FILES.djbware+= cdb_seek.c
+SUBST_CLASSES+= djberrno
+SUBST_FILES.djberrno+= cdb_seek.c
SUBST_CLASSES+= paths
SUBST_STAGE.paths= do-configure
Index: pkgsrc/mail/mailfront/Makefile
diff -u pkgsrc/mail/mailfront/Makefile:1.29 pkgsrc/mail/mailfront/Makefile:1.30
--- pkgsrc/mail/mailfront/Makefile:1.29 Sat May 23 21:32:15 2020
+++ pkgsrc/mail/mailfront/Makefile Thu Jun 25 05:42:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2020/05/23 21:32:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.30 2020/06/25 05:42:38 schmonz Exp $
#
DISTNAME= mailfront-2.22
@@ -15,7 +15,6 @@ DEPENDS+= daemontools-[0-9]*:../../sysu
DEPENDS+= qmail>=1.03nb8:../../mail/qmail
DJB_RESTRICTED= NO
-DJB_ERRNO_HACK= no
DJB_MAKE_TARGETS= NO
BUILD_TARGET= all
DJB_CONFIG_CMDS+= ${ECHO} ${PREFIX}/include > conf-include; \
Index: pkgsrc/mail/mess822/Makefile
diff -u pkgsrc/mail/mess822/Makefile:1.34 pkgsrc/mail/mess822/Makefile:1.35
--- pkgsrc/mail/mess822/Makefile:1.34 Sun Jan 26 17:31:35 2020
+++ pkgsrc/mail/mess822/Makefile Thu Jun 25 05:42:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2020/01/26 17:31:35 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2020/06/25 05:42:38 schmonz Exp $
#
DISTNAME= mess822-0.58
@@ -20,7 +20,8 @@ DJB_BUILD_TARGETS= install instcheck
AUTO_MKDIRS= yes
-SUBST_FILES.djbware+= cdb_seek.c
+SUBST_CLASSES+= djberrno
+SUBST_FILES.djberrno+= cdb_seek.c
SUBST_CLASSES+= paths
SUBST_STAGE.paths= do-configure
Index: pkgsrc/mail/qconfirm/Makefile
diff -u pkgsrc/mail/qconfirm/Makefile:1.2 pkgsrc/mail/qconfirm/Makefile:1.3
--- pkgsrc/mail/qconfirm/Makefile:1.2 Sat May 16 15:21:29 2020
+++ pkgsrc/mail/qconfirm/Makefile Thu Jun 25 05:42:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/16 15:21:29 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2020/06/25 05:42:39 schmonz Exp $
DISTNAME= qconfirm-0.14.3
CATEGORIES= mail
@@ -14,7 +14,6 @@ DEPENDS+= qmail-[0-9]*:../../mail/qmail
DJB_SLASHPACKAGE= yes
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
WRKSRC= ${WRKDIR}/mail/${DISTNAME}
Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.120 pkgsrc/mail/qmail/Makefile:1.121
--- pkgsrc/mail/qmail/Makefile:1.120 Sat May 23 20:50:02 2020
+++ pkgsrc/mail/qmail/Makefile Thu Jun 25 05:42:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2020/05/23 20:50:02 schmonz Exp $
+# $NetBSD: Makefile,v 1.121 2020/06/25 05:42:39 schmonz Exp $
#
DISTNAME= notqmail-1.08
@@ -36,7 +36,6 @@ DJB_CONFIG_CMDS+= ${ECHO} ${QMAIL_QMAIL_
DJB_CONFIG_CMDS+= ${ECHO} ${QMAIL_NOFILES_GROUP:Q} >> conf-groups;
DJB_BUILD_TARGETS= man
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
TEST_TARGET= test
#.include "../../devel/check/buildlink3.mk"
@@ -114,8 +113,6 @@ SUBST_STAGE.config= do-configure
SUBST_FILES.config= config-fast-pkgsrc-defaults.sh
SUBST_VARS.config= SORT MV CP PKG_SYSCONFDIR QMAIL_QUEUE_EXTRA
-SUBST_FILES.djbware+= cdb_seek.c dns.c
-
PKG_USERS_VARS+= QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER
PKG_USERS_VARS+= QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER
PKG_USERS_VARS+= QMAIL_REMOTE_USER QMAIL_SEND_USER
@@ -181,6 +178,8 @@ PATCH_DIST_CAT.${SPP_PATCH}= ${TAR} -C $
PATCH_DIST_STRIP.${SPP_PATCH}= -p1
LICENSE+= AND gnu-gpl-v2
+.include "options.mk"
+
post-extract:
for i in ${READMES}; do \
${CP} ${FILESDIR}/$$i ${WRKSRC} || ${TRUE}; \
Index: pkgsrc/mail/qmail-acceptutils/Makefile
diff -u pkgsrc/mail/qmail-acceptutils/Makefile:1.12 pkgsrc/mail/qmail-acceptutils/Makefile:1.13
--- pkgsrc/mail/qmail-acceptutils/Makefile:1.12 Sat May 16 15:22:20 2020
+++ pkgsrc/mail/qmail-acceptutils/Makefile Thu Jun 25 05:42:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/05/16 15:22:20 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/25 05:42:39 schmonz Exp $
DISTNAME= netqmail-1.06
PKGNAME= qmail-acceptutils-${ACPATCHVERSION}
@@ -21,7 +21,6 @@ DEPENDS+= ucspi-ssl-[0-9]*:../../net/uc
CONFLICTS+= qmail<=1.03nb32
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
BUILD_TARGET= acceptutils
USE_LANGUAGES= c c99
Index: pkgsrc/mail/qmail-autoresponder/Makefile
diff -u pkgsrc/mail/qmail-autoresponder/Makefile:1.6 pkgsrc/mail/qmail-autoresponder/Makefile:1.7
--- pkgsrc/mail/qmail-autoresponder/Makefile:1.6 Sat May 23 21:32:15 2020
+++ pkgsrc/mail/qmail-autoresponder/Makefile Thu Jun 25 05:42:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/05/23 21:32:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2020/06/25 05:42:37 schmonz Exp $
DISTNAME= qmail-autoresponder-2.0
CATEGORIES= mail
@@ -15,7 +15,6 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
INSTALL_ENV+= install_prefix=${DESTDIR:Q}
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
DJB_MAKE_TARGETS= no
BUILD_TARGET= all
Index: pkgsrc/mail/qmail-conf/Makefile
diff -u pkgsrc/mail/qmail-conf/Makefile:1.35 pkgsrc/mail/qmail-conf/Makefile:1.36
--- pkgsrc/mail/qmail-conf/Makefile:1.35 Sat May 23 21:32:15 2020
+++ pkgsrc/mail/qmail-conf/Makefile Thu Jun 25 05:42:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2020/05/23 21:32:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.36 2020/06/25 05:42:38 schmonz Exp $
#
DISTNAME= qmail-conf-0.60
@@ -16,10 +16,10 @@ DEPENDS+= daemontools>=0.70:../../sysut
DEPENDS+= qmail>=1.03nb7:../../mail/qmail
DJB_RESTRICTED= NO
-DJB_ERRNO_HACK= no
DJB_CONFIG_CMDS= ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp;
-SUBST_FILES.djbware+= ../djbdns-1.05/error.h
+SUBST_CLASSES+= djberrno
+SUBST_FILES.djberrno+= ../djbdns-1.05/error.h
.include "options.mk"
Index: pkgsrc/mail/qmail-qfilter/Makefile
diff -u pkgsrc/mail/qmail-qfilter/Makefile:1.28 pkgsrc/mail/qmail-qfilter/Makefile:1.29
--- pkgsrc/mail/qmail-qfilter/Makefile:1.28 Sat May 16 15:25:11 2020
+++ pkgsrc/mail/qmail-qfilter/Makefile Thu Jun 25 05:42:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2020/05/16 15:25:11 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2020/06/25 05:42:37 schmonz Exp $
#
DISTNAME= qmail-qfilter-2.1
@@ -28,7 +28,6 @@ INSTALL_ENV+= install_prefix=${DESTDIR:
BUILD_DEFS+= QMAILDIR
DJB_RESTRICTED= NO
-DJB_ERRNO_HACK= no
DJB_MAKE_TARGETS= NO
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/mail/qmail-rejectutils/Makefile
diff -u pkgsrc/mail/qmail-rejectutils/Makefile:1.7 pkgsrc/mail/qmail-rejectutils/Makefile:1.8
--- pkgsrc/mail/qmail-rejectutils/Makefile:1.7 Sat May 16 15:25:49 2020
+++ pkgsrc/mail/qmail-rejectutils/Makefile Thu Jun 25 05:42:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/05/16 15:25:49 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/06/25 05:42:38 schmonz Exp $
DISTNAME= netqmail-1.06
PKGNAME= qmail-rejectutils-${RJPATCHVERSION}
@@ -19,7 +19,6 @@ SITES.${RJPATCH}= ${HOMEPAGE}
CONFLICTS+= qmail<=1.03nb32
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
BUILD_TARGET= rejectutils
REJECTUTILS= qmail-qfilter-queue \
Index: pkgsrc/mail/qmailanalog/Makefile
diff -u pkgsrc/mail/qmailanalog/Makefile:1.17 pkgsrc/mail/qmailanalog/Makefile:1.18
--- pkgsrc/mail/qmailanalog/Makefile:1.17 Sun Jan 26 17:31:36 2020
+++ pkgsrc/mail/qmailanalog/Makefile Thu Jun 25 05:42:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/26 17:31:36 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2020/06/25 05:42:38 schmonz Exp $
#
DISTNAME= qmailanalog-0.70
@@ -13,5 +13,7 @@ COMMENT= Collection of tools to help an
DJB_RESTRICTED= YES
DJB_CONFIG_PREFIX= ${PREFIX}/qmailanalog
+SUBST_CLASSES+= djberrno
+
.include "../../mk/djbware.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/qtools/Makefile
diff -u pkgsrc/mail/qtools/Makefile:1.17 pkgsrc/mail/qtools/Makefile:1.18
--- pkgsrc/mail/qtools/Makefile:1.17 Mon Oct 8 12:19:29 2012
+++ pkgsrc/mail/qtools/Makefile Thu Jun 25 05:42:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 12:19:29 asau Exp $
+# $NetBSD: Makefile,v 1.18 2020/06/25 05:42:37 schmonz Exp $
#
DISTNAME= qtools-0.56
@@ -15,5 +15,7 @@ DEPENDS+= qmail>=1.03:../../mail/qmail
DJB_RESTRICTED= NO
DJB_CONFIG_CMDS= ${ECHO} ${LOCALBASE:Q} > ${WRKSRC}/conf-ezmlm
+SUBST_CLASSES+= djberrno
+
.include "../../mk/djbware.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/queue-fix/Makefile
diff -u pkgsrc/mail/queue-fix/Makefile:1.11 pkgsrc/mail/queue-fix/Makefile:1.12
--- pkgsrc/mail/queue-fix/Makefile:1.11 Thu May 23 19:23:07 2019
+++ pkgsrc/mail/queue-fix/Makefile Thu Jun 25 05:42:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/05/23 19:23:07 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/06/25 05:42:37 schmonz Exp $
#
DISTNAME= queue-fix-1.4
@@ -14,6 +14,8 @@ INSTALLATION_DIRS= bin
DJB_RESTRICTED= NO
+SUBST_CLASSES+= djberrno
+
SUBST_CLASSES+= groups
SUBST_STAGE.groups= do-configure
SUBST_FILES.groups= queue-fix.c
Index: pkgsrc/mail/relay-ctrl/Makefile
diff -u pkgsrc/mail/relay-ctrl/Makefile:1.9 pkgsrc/mail/relay-ctrl/Makefile:1.10
--- pkgsrc/mail/relay-ctrl/Makefile:1.9 Mon Apr 27 17:31:07 2020
+++ pkgsrc/mail/relay-ctrl/Makefile Thu Jun 25 05:42:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/04/27 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2020/06/25 05:42:39 schmonz Exp $
#
DISTNAME= relay-ctrl-3.2
@@ -11,7 +11,6 @@ COMMENT= Allows relaying via POP/IMAP-b
DJB_RESTRICTED= NO
DJB_MAKE_TARGETS= NO
-DJB_ERRNO_HACK= NO
DOCDIR= share/doc/${PKGBASE}
INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 ${DOCDIR}
Index: pkgsrc/mail/safecat/Makefile
diff -u pkgsrc/mail/safecat/Makefile:1.22 pkgsrc/mail/safecat/Makefile:1.23
--- pkgsrc/mail/safecat/Makefile:1.22 Mon Apr 27 17:37:37 2020
+++ pkgsrc/mail/safecat/Makefile Thu Jun 25 05:42:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/04/27 17:37:37 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2020/06/25 05:42:37 schmonz Exp $
#
DISTNAME= safecat-1.13
@@ -15,7 +15,6 @@ MAKE_JOBS_SAFE= no
DJB_RESTRICTED= NO
DJB_BUILD_TARGETS+= install instcheck
DJB_CONFIG_HOME= conf-root
-DJB_ERRNO_HACK= no
SUBST_CLASSES+= pkgmandir
SUBST_STAGE.pkgmandir= pre-configure
Index: pkgsrc/mail/serialmail/Makefile
diff -u pkgsrc/mail/serialmail/Makefile:1.12 pkgsrc/mail/serialmail/Makefile:1.13
--- pkgsrc/mail/serialmail/Makefile:1.12 Sun Jan 26 17:31:36 2020
+++ pkgsrc/mail/serialmail/Makefile Thu Jun 25 05:42:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/01/26 17:31:36 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/25 05:42:38 schmonz Exp $
#
DISTNAME= serialmail-0.75
@@ -18,7 +18,7 @@ INSTALLATION_DIRS= share/doc/${PKGBASE}
# provide compatibility symlinks. We also apply patches.
DJB_RESTRICTED= YES
-SUBST_FILES.djbware+= leapsecs_read.c
+SUBST_CLASSES+= djberrno
SUBST_CLASSES+= paths
SUBST_STAGE.paths= do-configure
Index: pkgsrc/math/djbfft/Makefile
diff -u pkgsrc/math/djbfft/Makefile:1.20 pkgsrc/math/djbfft/Makefile:1.21
--- pkgsrc/math/djbfft/Makefile:1.20 Sun Jan 26 17:31:38 2020
+++ pkgsrc/math/djbfft/Makefile Thu Jun 25 05:42:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/01/26 17:31:38 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2020/06/25 05:42:39 schmonz Exp $
DISTNAME= djbfft-0.76
CATEGORIES= math
@@ -12,7 +12,11 @@ LICENSE= public-domain
DJB_RESTRICTED= no
NOT_FOR_PLATFORM= IRIX-*-*
+SUBST_CLASSES+= djberrno
+
INSTALLATION_DIRS= include/djbfft lib
+.include "options.mk"
+
.include "../../mk/djbware.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mk/djbware.mk
diff -u pkgsrc/mk/djbware.mk:1.29 pkgsrc/mk/djbware.mk:1.30
--- pkgsrc/mk/djbware.mk:1.29 Sat May 2 11:49:40 2020
+++ pkgsrc/mk/djbware.mk Thu Jun 25 05:42:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: djbware.mk,v 1.29 2020/05/02 11:49:40 rillig Exp $
+# $NetBSD: djbware.mk,v 1.30 2020/06/25 05:42:36 schmonz Exp $
#
# Makefile fragment for packages with djb-style build machinery
#
@@ -29,7 +29,6 @@ DJB_RESTRICTED?= YES
DJB_MAKE_TARGETS?= YES
DJB_BUILD_TARGETS?= # empty
DJB_INSTALL_TARGETS?= # empty
-DJB_ERRNO_HACK?= YES
DJB_SLASHPACKAGE?= NO
.if !empty(DJB_SLASHPACKAGE:M[yY][eE][sS])
DJB_CONFIG_DIR?= ${WRKSRC}/src
@@ -83,30 +82,10 @@ do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} package/compile ${DJB_BUILD_ARGS}
.endif
-.if !empty(DJB_ERRNO_HACK:M[yY][eE][sS]) || !empty(DJB_ERRNO_HACK_FILES)
-PKG_SUPPORTED_OPTIONS+= djbware-errno-hack
-PKG_SUGGESTED_OPTIONS+= djbware-errno-hack
-
-. include "bsd.fast.prefs.mk"
-
-. if exists(${PKGDIR}/options.mk)
-. include "${PKGDIR}/options.mk"
-. else
-# Note: This expression is the same as ${PKGBASE}, but the latter is
-# not defined yet, so we cannot use it here.
-PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
-. include "bsd.options.mk"
-. endif
-
-. if !empty(PKG_OPTIONS:Mdjbware-errno-hack) || !empty(DJB_ERRNO_HACK_FILES)
-SUBST_CLASSES+= djbware
-SUBST_STAGE.djbware= do-configure
-SUBST_FILES.djbware+= ${DJB_ERRNO_HACK_FILES:Uerror.h}
-SUBST_SED.djbware= -e 's|^extern\ int\ errno\;|\#include \<errno.h\>|'
-SUBST_MESSAGE.djbware= Correcting definition of errno.
-. endif
-.else
-. sinclude "${PKGDIR}/options.mk"
-.endif
+# Set SUBST_CLASSES+=djberrno for packages that need this fix
+SUBST_STAGE.djberrno= do-configure
+SUBST_FILES.djberrno?= error.h
+SUBST_SED.djberrno= -e 's|^extern\ int\ errno\;|\#include \<errno.h\>|'
+SUBST_MESSAGE.djberrno= Correcting definition of errno.
.endif # DJBWARE_MK
Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.627 pkgsrc/mk/defaults/options.description:1.628
--- pkgsrc/mk/defaults/options.description:1.627 Wed Jun 24 13:29:23 2020
+++ pkgsrc/mk/defaults/options.description Thu Jun 25 05:42:36 2020
@@ -140,7 +140,6 @@ djbdns-tinydns64 Patch to fix tinydns-da
djbfft-pentium Optimize for Pentium{,MMX} processors.
djbfft-ppro Optimize for Pentium{Pro,II,III} processors.
djbfft-sparc Optimize for UltraSPARC-{I,II} processors.
-djbware-errno-hack Patch to #include <errno.h> for correctness.
djvu Enable DjVuLibRe support.
dkim-milter-arlib ar(3) support for dkim-milter.
dkim-stats dkim-stats(8) support for dkim-milter.
Index: pkgsrc/net/djbdns/Makefile
diff -u pkgsrc/net/djbdns/Makefile:1.70 pkgsrc/net/djbdns/Makefile:1.71
--- pkgsrc/net/djbdns/Makefile:1.70 Sun Jan 26 17:31:49 2020
+++ pkgsrc/net/djbdns/Makefile Thu Jun 25 05:42:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2020/01/26 17:31:49 rillig Exp $
+# $NetBSD: Makefile,v 1.71 2020/06/25 05:42:36 schmonz Exp $
DISTNAME= djbdns-1.05
PKGREVISION= 14
@@ -18,6 +18,8 @@ CONFLICTS+= djbdnscurve6-[0-9]*
DJB_RESTRICTED= no
+SUBST_CLASSES+= djberrno
+
SUBST_CLASSES+= etc
SUBST_STAGE.etc= do-configure
SUBST_FILES.etc= dns_rcrw.c
@@ -32,6 +34,8 @@ BUILD_DEFS+= PKG_SYSCONFBASE
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/${PKGBASE}
+.include "options.mk"
+
post-install:
cd ${WRKDIR}/${PKGBASE}-man; for i in 1 5 8; do \
for j in *.$$i; do ${INSTALL_MAN} $$j \
Index: pkgsrc/net/djbdnscurve6/Makefile
diff -u pkgsrc/net/djbdnscurve6/Makefile:1.13 pkgsrc/net/djbdnscurve6/Makefile:1.14
--- pkgsrc/net/djbdnscurve6/Makefile:1.13 Mon Apr 27 05:36:56 2020
+++ pkgsrc/net/djbdnscurve6/Makefile Thu Jun 25 05:42:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/04/27 05:36:56 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2020/06/25 05:42:36 schmonz Exp $
DISTNAME= djbdnscurve6-36b
CATEGORIES= net
@@ -15,7 +15,6 @@ CONFLICTS+= djbdns-[0-9]*
WRKSRC= ${WRKDIR}/net/${PKGBASE}/${DISTNAME}
DJB_SLASHPACKAGE= yes
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
DJB_CONFIG_DIR= ${WRKSRC}
Index: pkgsrc/net/publicfile/Makefile
diff -u pkgsrc/net/publicfile/Makefile:1.17 pkgsrc/net/publicfile/Makefile:1.18
--- pkgsrc/net/publicfile/Makefile:1.17 Sat May 2 13:44:55 2020
+++ pkgsrc/net/publicfile/Makefile Thu Jun 25 05:42:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/05/02 13:44:55 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2020/06/25 05:42:36 schmonz Exp $
#
DISTNAME= publicfile-0.52
@@ -15,5 +15,9 @@ DEPENDS+= daemontools-[0-9]*:../../sysu
DJB_RESTRICTED= YES
DJB_CONFIG_PREFIX= ${PREFIX}/publicfile
+SUBST_CLASSES+= djberrno
+
+.include "options.mk"
+
.include "../../mk/djbware.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/ucspi-ssl/Makefile
diff -u pkgsrc/net/ucspi-ssl/Makefile:1.45 pkgsrc/net/ucspi-ssl/Makefile:1.46
--- pkgsrc/net/ucspi-ssl/Makefile:1.45 Mon Mar 30 08:04:18 2020
+++ pkgsrc/net/ucspi-ssl/Makefile Thu Jun 25 05:42:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2020/03/30 08:04:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.46 2020/06/25 05:42:37 schmonz Exp $
#
DISTNAME= ucspi-ssl-0.11.4
@@ -14,7 +14,6 @@ COMMENT= Command-line tools for SSL cli
WRKSRC= ${WRKDIR}/host/superscript.com/net/${DISTNAME}
DJB_SLASHPACKAGE= YES
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
SSL_SCRIPTS= https@ sslcat sslconnect
SSL_PROGRAMS= sslclient sslserver
@@ -46,6 +45,8 @@ DEFAULT_MEDIUM_CIPHERS= aNULL:-aNULL:ALL
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 share/doc/${PKGBASE} ${EGDIR}
+.include "options.mk"
+
do-test:
cd ${WRKSRC}; \
./package/rts
Index: pkgsrc/net/ucspi-tcp/Makefile
diff -u pkgsrc/net/ucspi-tcp/Makefile:1.45 pkgsrc/net/ucspi-tcp/Makefile:1.46
--- pkgsrc/net/ucspi-tcp/Makefile:1.45 Sun Jan 26 17:31:57 2020
+++ pkgsrc/net/ucspi-tcp/Makefile Thu Jun 25 05:42:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2020/01/26 17:31:57 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2020/06/25 05:42:37 schmonz Exp $
DISTNAME= ucspi-tcp-0.88
PKGREVISION= 6
@@ -22,6 +22,8 @@ CONFLICTS+= ucspi-tcp6-[0-9]*
DJB_RESTRICTED= no
+SUBST_CLASSES+= djberrno
+
SUBST_CLASSES+= etc
SUBST_STAGE.etc= do-configure
SUBST_FILES.etc= dns_rcrw.c
@@ -32,6 +34,8 @@ BUILD_DEFS+= PKG_SYSCONFBASE
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+.include "options.mk"
+
post-install:
cd ${WRKDIR}/${PKGNAME_NOREV}-man; for i in 1; do \
for j in *.$$i; do ${INSTALL_MAN} $$j \
Index: pkgsrc/net/ucspi-tcp6/Makefile
diff -u pkgsrc/net/ucspi-tcp6/Makefile:1.23 pkgsrc/net/ucspi-tcp6/Makefile:1.24
--- pkgsrc/net/ucspi-tcp6/Makefile:1.23 Sat Apr 25 20:25:32 2020
+++ pkgsrc/net/ucspi-tcp6/Makefile Thu Jun 25 05:42:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/04/25 20:25:32 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2020/06/25 05:42:36 schmonz Exp $
DISTNAME= ucspi-tcp6-1.11.4
CATEGORIES= net
@@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/net/${PKGBASE}/${DIS
DJB_SLASHPACKAGE= yes
DJB_RESTRICTED= no
DJB_CONFIG_DIR= ${WRKSRC}
-DJB_ERRNO_HACK= no
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
Index: pkgsrc/security/cvm/Makefile
diff -u pkgsrc/security/cvm/Makefile:1.26 pkgsrc/security/cvm/Makefile:1.27
--- pkgsrc/security/cvm/Makefile:1.26 Sat Mar 28 19:43:31 2020
+++ pkgsrc/security/cvm/Makefile Thu Jun 25 05:42:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/03/28 19:43:31 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2020/06/25 05:42:37 schmonz Exp $
#
DISTNAME= cvm-0.97
@@ -16,7 +16,6 @@ MAKE_JOBS_SAFE= no
DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
DJB_RESTRICTED= NO
-DJB_ERRNO_HACK= NO
DJB_MAKE_TARGETS= NO
INSTALL_ENV+= install_prefix=${DESTDIR:Q}
Index: pkgsrc/sysutils/checkpassword/Makefile
diff -u pkgsrc/sysutils/checkpassword/Makefile:1.21 pkgsrc/sysutils/checkpassword/Makefile:1.22
--- pkgsrc/sysutils/checkpassword/Makefile:1.21 Sun Jan 26 17:32:08 2020
+++ pkgsrc/sysutils/checkpassword/Makefile Thu Jun 25 05:42:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/01/26 17:32:08 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2020/06/25 05:42:40 schmonz Exp $
#
DISTNAME= checkpassword-0.90
@@ -13,6 +13,8 @@ LICENSE= public-domain
DJB_RESTRICTED= no
+SUBST_CLASSES+= djberrno
+
CHECKPASSWORD_BIN= bin/checkpassword
INSTALLATION_DIRS= bin
Index: pkgsrc/sysutils/daemontools/Makefile
diff -u pkgsrc/sysutils/daemontools/Makefile:1.43 pkgsrc/sysutils/daemontools/Makefile:1.44
--- pkgsrc/sysutils/daemontools/Makefile:1.43 Sat May 23 21:32:15 2020
+++ pkgsrc/sysutils/daemontools/Makefile Thu Jun 25 05:42:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/05/23 21:32:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.44 2020/06/25 05:42:39 schmonz Exp $
DISTNAME= daemontools-0.76
PKGREVISION= 3
@@ -17,7 +17,6 @@ SITES.${MANPAGES}= http://smarden.org/pa
CONFLICTS+= daemontools-encore-[0-9]*
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
WRKSRC= ${WRKDIR}/admin/${PKGNAME_NOREV}
DJB_SLASHPACKAGE= YES
@@ -28,7 +27,8 @@ USE_TOOLS+= file
INSTALLATION_DIRS= bin man ${PKGMANDIR}/man8
-SUBST_FILES.djbware+= src/error.h
+SUBST_CLASSES+= djberrno
+SUBST_FILES.djberrno+= src/error.h
SUBST_CLASSES+= paths
SUBST_STAGE.paths= do-configure
Index: pkgsrc/sysutils/daemontools-encore/Makefile
diff -u pkgsrc/sysutils/daemontools-encore/Makefile:1.4 pkgsrc/sysutils/daemontools-encore/Makefile:1.5
--- pkgsrc/sysutils/daemontools-encore/Makefile:1.4 Tue Apr 28 04:22:44 2020
+++ pkgsrc/sysutils/daemontools-encore/Makefile Thu Jun 25 05:42:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/04/28 04:22:44 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/06/25 05:42:40 schmonz Exp $
DISTNAME= daemontools-encore-1.11
PKGREVISION= 2
@@ -13,7 +13,6 @@ LICENSE= mit
CONFLICTS+= daemontools-[0-9]*
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
MAKE_ENV+= PKGSRC_SHELL=${TOOLS_PLATFORM.sh}
INSTALL_TARGET= install
Index: pkgsrc/sysutils/fdtools/Makefile
diff -u pkgsrc/sysutils/fdtools/Makefile:1.5 pkgsrc/sysutils/fdtools/Makefile:1.6
--- pkgsrc/sysutils/fdtools/Makefile:1.5 Fri May 1 20:44:52 2020
+++ pkgsrc/sysutils/fdtools/Makefile Thu Jun 25 05:42:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/05/01 20:44:52 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/06/25 05:42:40 schmonz Exp $
DISTNAME= fdtools-2015.03.28
PKGREVISION= 2
@@ -12,7 +12,6 @@ COMMENT= Manipulate file descriptor pro
LICENSE= gnu-gpl-v2
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
WRKSRC= ${WRKDIR}/misc/${PKGNAME_NOREV}
DJB_SLASHPACKAGE= YES
Index: pkgsrc/sysutils/memtester/Makefile
diff -u pkgsrc/sysutils/memtester/Makefile:1.25 pkgsrc/sysutils/memtester/Makefile:1.26
--- pkgsrc/sysutils/memtester/Makefile:1.25 Mon Apr 27 04:11:26 2020
+++ pkgsrc/sysutils/memtester/Makefile Thu Jun 25 05:42:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/04/27 04:11:26 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2020/06/25 05:42:40 schmonz Exp $
#
DISTNAME= memtester-4.3.0
@@ -14,7 +14,6 @@ NOT_FOR_PLATFORM= Interix-*-* # no m[un]
DJB_RESTRICTED= NO
DJB_MAKE_TARGETS= NO
-DJB_ERRNO_HACK= NO
INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 share/doc/memtester
Index: pkgsrc/sysutils/qlogtools/Makefile
diff -u pkgsrc/sysutils/qlogtools/Makefile:1.12 pkgsrc/sysutils/qlogtools/Makefile:1.13
--- pkgsrc/sysutils/qlogtools/Makefile:1.12 Sat May 2 11:49:40 2020
+++ pkgsrc/sysutils/qlogtools/Makefile Thu Jun 25 05:42:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/05/02 11:49:40 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/25 05:42:40 schmonz Exp $
#
DISTNAME= qlogtools-3.1
@@ -11,7 +11,9 @@ COMMENT= Tools useful in analyzing logs
DJB_RESTRICTED= NO
DJB_MAKE_TARGETS= NO
-DJB_ERRNO_HACK_FILES= qfilelog.c
+
+SUBST_CLASSES+= djberrno
+SUBST_FILES.djberrno= qfilelog.c
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
Index: pkgsrc/sysutils/qpasswd/Makefile
diff -u pkgsrc/sysutils/qpasswd/Makefile:1.2 pkgsrc/sysutils/qpasswd/Makefile:1.3
--- pkgsrc/sysutils/qpasswd/Makefile:1.2 Sat Dec 15 16:51:36 2018
+++ pkgsrc/sysutils/qpasswd/Makefile Thu Jun 25 05:42:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/12/15 16:51:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2020/06/25 05:42:40 schmonz Exp $
DISTNAME= qpasswd-0.5
CATEGORIES= sysutils
@@ -10,6 +10,8 @@ HOMEPAGE= https://mcmilk.de/projects/qp
COMMENT= Password-checking tools for many authentication schemes
#LICENSE= # TODO: (see mk/license.mk)
+SUBST_CLASSES+= djberrno
+
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-build
SUBST_FILES.paths= man/checkqpasswd.8 man/qpasswd.5
Index: pkgsrc/sysutils/service-config/Makefile
diff -u pkgsrc/sysutils/service-config/Makefile:1.13 pkgsrc/sysutils/service-config/Makefile:1.14
--- pkgsrc/sysutils/service-config/Makefile:1.13 Mon Sep 4 18:01:01 2017
+++ pkgsrc/sysutils/service-config/Makefile Thu Jun 25 05:42:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/09/04 18:01:01 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2020/06/25 05:42:39 schmonz Exp $
#
DISTNAME= service-config-0.51
@@ -14,6 +14,8 @@ DEPENDS+= daemontools-[0-9]*:../../sysu
# Possibly inherited DJB-style distribution terms
DJB_RESTRICTED= YES
+SUBST_CLASSES+= djberrno
+
INSTALLATION_DIRS= bin
do-install:
Index: pkgsrc/time/leapsunpack/Makefile
diff -u pkgsrc/time/leapsunpack/Makefile:1.7 pkgsrc/time/leapsunpack/Makefile:1.8
--- pkgsrc/time/leapsunpack/Makefile:1.7 Thu May 23 19:23:18 2019
+++ pkgsrc/time/leapsunpack/Makefile Thu Jun 25 05:42:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/05/23 19:23:18 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/06/25 05:42:39 schmonz Exp $
#
DISTNAME= leapsunpack-0.05
@@ -15,6 +15,8 @@ DJB_RESTRICTED= no
LDFLAGS.SunOS+= -lsocket -lnsl
+SUBST_CLASSES+= djberrno
+
SUBST_CLASSES+= files
SUBST_STAGE.files= do-configure
SUBST_FILES.files= leapsinstall.sh
Home |
Main Index |
Thread Index |
Old Index