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 May 22 04:51:30 UTC 2025

Modified Files:
        pkgsrc/databases/cdb: Makefile
        pkgsrc/devel/libtai: Makefile
        pkgsrc/mail/dot-forward: Makefile
        pkgsrc/mail/ezmlm: Makefile
        pkgsrc/mail/fastforward: Makefile
        pkgsrc/mail/mess822: Makefile
        pkgsrc/mail/qmail-conf: Makefile
        pkgsrc/mail/qmailanalog: Makefile
        pkgsrc/mail/qtools: Makefile
        pkgsrc/mail/queue-fix: Makefile
        pkgsrc/mail/serialmail: Makefile
        pkgsrc/math/djbfft: Makefile
        pkgsrc/net/djbdns: Makefile
        pkgsrc/net/publicfile: Makefile
        pkgsrc/net/tinydyndns: Makefile
        pkgsrc/net/ucspi-tcp: Makefile
        pkgsrc/sysutils/checkpassword: Makefile
        pkgsrc/sysutils/daemontools: Makefile
        pkgsrc/sysutils/qlogtools: Makefile
        pkgsrc/sysutils/qpasswd: Makefile
        pkgsrc/sysutils/service-config: Makefile
        pkgsrc/time/leapsunpack: Makefile
        pkgsrc/www/superscript-shttpd: Makefile

Log Message:
djbware: reduce lint, mostly by replacing SUBST_CLASSES+=djberrno with
DJB_ERRNO_FIXUP.

While here, sprinkle FORCE_C_STD (mostly c89) where it doesn't break the
build. Tested on NetBSD and macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/cdb/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/libtai/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/dot-forward/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mail/ezmlm/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mail/fastforward/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/mail/mess822/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/mail/qmail-conf/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/qmailanalog/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mail/qtools/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/queue-fix/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/serialmail/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/math/djbfft/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/net/djbdns/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/publicfile/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/tinydyndns/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/net/ucspi-tcp/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/sysutils/checkpassword/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/sysutils/daemontools/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/qlogtools/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/qpasswd/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/service-config/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/time/leapsunpack/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/superscript-shttpd/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.28 pkgsrc/databases/cdb/Makefile:1.29
--- pkgsrc/databases/cdb/Makefile:1.28  Sat Dec 23 02:43:37 2023
+++ pkgsrc/databases/cdb/Makefile       Thu May 22 04:51:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2023/12/23 02:43:37 zafer Exp $
+# $NetBSD: Makefile,v 1.29 2025/05/22 04:51:28 schmonz Exp $
 
 DISTNAME=              cdb-0.75
 CATEGORIES=            databases
@@ -11,7 +11,9 @@ LICENSE=              public-domain
 
 CONFLICTS+=            tinycdb-[0-9]*
 
-SUBST_CLASSES+=                djberrno
+FORCE_C_STD=           c99
+
+DJB_ERRNO_FIXUP=       error.h
 
 INSTALLATION_DIRS=     bin include lib
 

Index: pkgsrc/devel/libtai/Makefile
diff -u pkgsrc/devel/libtai/Makefile:1.23 pkgsrc/devel/libtai/Makefile:1.24
--- pkgsrc/devel/libtai/Makefile:1.23   Thu Nov 19 09:35:38 2020
+++ pkgsrc/devel/libtai/Makefile        Thu May 22 04:51:27 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/11/19 09:35:38 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.24 2025/05/22 04:51:27 schmonz Exp $
 
 DISTNAME=              libtai-0.60
 PKGREVISION=           8
@@ -15,8 +14,7 @@ CONFLICTS=            libowfat<0.32nb1
 
 EGDIR=                 share/examples/${PKGBASE}
 
-SUBST_CLASSES+=                djberrno
-SUBST_FILES.djberrno=  leapsecs_read.c
+DJB_ERRNO_FIXUP=       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.30 pkgsrc/mail/dot-forward/Makefile:1.31
--- pkgsrc/mail/dot-forward/Makefile:1.30       Thu Nov 19 09:35:42 2020
+++ pkgsrc/mail/dot-forward/Makefile    Thu May 22 04:51:29 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2020/11/19 09:35:42 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.31 2025/05/22 04:51:29 schmonz Exp $
 
 DISTNAME=              dot-forward-0.71
 PKGREVISION=           3
@@ -14,11 +13,10 @@ LICENSE=            public-domain
 DEPENDS+=              qmail>=1.03nb7:../../mail/qmail
 
 DJB_BUILD_TARGETS=     install instcheck
