pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/comms asterisk*: Check for NetBSD properly. Use OPSYS_...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/aaa5e160d25f
branches:  trunk
changeset: 379001:aaa5e160d25f
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue May 10 11:49:03 2022 +0000

description:
asterisk*: Check for NetBSD properly. Use OPSYS_VERSION.

diffstat:

 comms/asterisk16/Makefile |  5 +++--
 comms/asterisk18/Makefile |  9 +++++----
 comms/asterisk19/Makefile |  5 +++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r 3840b57f8356 -r aaa5e160d25f comms/asterisk16/Makefile
--- a/comms/asterisk16/Makefile Tue May 10 09:47:37 2022 +0000
+++ b/comms/asterisk16/Makefile Tue May 10 11:49:03 2022 +0000
@@ -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_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
diff -r 3840b57f8356 -r aaa5e160d25f comms/asterisk18/Makefile
--- a/comms/asterisk18/Makefile Tue May 10 09:47:37 2022 +0000
+++ b/comms/asterisk18/Makefile Tue May 10 11:49:03 2022 +0000
@@ -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_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)
+PLIST.unbound= yes
+.else
 CONFIGURE_ARGS+=       --without-unbound
-.else
-PLIST.unbound= yes
 .endif
 
 .include "options.mk"
diff -r 3840b57f8356 -r aaa5e160d25f comms/asterisk19/Makefile
--- a/comms/asterisk19/Makefile Tue May 10 09:47:37 2022 +0000
+++ b/comms/asterisk19/Makefile Tue May 10 11:49:03 2022 +0000
@@ -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_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



Home | Main Index | Thread Index | Old Index