CVS commit: pkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat May  2 11:49:40 UTC 2020

Modified Files:
        pkgsrc/mk: djbware.mk
        pkgsrc/sysutils/qlogtools: Makefile

Log Message:
sysutils/qlogtools: skip nonexistent error.h when fixing errno

Some packages using mk/djbware.mk do not have error.h but need to fix the
errno declaration in other files.  Up to now, there was no good way of
achieving exactly this.

Building packages like these in a SUBST_NOOP_OK=no build makes these
packages fail.  To fix these packages, the configuration of the files
needed to be a bit more flexible.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mk/djbware.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/qlogtools/Makefile

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

Modified files:

Index: pkgsrc/mk/djbware.mk
diff -u pkgsrc/mk/djbware.mk:1.28 pkgsrc/mk/djbware.mk:1.29
--- pkgsrc/mk/djbware.mk:1.28   Sat May  2 11:43:09 2020
+++ pkgsrc/mk/djbware.mk        Sat May  2 11:49:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: djbware.mk,v 1.28 2020/05/02 11:43:09 rillig Exp $
+# $NetBSD: djbware.mk,v 1.29 2020/05/02 11:49:40 rillig Exp $
 #
 # Makefile fragment for packages with djb-style build machinery
 #
@@ -83,11 +83,11 @@ do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} package/compile ${DJB_BUILD_ARGS}
 .endif
 
-.if !empty(DJB_ERRNO_HACK:M[yY][eE][sS])
+.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"
+.  include "bsd.fast.prefs.mk"
 
 .  if exists(${PKGDIR}/options.mk)
 .    include "${PKGDIR}/options.mk"
@@ -98,10 +98,10 @@ PKG_OPTIONS_VAR=    PKG_OPTIONS.${PKGNAME:C
 .    include "bsd.options.mk"
 .  endif
 
-.  if !empty(PKG_OPTIONS:Mdjbware-errno-hack)
+.  if !empty(PKG_OPTIONS:Mdjbware-errno-hack) || !empty(DJB_ERRNO_HACK_FILES)
 SUBST_CLASSES+=                djbware
 SUBST_STAGE.djbware=   do-configure
-SUBST_FILES.djbware+=  error.h
+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

Index: pkgsrc/sysutils/qlogtools/Makefile
diff -u pkgsrc/sysutils/qlogtools/Makefile:1.11 pkgsrc/sysutils/qlogtools/Makefile:1.12
--- pkgsrc/sysutils/qlogtools/Makefile:1.11     Sun Jan 26 17:32:11 2020
+++ pkgsrc/sysutils/qlogtools/Makefile  Sat May  2 11:49:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/26 17:32:11 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/05/02 11:49:40 rillig Exp $
 #
 
 DISTNAME=              qlogtools-3.1
@@ -11,8 +11,7 @@ COMMENT=              Tools useful in analyzing logs
 
 DJB_RESTRICTED=                NO
 DJB_MAKE_TARGETS=      NO
-
-SUBST_FILES.djbware+=  qfilelog.c
+DJB_ERRNO_HACK_FILES=  qfilelog.c
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1