+DJB_ERRNO_FIXUP=       error.h
 
 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.29 pkgsrc/mail/ezmlm/Makefile:1.30
--- pkgsrc/mail/ezmlm/Makefile:1.29     Thu Nov 19 09:35:41 2020
+++ pkgsrc/mail/ezmlm/Makefile  Thu May 22 04:51:29 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2020/11/19 09:35:41 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.30 2025/05/22 04:51:29 schmonz Exp $
 
 DISTNAME=              ezmlm-0.53
 PKGREVISION=           2
@@ -15,12 +14,11 @@ CONFLICTS=          ezmlm-idx-[0-9]*
 
 DEPENDS+=              qmail>=1.03:../../mail/qmail
 
-DJB_CONFIG_CMDS=       ${ECHO} ${DESTDIR:Q} > conf-destdir
+DJB_CONFIG_CMDS=       ${ECHO} ${DESTDIR:Q} > conf-destdir;
+DJB_ERRNO_FIXUP=       error.h
 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"

Index: pkgsrc/mail/fastforward/Makefile
diff -u pkgsrc/mail/fastforward/Makefile:1.31 pkgsrc/mail/fastforward/Makefile:1.32
--- pkgsrc/mail/fastforward/Makefile:1.31       Thu Apr  3 01:11:10 2025
+++ pkgsrc/mail/fastforward/Makefile    Thu May 22 04:51:29 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2025/04/03 01:11:10 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.32 2025/05/22 04:51:29 schmonz Exp $
 
 DISTNAME=              fastforward-0.51
 PKGREVISION=           3
@@ -16,9 +15,7 @@ DEPENDS+=             qmail>=1.03nb7:../../mail/qma
 CONFLICTS+=            esmtp>=1.2 postfix-[0-9]* sendmail-[0-9]*
 
 DJB_BUILD_TARGETS=     install instcheck
-
-SUBST_CLASSES+=                djberrno
-SUBST_FILES.djberrno=  cdb_seek.c error.h
+DJB_ERRNO_FIXUP=       cdb_seek.c error.h
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure

Index: pkgsrc/mail/mess822/Makefile
diff -u pkgsrc/mail/mess822/Makefile:1.37 pkgsrc/mail/mess822/Makefile:1.38
--- pkgsrc/mail/mess822/Makefile:1.37   Thu Nov 19 09:35:41 2020
+++ pkgsrc/mail/mess822/Makefile        Thu May 22 04:51:28 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/11/19 09:35:41 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.38 2025/05/22 04:51:28 schmonz Exp $
 
 DISTNAME=              mess822-0.58
 PKGREVISION=           8
@@ -15,12 +14,9 @@ DEPENDS+=            libtai>=0.60nb5:../../devel/l
 DEPENDS+=              qmail>=1.03nb7:../../mail/qmail
 
 DJB_BUILD_TARGETS=     install instcheck
-
+DJB_ERRNO_FIXUP=       cdb_seek.c error.h
 AUTO_MKDIRS=           yes
 
-SUBST_CLASSES+=                djberrno
-SUBST_FILES.djberrno=  cdb_seek.c error.h
-
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
 SUBST_FILES.paths=     hier.c

Index: pkgsrc/mail/qmail-conf/Makefile
diff -u pkgsrc/mail/qmail-conf/Makefile:1.40 pkgsrc/mail/qmail-conf/Makefile:1.41
--- pkgsrc/mail/qmail-conf/Makefile:1.40        Thu Dec 28 23:10:09 2023
+++ pkgsrc/mail/qmail-conf/Makefile     Thu May 22 04:51:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2023/12/28 23:10:09 zafer Exp $
+# $NetBSD: Makefile,v 1.41 2025/05/22 04:51:29 schmonz Exp $
 
 DISTNAME=              qmail-conf-0.60
 PKGREVISION=           6
