pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



Module Name:	pkgsrc-wip
Committed By:	Amitai Schleier <schmonz%NetBSD.org@localhost>
Pushed By:	schmonz
Date:		Thu May 22 00:52:32 2025 -0400
Changeset:	1f999677ce4e635cbcfeb852d74f600da238bc00

Modified Files:
	clockspeed/Makefile
	clockspeed/distinfo
	socklog/Makefile
	socklog/distinfo
Added Files:
	clockspeed/patches/patch-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 see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1f999677ce4e635cbcfeb852d74f600da238bc00

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 clockspeed/Makefile               |  5 +++--
 clockspeed/distinfo               |  3 ++-
 clockspeed/patches/patch-Makefile | 15 +++++++++++++++
 socklog/Makefile                  |  4 ++--
 socklog/distinfo                  |  2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)

diffs:
diff --git a/clockspeed/Makefile b/clockspeed/Makefile
index a4ec6c2f3e..e26eaad977 100644
--- a/clockspeed/Makefile
+++ b/clockspeed/Makefile
@@ -17,8 +17,7 @@ EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 CLOCKSPEEDDIR=	${VARBASE}/${PKGBASE}
 
 DJB_CONFIG_PREFIX=	${CLOCKSPEEDDIR}
-
-SUBST_CLASSES+=		djberrno
+DJB_ERRNO_FIXUP=	error.h
 
 DOCS=		${WRKSRC}/BLURB ${WRKSRC}/CHANGES ${WRKSRC}/README \
 		${WRKSRC}/INSTALL ${WRKSRC}/TODO ${WRKSRC}/THANKS
@@ -30,6 +29,8 @@ CONF_FILES=	${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
 INSTALLATION_DIRS=	${PKGMANDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 \
 			${PKGMANDIR}/man8 ${EGDIR} bin sbin
 
+BUILD_DEFS+=	VARBASE
+
 post-extract:
 	${CP} ${.CURDIR}/files/leapsecs.dat ${WRKSRC}
 	${MV} ${DOCDIR}/clockspeed.1 ${DOCDIR}/clockspeed.1.orig
diff --git a/clockspeed/distinfo b/clockspeed/distinfo
index 9b39b4c8cb..a25e6badb4 100644
--- a/clockspeed/distinfo
+++ b/clockspeed/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.1 2006/05/04 13:55:38 akihabara Exp $
 
-RMD160 (clockspeed-0.62.tar.gz) = c1c863ddd91b77554f6924438979cff58b351377
+BLAKE2s (clockspeed-0.62.tar.gz) = e599ab139ad5e210890f70683949486b42c423f8656f880b3a863958e518c328
 SHA512 (clockspeed-0.62.tar.gz) = 4dae1cfcfc5eb1398fd5a7642ff91987487d9828d314d4bd9f93cdadc60fe99889280a7f8e9192674ed19d246bd4a450ad32b1258e450216111c488074db7978
 Size (clockspeed-0.62.tar.gz) = 25797 bytes
+SHA1 (patch-Makefile) = 6f56722fa158182e3eff839ad591d00fa93c8e8d
diff --git a/clockspeed/patches/patch-Makefile b/clockspeed/patches/patch-Makefile
new file mode 100644
index 0000000000..0df9d021f4
--- /dev/null
+++ b/clockspeed/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Skip generating catpages.
+
+--- Makefile.orig	2025-05-22 03:05:12.385782361 +0000
++++ Makefile
+@@ -187,7 +187,7 @@ compile ip.c fmt.h scan.h ip.h
+ 	./compile ip.c
+ 
+ it: \
+-man sntpclock taiclock taiclockd clockspeed clockadd clockview \
++sntpclock taiclock taiclockd clockspeed clockadd clockview \
+ install instcheck
+ 
+ leapsecs_add.o: \
diff --git a/socklog/Makefile b/socklog/Makefile
index cea5dcb1b5..dcda8899f1 100644
--- a/socklog/Makefile
+++ b/socklog/Makefile
@@ -13,9 +13,9 @@ WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 CMDDIR=		${WRKSRC}/command
 PKGDOCDIR=	${PREFIX}/share/doc/${PKGBASE}
 
-DJB_SLASHPACKAGE=	YES
+FORCE_C_STD=		c89
 
-SUBST_CLASSES+=		djberrno
+DJB_SLASHPACKAGE=	YES
 
 DOCS=		package/CHANGES package/COPYING package/README doc/*.html
 USER_CMDS=	${CMDDIR}/tryto ${CMDDIR}/uncat
diff --git a/socklog/distinfo b/socklog/distinfo
index ffc1825f78..5ca43e9949 100644
--- a/socklog/distinfo
+++ b/socklog/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.2 2006/04/29 03:04:19 akihabara Exp $
 
-RMD160 (socklog-2.1.0.tar.gz) = 375c2992dcbc0d3639e3f8c215ef7f13959bdd5b
+BLAKE2s (socklog-2.1.0.tar.gz) = f36df551a0417483506b1b401652d3324f29bbcdf4af330239f978f69bcd16f8
 SHA512 (socklog-2.1.0.tar.gz) = 920ce5e661a6a3d970fa77ee3c228d48699ea03530be2b43b7517458b25e31a0a7f352ece2d076c715b6d34dbb26b424b48eb0f55b9bcd0355b74d3e34c77ac7
 Size (socklog-2.1.0.tar.gz) = 56942 bytes


Home | Main Index | Thread Index | Old Index