CVS commit: pkgsrc/comms

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May  5 08:20:09 UTC 2022

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

Log Message:
asterisk*: Use OPSYS_VERSION to numerically compare NetBSD versions


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/comms/asterisk13/Makefile
cvs rdiff -u -r1.87 -r1.88 pkgsrc/comms/asterisk16/Makefile
cvs rdiff -u -r1.138 -r1.139 pkgsrc/comms/asterisk18/Makefile
cvs rdiff -u -r1.5 -r1.6 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/asterisk13/Makefile
diff -u pkgsrc/comms/asterisk13/Makefile:1.77 pkgsrc/comms/asterisk13/Makefile:1.78
--- pkgsrc/comms/asterisk13/Makefile:1.77       Mon Apr 18 19:10:33 2022
+++ pkgsrc/comms/asterisk13/Makefile    Thu May  5 08:20:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2022/04/18 19:10:33 adam Exp $
+# $NetBSD: Makefile,v 1.78 2022/05/05 08:20:09 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -48,8 +48,7 @@ CONFIGURE_ARGS+=      --without-gtk2
 # XXX remove when lang/lua gets builtin.mk
 CONFIGURE_ARGS+=       --without-lua
 
-.if (${OPSYS} == "NetBSD" && \
-    (empty(OS_VERSION:M6.99.[4-9]?) && empty(OS_VERSION:M[7-9].*)))
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
 CONFIGURE_ARGS+=       --without-srtp
 .else
 CONFIGURE_ARGS+=       --with-srtp

Index: pkgsrc/comms/asterisk16/Makefile
diff -u pkgsrc/comms/asterisk16/Makefile:1.87 pkgsrc/comms/asterisk16/Makefile:1.88
--- pkgsrc/comms/asterisk16/Makefile:1.87       Mon Apr 18 19:10:33 2022
+++ pkgsrc/comms/asterisk16/Makefile    Thu May  5 08:20:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2022/04/18 19:10:33 adam Exp $
+# $NetBSD: Makefile,v 1.88 2022/05/05 08:20:09 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -50,8 +50,7 @@ CONFIGURE_ARGS+=      --without-gtk2
 CONFIGURE_ARGS+=       --without-lua
 
 PLIST_VARS+=           srtp
-.if (${OPSYS} == "NetBSD" && \
-    (empty(OS_VERSION:M6.99.[4-9]?) && empty(OS_VERSION:M[7-9].*)))
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
 CONFIGURE_ARGS+=       --without-srtp
 .else
 CONFIGURE_ARGS+=       --with-srtp

Index: pkgsrc/comms/asterisk18/Makefile
diff -u pkgsrc/comms/asterisk18/Makefile:1.138 pkgsrc/comms/asterisk18/Makefile:1.139
--- pkgsrc/comms/asterisk18/Makefile:1.138      Mon Apr 18 19:10:33 2022
+++ pkgsrc/comms/asterisk18/Makefile    Thu May  5 08:20:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2022/04/18 19:10:33 adam Exp $
+# $NetBSD: Makefile,v 1.139 2022/05/05 08:20:09 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -51,8 +51,7 @@ CONFIGURE_ARGS+=      --without-gtk2
 # XXX remove when lang/lua gets builtin.mk
 CONFIGURE_ARGS+=       --without-lua
 
-.if (${OPSYS} == "NetBSD" && \
-    (empty(OS_VERSION:M6.99.[4-9]?) && empty(OS_VERSION:M[7-9].*)))
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
 CONFIGURE_ARGS+=       --without-srtp
 .else
 CONFIGURE_ARGS+=       --with-srtp

Index: pkgsrc/comms/asterisk19/Makefile
diff -u pkgsrc/comms/asterisk19/Makefile:1.5 pkgsrc/comms/asterisk19/Makefile:1.6
--- pkgsrc/comms/asterisk19/Makefile:1.5        Mon Apr 18 19:10:33 2022
+++ pkgsrc/comms/asterisk19/Makefile    Thu May  5 08:20:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/04/18 19:10:33 adam Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/05 08:20:09 nia Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
@@ -51,8 +51,7 @@ CONFIGURE_ARGS+=      --without-gtk2
 # XXX remove when lang/lua gets builtin.mk
 CONFIGURE_ARGS+=       --without-lua
 
-.if (${OPSYS} == "NetBSD" && \
-    (empty(OS_VERSION:M6.99.[4-9]?) && empty(OS_VERSION:M[7-9].*)))
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
 CONFIGURE_ARGS+=       --without-srtp
 .else
 CONFIGURE_ARGS+=       --with-srtp