@@ -16,10 +16,10 @@ DEPENDS+=           daemontools>=0.70:../../sysut
 DEPENDS+=              qmail>=1.03nb7:../../mail/qmail
 DEPENDS+=              {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp6
 
-DJB_CONFIG_CMDS=       ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp;
+FORCE_C_STD=           c89
 
-SUBST_CLASSES+=                djberrno
-SUBST_FILES.djberrno=  ../djbdns-1.05/error.h
+DJB_CONFIG_CMDS=       ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp;
+DJB_ERRNO_FIXUP=       ../djbdns-1.05/error.h
 
 .include "options.mk"
 

Index: pkgsrc/mail/qmailanalog/Makefile
diff -u pkgsrc/mail/qmailanalog/Makefile:1.21 pkgsrc/mail/qmailanalog/Makefile:1.22
--- pkgsrc/mail/qmailanalog/Makefile:1.21       Mon Nov 30 13:42:04 2020
+++ pkgsrc/mail/qmailanalog/Makefile    Thu May 22 04:51:29 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/11/30 13:42:04 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.22 2025/05/22 04:51:29 schmonz Exp $
 
 DISTNAME=              qmailanalog-0.70
 PKGREVISION=           2
@@ -11,7 +10,7 @@ HOMEPAGE=             https://cr.yp.to/qmailanalog.
 COMMENT=               Collection of tools to help analyze qmail's activity
 LICENSE=               djb-nonlicense
 
-SUBST_CLASSES+=                djberrno
+DJB_ERRNO_FIXUP=       error.h
 
 SUBST_CLASSES+=                pkgmandir
 SUBST_STAGE.pkgmandir= pre-configure

Index: pkgsrc/mail/qtools/Makefile
diff -u pkgsrc/mail/qtools/Makefile:1.20 pkgsrc/mail/qtools/Makefile:1.21
--- pkgsrc/mail/qtools/Makefile:1.20    Thu Nov 19 09:35:40 2020
+++ pkgsrc/mail/qtools/Makefile Thu May 22 04:51:28 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/11/19 09:35:40 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.21 2025/05/22 04:51:28 schmonz Exp $
 
 DISTNAME=              qtools-0.56
 PKGREVISION=           1
@@ -13,9 +12,10 @@ COMMENT=             Utilities for filtering via .q
 DEPENDS+=              {ezmlm>=0.53,ezmlm-idx-[0-9]*}:../../mail/ezmlm
 DEPENDS+=              qmail>=1.03:../../mail/qmail
 
-DJB_CONFIG_CMDS=       ${ECHO} ${LOCALBASE:Q} > ${WRKSRC}/conf-ezmlm
+FORCE_C_STD=           c89
 
-SUBST_CLASSES+=                djberrno
+DJB_CONFIG_CMDS=       ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ezmlm;
+DJB_ERRNO_FIXUP=       error.h
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 

Index: pkgsrc/mail/queue-fix/Makefile
diff -u pkgsrc/mail/queue-fix/Makefile:1.13 pkgsrc/mail/queue-fix/Makefile:1.14
--- pkgsrc/mail/queue-fix/Makefile:1.13 Thu Nov 19 09:35:40 2020
+++ pkgsrc/mail/queue-fix/Makefile      Thu May 22 04:51:28 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/11/19 09:35:40 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.14 2025/05/22 04:51:28 schmonz Exp $
 
 DISTNAME=              queue-fix-1.4
 PKGREVISION=           1
@@ -12,7 +11,9 @@ COMMENT=              Check and repair the qmail que
 
 INSTALLATION_DIRS=     bin
 
-SUBST_CLASSES+=                djberrno
+FORCE_C_STD=           c89
+
+DJB_ERRNO_FIXUP=       error.h
 
 SUBST_CLASSES+=                groups
 SUBST_STAGE.groups=    do-configure

Index: pkgsrc/mail/serialmail/Makefile
diff -u pkgsrc/mail/serialmail/Makefile:1.15 pkgsrc/mail/serialmail/Makefile:1.16
--- pkgsrc/mail/serialmail/Makefile:1.15        Tue Nov 15 18:57:18 2022
+++ pkgsrc/mail/serialmail/Makefile     Thu May 22 04:51:29 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/11/15 18:57:18 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.16 2025/05/22 04:51:29 schmonz Exp $
 
 DISTNAME=              serialmail-0.75
 PKGREVISION=           3
@@ -15,7 +14,7 @@ DEPENDS+=             qmail>=1.03nb7:../../mail/qma
 
 INSTALLATION_DIRS=     share/doc/${PKGBASE}
 
-SUBST_CLASSES+=                djberrno
+DJB_ERRNO_FIXUP=       error.h
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure

Index: pkgsrc/math/djbfft/Makefile
diff -u pkgsrc/math/djbfft/Makefile:1.22 pkgsrc/math/djbfft/Makefile:1.23
--- pkgsrc/math/djbfft/Makefile:1.22    Thu Nov 19 09:35:42 2020
+++ pkgsrc/math/djbfft/Makefile Thu May 22 04:51:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/11/19 09:35:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.23 2025/05/22 04:51:29 schmonz Exp $
 
 DISTNAME=      djbfft-0.76
 CATEGORIES=    math
@@ -11,7 +11,9 @@ LICENSE=      public-domain
 
 NOT_FOR_PLATFORM=      IRIX-*-*
 
-SUBST_CLASSES+=                djberrno
+FORCE_C_STD=           c99
+
+DJB_ERRNO_FIXUP=       error.h
 
 INSTALLATION_DIRS=     include/djbfft lib
 

Index: pkgsrc/net/djbdns/Makefile
diff -u pkgsrc/net/djbdns/Makefile:1.75 pkgsrc/net/djbdns/Makefile:1.76
--- pkgsrc/net/djbdns/Makefile:1.75     Wed May 21 22:32:47 2025
+++ pkgsrc/net/djbdns/Makefile  Thu May 22 04:51:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2025/05/21 22:32:47 schmonz Exp $
+# $NetBSD: Makefile,v 1.76 2025/05/22 04:51:28 schmonz Exp $
 
 DISTNAME=              djbdns-1.05
 PKGREVISION=           16
@@ -17,7 +17,7 @@ CONFLICTS+=           djbdnscurve6-[0-9]*
 
 FORCE_C_STD=           c89
 
-SUBST_CLASSES+=                djberrno
+DJB_ERRNO_FIXUP=       error.h
 
 SUBST_CLASSES+=                etc
 SUBST_STAGE.etc=       do-configure

Index: pkgsrc/net/publicfile/Makefile
diff -u pkgsrc/net/publicfile/Makefile:1.20 pkgsrc/net/publicfile/Makefile:1.21
--- pkgsrc/net/publicfile/Makefile:1.20 Thu Nov 16 22:55:37 2023
+++ pkgsrc/net/publicfile/Makefile      Thu May 22 04:51:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/11/16 22:55:37 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2025/05/22 04:51:28 schmonz Exp $
 
 DISTNAME=              publicfile-0.52
 PKGREVISION=           3
@@ -13,9 +13,10 @@ LICENSE=             djb-nonlicense
 DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
 DEPENDS+=              {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp6
 
-DJB_CONFIG_PREFIX=     ${PREFIX}/publicfile
+FORCE_C_STD=           c89
 
-SUBST_CLASSES+=                djberrno
+DJB_CONFIG_PREFIX=     ${PREFIX}/${PKGBASE}
+DJB_ERRNO_FIXUP=       error.h
 
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/tinydyndns/Makefile
diff -u pkgsrc/net/tinydyndns/Makefile:1.5 pkgsrc/net/tinydyndns/Makefile:1.6
--- pkgsrc/net/tinydyndns/Makefile:1.5  Thu Nov 19 09:35:39 2020
+++ pkgsrc/net/tinydyndns/Makefile      Thu May 22 04:51:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/11/19 09:35:39 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2025/05/22 04:51:28 schmonz Exp $
 
 DISTNAME=              tinydyndns-0.4.2
 DJBDNS_DISTNAME=       djbdns-1.05
@@ -22,7 +22,9 @@ MAKE_FILE=            Makefile.${PKGBASE}
 BUILD_TARGET=          ${PKGBASE}
 INSTALL_TARGET=                install-${PKGBASE}
 
-SUBST_CLASSES+=                djberrno
+FORCE_C_STD=           c89
+
+DJB_ERRNO_FIXUP=       error.h
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure

Index: pkgsrc/net/ucspi-tcp/Makefile
diff -u pkgsrc/net/ucspi-tcp/Makefile:1.48 pkgsrc/net/ucspi-tcp/Makefile:1.49
--- pkgsrc/net/ucspi-tcp/Makefile:1.48  Thu Nov 19 09:35:39 2020
+++ pkgsrc/net/ucspi-tcp/Makefile       Thu May 22 04:51:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2020/11/19 09:35:39 schmonz Exp $
+# $NetBSD: Makefile,v 1.49 2025/05/22 04:51:28 schmonz Exp $
 
 DISTNAME=              ucspi-tcp-0.88
 PKGREVISION=           6
@@ -20,7 +20,9 @@ SITES.${MANPAGES}=    http://smarden.org/pa
 
 CONFLICTS+=            ucspi-tcp6-[0-9]*
 
-SUBST_CLASSES+=                djberrno
+FORCE_C_STD=           c89
+
+DJB_ERRNO_FIXUP=       error.h
 
 SUBST_CLASSES+=                etc
 SUBST_STAGE.etc=       do-configure

Index: pkgsrc/sysutils/checkpassword/Makefile
diff -u pkgsrc/sysutils/checkpassword/Makefile:1.23 pkgsrc/sysutils/checkpassword/Makefile:1.24
--- pkgsrc/sysutils/checkpassword/Makefile:1.23 Thu Nov 19 09:35:43 2020
+++ pkgsrc/sysutils/checkpassword/Makefile      Thu May 22 04:51:30 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/11/19 09:35:43 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.24 2025/05/22 04:51:30 schmonz Exp $
 
 DISTNAME=              checkpassword-0.90
 PKGREVISION=           2
@@ -11,9 +10,9 @@ HOMEPAGE=             https://cr.yp.to/checkpwd.htm
 COMMENT=               Simple, uniform password-checking interface to all root applications
 LICENSE=               public-domain
 
-SUBST_CLASSES+=                djberrno
+FORCE_C_STD=           c89
 
-CHECKPASSWORD_BIN=     bin/checkpassword
+DJB_ERRNO_FIXUP=       error.h
 
 INSTALLATION_DIRS=     bin
 

Index: pkgsrc/sysutils/daemontools/Makefile
diff -u pkgsrc/sysutils/daemontools/Makefile:1.51 pkgsrc/sysutils/daemontools/Makefile:1.52
--- pkgsrc/sysutils/daemontools/Makefile:1.51   Mon Sep  4 17:50:48 2023
+++ pkgsrc/sysutils/daemontools/Makefile        Thu May 22 04:51:30 2025
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.51 2023/09/04 17:50:48 schmonz Exp $
+# $NetBSD: Makefile,v 1.52 2025/05/22 04:51:30 schmonz Exp $
 
 DISTNAME=              daemontools-0.76
 PKGREVISION=           5
 CATEGORIES=            sysutils
 MASTER_SITES=          http://cr.yp.to/daemontools/ ftp://cr.yp.to/daemontools/
-DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
+MANPAGES_DIST=         ${DISTNAME}-man-20020131.tar.gz
+DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST}
+SITES.${MANPAGES_DIST}=        http://smarden.org/pape/djb/manpages/
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              https://cr.yp.to/daemontools.html
 COMMENT=               Service monitoring and logging utilities by djb
 LICENSE=               public-domain
 
-MANPAGES=              ${DISTNAME}-man-20020131.tar.gz
-SITES.${MANPAGES}=     http://smarden.org/pape/djb/manpages/
-
 CONFLICTS+=            daemontools-encore-[0-9]*
 
+FORCE_C_STD=           c89
+
 WRKSRC=                        ${WRKDIR}/admin/${PKGNAME_NOREV}
 DJB_SLASHPACKAGE=      YES
 TEST_TARGET=           rts
@@ -25,8 +26,7 @@ CMDDIR=                       ${WRKSRC}/command
 
 INSTALLATION_DIRS=     bin man ${PKGMANDIR}/man8
 
-SUBST_CLASSES+=                djberrno
-SUBST_FILES.djberrno=  src/error.h
+DJB_ERRNO_FIXUP=       src/error.h
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
@@ -34,7 +34,7 @@ SUBST_FILES.paths=    src/svscanboot.sh
 SUBST_SED.paths=       -e 's|/usr/local/sbin:/bin|/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/bin|g'
 SUBST_SED.paths+=      -e 's|/command/svc |${PREFIX}/bin/svc |g'
 
-MAKE_ENV+=             PKGSRC_SHELL=${TOOLS_PLATFORM.sh}
+MAKE_ENV+=             PKGSRC_SHELL=${CONFIG_SHELL}
 
 .include "options.mk"
 

Index: pkgsrc/sysutils/qlogtools/Makefile
diff -u pkgsrc/sysutils/qlogtools/Makefile:1.15 pkgsrc/sysutils/qlogtools/Makefile:1.16
--- pkgsrc/sysutils/qlogtools/Makefile:1.15     Sat Oct 14 16:52:54 2023
+++ pkgsrc/sysutils/qlogtools/Makefile  Thu May 22 04:51:30 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/10/14 16:52:54 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.16 2025/05/22 04:51:30 schmonz Exp $
 
 DISTNAME=              qlogtools-3.1
 CATEGORIES=            sysutils
@@ -9,10 +8,10 @@ MAINTAINER=           schmonz%NetBSD.org@localhost
 HOMEPAGE=              https://untroubled.org/qlogtools/
 COMMENT=               Tools useful in analyzing logs from qmail and other pkgs
 
-DJB_MAKE_TARGETS=      NO
+FORCE_C_STD=           c89
 
-SUBST_CLASSES+=                djberrno
-SUBST_FILES.djberrno=  qfilelog.c
+DJB_MAKE_TARGETS=      NO
+DJB_ERRNO_FIXUP=       qfilelog.c
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 

Index: pkgsrc/sysutils/qpasswd/Makefile
diff -u pkgsrc/sysutils/qpasswd/Makefile:1.5 pkgsrc/sysutils/qpasswd/Makefile:1.6
--- pkgsrc/sysutils/qpasswd/Makefile:1.5        Thu Nov 19 09:35:43 2020
+++ pkgsrc/sysutils/qpasswd/Makefile    Thu May 22 04:51:30 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/11/19 09:35:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2025/05/22 04:51:30 schmonz Exp $
 
 DISTNAME=              qpasswd-0.5
 CATEGORIES=            sysutils
@@ -10,7 +10,9 @@ HOMEPAGE=             https://mcmilk.de/projects/qp
 COMMENT=               Password-checking tools for many authentication schemes
 LICENSE=               gnu-gpl-v2
 
-SUBST_CLASSES+=                djberrno
+FORCE_C_STD=           c99
+
+DJB_ERRNO_FIXUP=       error.h
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-build

Index: pkgsrc/sysutils/service-config/Makefile
diff -u pkgsrc/sysutils/service-config/Makefile:1.16 pkgsrc/sysutils/service-config/Makefile:1.17
--- pkgsrc/sysutils/service-config/Makefile:1.16        Sat Oct 14 16:52:54 2023
+++ pkgsrc/sysutils/service-config/Makefile     Thu May 22 04:51:30 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/10/14 16:52:54 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.17 2025/05/22 04:51:30 schmonz Exp $
 
 DISTNAME=              service-config-0.51
 CATEGORIES=            sysutils
@@ -12,7 +11,9 @@ LICENSE=              djb-nonlicense
 
 DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
 
-SUBST_CLASSES+=                djberrno
+FORCE_C_STD=           c89
+
+DJB_ERRNO_FIXUP=       error.h
 
 INSTALLATION_DIRS=     bin
 

Index: pkgsrc/time/leapsunpack/Makefile
diff -u pkgsrc/time/leapsunpack/Makefile:1.10 pkgsrc/time/leapsunpack/Makefile:1.11
--- pkgsrc/time/leapsunpack/Makefile:1.10       Thu Nov 19 09:35:42 2020
+++ pkgsrc/time/leapsunpack/Makefile    Thu May 22 04:51:29 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/11/19 09:35:42 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.11 2025/05/22 04:51:29 schmonz Exp $
 
 DISTNAME=              leapsunpack-0.06
 CATEGORIES=            time
@@ -13,7 +12,7 @@ DEPENDS+=             libtai-[0-9]*:../../devel/lib
 
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
-SUBST_CLASSES+=                djberrno
+DJB_ERRNO_FIXUP=       error.h
 
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     do-configure

Index: pkgsrc/www/superscript-shttpd/Makefile
diff -u pkgsrc/www/superscript-shttpd/Makefile:1.3 pkgsrc/www/superscript-shttpd/Makefile:1.4
--- pkgsrc/www/superscript-shttpd/Makefile:1.3  Sun Dec 19 10:02:11 2021
+++ pkgsrc/www/superscript-shttpd/Makefile      Thu May 22 04:51:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/19 10:02:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2025/05/22 04:51:29 schmonz Exp $
 
 DISTNAME=              shttpd-0.53
 PKGNAME=               superscript-${DISTNAME}
@@ -15,8 +15,9 @@ SUBST_STAGE.paths=    do-configure
 SUBST_FILES.paths=     leapsecs_read.c
 SUBST_VARS.paths=      PKG_SYSCONFDIR
 
-SUBST_CLASSES+=                djberrno
-SUBST_FILES.djberrno=  error.h leapsecs_read.c
+FORCE_C_STD=           c89
+
+DJB_ERRNO_FIXUP=       error.h leapsecs_read.c
 
 LDFLAGS.SunOS+=                -lsocket
 



Home | Main Index | Thread Index | Old Index