Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Retire 'djbware-errno-hack' and associated options.mk ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/edb830f3c49d
branches: trunk
changeset: 434878:edb830f3c49d
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Thu Jun 25 05:42:36 2020 +0000
description:
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@.
diffstat:
databases/cdb/Makefile | 4 +++-
devel/bglibs/Makefile | 3 +--
devel/libtai/Makefile | 6 +++---
mail/dot-forward/Makefile | 4 +++-
mail/ezmlm-idx/Makefile | 5 +++--
mail/ezmlm/Makefile | 6 +++++-
mail/fastforward/Makefile | 5 +++--
mail/mailfront/Makefile | 3 +--
mail/mess822/Makefile | 5 +++--
mail/qconfirm/Makefile | 3 +--
mail/qmail-acceptutils/Makefile | 3 +--
mail/qmail-autoresponder/Makefile | 3 +--
mail/qmail-conf/Makefile | 6 +++---
mail/qmail-qfilter/Makefile | 3 +--
mail/qmail-rejectutils/Makefile | 3 +--
mail/qmail/Makefile | 7 +++----
mail/qmailanalog/Makefile | 4 +++-
mail/qtools/Makefile | 4 +++-
mail/queue-fix/Makefile | 4 +++-
mail/relay-ctrl/Makefile | 3 +--
mail/safecat/Makefile | 3 +--
mail/serialmail/Makefile | 4 ++--
math/djbfft/Makefile | 6 +++++-
mk/defaults/options.description | 1 -
mk/djbware.mk | 33 ++++++---------------------------
net/djbdns/Makefile | 6 +++++-
net/djbdnscurve6/Makefile | 3 +--
net/publicfile/Makefile | 6 +++++-
net/ucspi-ssl/Makefile | 5 +++--
net/ucspi-tcp/Makefile | 6 +++++-
net/ucspi-tcp6/Makefile | 3 +--
security/cvm/Makefile | 3 +--
sysutils/checkpassword/Makefile | 4 +++-
sysutils/daemontools-encore/Makefile | 3 +--
sysutils/daemontools/Makefile | 6 +++---
sysutils/fdtools/Makefile | 3 +--
sysutils/memtester/Makefile | 3 +--
sysutils/qlogtools/Makefile | 6 ++++--
sysutils/qpasswd/Makefile | 4 +++-
sysutils/service-config/Makefile | 4 +++-
time/leapsunpack/Makefile | 4 +++-
41 files changed, 103 insertions(+), 97 deletions(-)
diffs (truncated from 829 to 300 lines):
diff -r 8622470235ec -r edb830f3c49d databases/cdb/Makefile
--- a/databases/cdb/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/databases/cdb/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
DJB_RESTRICTED= no
+SUBST_CLASSES+= djberrno
+
INSTALLATION_DIRS= bin include lib
do-install:
diff -r 8622470235ec -r edb830f3c49d devel/bglibs/Makefile
--- a/devel/bglibs/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/devel/bglibs/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
DJB_RESTRICTED= NO
DJB_MAKE_TARGETS= NO
-DJB_ERRNO_HACK= NO
TEST_TARGET= selftests
DJB_CONFIG_CMDS= \
diff -r 8622470235ec -r edb830f3c49d devel/libtai/Makefile
--- a/devel/libtai/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/devel/libtai/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
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
diff -r 8622470235ec -r edb830f3c49d mail/dot-forward/Makefile
--- a/mail/dot-forward/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/dot-forward/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
INSTALLATION_DIRS= ${PKGMANDIR}
+SUBST_CLASSES+= djberrno
+
SUBST_CLASSES+= paths
SUBST_STAGE.paths= do-configure
SUBST_FILES.paths= hier.c
diff -r 8622470235ec -r edb830f3c49d mail/ezmlm-idx/Makefile
--- a/mail/ezmlm-idx/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/ezmlm-idx/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
${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 @@
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
diff -r 8622470235ec -r edb830f3c49d mail/ezmlm/Makefile
--- a/mail/ezmlm/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/ezmlm/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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_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"
diff -r 8622470235ec -r edb830f3c49d mail/fastforward/Makefile
--- a/mail/fastforward/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/fastforward/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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_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
diff -r 8622470235ec -r edb830f3c49d mail/mailfront/Makefile
--- a/mail/mailfront/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/mailfront/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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+= 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; \
diff -r 8622470235ec -r edb830f3c49d mail/mess822/Makefile
--- a/mail/mess822/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/mess822/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
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
diff -r 8622470235ec -r edb830f3c49d mail/qconfirm/Makefile
--- a/mail/qconfirm/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/qconfirm/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
DJB_SLASHPACKAGE= yes
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
WRKSRC= ${WRKDIR}/mail/${DISTNAME}
diff -r 8622470235ec -r edb830f3c49d mail/qmail-acceptutils/Makefile
--- a/mail/qmail-acceptutils/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/qmail-acceptutils/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
CONFLICTS+= qmail<=1.03nb32
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
BUILD_TARGET= acceptutils
USE_LANGUAGES= c c99
diff -r 8622470235ec -r edb830f3c49d mail/qmail-autoresponder/Makefile
--- a/mail/qmail-autoresponder/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/qmail-autoresponder/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
INSTALL_ENV+= install_prefix=${DESTDIR:Q}
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
DJB_MAKE_TARGETS= no
BUILD_TARGET= all
diff -r 8622470235ec -r edb830f3c49d mail/qmail-conf/Makefile
--- a/mail/qmail-conf/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/qmail-conf/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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+= 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"
diff -r 8622470235ec -r edb830f3c49d mail/qmail-qfilter/Makefile
--- a/mail/qmail-qfilter/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/qmail-qfilter/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
BUILD_DEFS+= QMAILDIR
DJB_RESTRICTED= NO
-DJB_ERRNO_HACK= no
DJB_MAKE_TARGETS= NO
.include "../../mk/bsd.prefs.mk"
diff -r 8622470235ec -r edb830f3c49d mail/qmail-rejectutils/Makefile
--- a/mail/qmail-rejectutils/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/qmail-rejectutils/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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 @@
CONFLICTS+= qmail<=1.03nb32
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
BUILD_TARGET= rejectutils
REJECTUTILS= qmail-qfilter-queue \
diff -r 8622470235ec -r edb830f3c49d mail/qmail/Makefile
--- a/mail/qmail/Makefile Wed Jun 24 22:58:07 2020 +0000
+++ b/mail/qmail/Makefile Thu Jun 25 05:42:36 2020 +0000
@@ -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_NOFILES_GROUP:Q} >> conf-groups;
DJB_BUILD_TARGETS= man
DJB_RESTRICTED= no
-DJB_ERRNO_HACK= no
Home |
Main Index |
Thread Index |
Old Index