CVS commit: pkgsrc/net/bind914

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tron
Date:           Tue Jun 30 17:27:06 UTC 2020

Modified Files:
        pkgsrc/net/bind914: options.mk

Log Message:
net/bind914: Fix build under NetBSD-current

This package automatically enabled the "blacklist" option under recent
enough versions of NetBSD. However in NetBSD-current the "blacklist"
library has been replaced by the "blocklist" library which BIND currently
doesn't support. And as result the build failed with the default option
because the "blacklist" could not be found.

Change the option check to only enable this option under NetBSD if the
"blacklist" header file can be found. This fixes the build under
NetBSD-current with the default options.

The correct long term fixed would be:
* Wait for a BIND version which supports "blocklist" instead of "blacklist"
* Add "blocklist" as a package in "pkgsrc" with an appropriate "builtin.mk"


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/bind914/options.mk

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

Modified files:

Index: pkgsrc/net/bind914/options.mk
diff -u pkgsrc/net/bind914/options.mk:1.4 pkgsrc/net/bind914/options.mk:1.5
--- pkgsrc/net/bind914/options.mk:1.4   Sun May 10 14:25:42 2020
+++ pkgsrc/net/bind914/options.mk       Tue Jun 30 17:27:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/05/10 14:25:42 rillig Exp $
+# $NetBSD: options.mk,v 1.5 2020/06/30 17:27:06 tron Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bind914
 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server
@@ -23,7 +23,7 @@ PKG_SUGGESTED_OPTIONS+=       threads
 .endif
 
 .if ${OPSYS} == "NetBSD"
-.  if !empty(OS_VERSION:M[8-9].*)
+.  if exists(/usr/include/blacklist.h)
 PKG_SUGGESTED_OPTIONS+=        blacklist
 .  endif
 .endif