CVS commit: pkgsrc/comms

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May 10 11:49:04 UTC 2022

Modified Files:
        pkgsrc/comms/asterisk16: Makefile
        pkgsrc/comms/asterisk18: Makefile
        pkgsrc/comms/asterisk19: Makefile

Log Message:
asterisk*: Check for NetBSD properly. Use OPSYS_VERSION.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/comms/asterisk16/Makefile
cvs rdiff -u -r1.139 -r1.140 pkgsrc/comms/asterisk18/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/comms/asterisk19/Makefile

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

Modified files:

Index: pkgsrc/comms/asterisk16/Makefile
diff -u pkgsrc/comms/asterisk16/Makefile:1.88 pkgsrc/comms/asterisk16/Makefile:1.89
--- pkgsrc/comms/asterisk16/Makefile:1.88       Thu May  5 08:20:09 2022
+++ pkgsrc/comms/asterisk16/Makefile    Tue May 10 11:49:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2022/05/05 08:20:09 nia Exp $
+# $NetBSD: Makefile,v 1.89 2022/05/10 11:49:03 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -146,7 +146,8 @@ PLIST.timerfd=      yes
 
 PLIST_VARS+=           unbound
 # unbound 1.5 or later is required.`
-.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M9.*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090000 && \
+    exists(/usr/include/unbound.h)
 PLIST.unbound=         yes
 .else
 CONFIGURE_ARGS+=       --without-unbound

Index: pkgsrc/comms/asterisk18/Makefile
diff -u pkgsrc/comms/asterisk18/Makefile:1.139 pkgsrc/comms/asterisk18/Makefile:1.140
--- pkgsrc/comms/asterisk18/Makefile:1.139      Thu May  5 08:20:09 2022
+++ pkgsrc/comms/asterisk18/Makefile    Tue May 10 11:49:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2022/05/05 08:20:09 nia Exp $
+# $NetBSD: Makefile,v 1.140 2022/05/10 11:49:03 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -146,10 +146,11 @@ PLIST.timerfd=    yes
 
 PLIST_VARS+=   unbound
 # unbound 1.5 or later is required.`
-.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M8.*)
-CONFIGURE_ARGS+=       --without-unbound
-.else
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090000 && \
+    exists(/usr/include/unbound.h)
 PLIST.unbound= yes
+.else
+CONFIGURE_ARGS+=       --without-unbound
 .endif
 
 .include "options.mk"

Index: pkgsrc/comms/asterisk19/Makefile
diff -u pkgsrc/comms/asterisk19/Makefile:1.6 pkgsrc/comms/asterisk19/Makefile:1.7
--- pkgsrc/comms/asterisk19/Makefile:1.6        Thu May  5 08:20:09 2022
+++ pkgsrc/comms/asterisk19/Makefile    Tue May 10 11:49:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/05/05 08:20:09 nia Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/10 11:49:04 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -146,7 +146,8 @@ PLIST.timerfd=      yes
 
 PLIST_VARS+=   unbound
 # unbound 1.5 or later is required.`
-.if exists(/usr/include/unbound.h) && !empty(OS_VERSION:M8.*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 090000 && \
+    exists(/usr/include/unbound.h)
 CONFIGURE_ARGS+=       --without-unbound
 .else
 PLIST.unbound= yes