CVS commit: pkgsrc/sysutils

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May  5 08:27:14 UTC 2022

Modified Files:
        pkgsrc/sysutils/xentools411: Makefile
        pkgsrc/sysutils/xentools413: Makefile
        pkgsrc/sysutils/xentools415: Makefile

Log Message:
xentools*: Use OPSYS_VERSION to numerically compare NetBSD releases

XXX do we still support Xen on NetBSD 6?


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/xentools411/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/xentools413/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/xentools415/Makefile

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

Modified files:

Index: pkgsrc/sysutils/xentools411/Makefile
diff -u pkgsrc/sysutils/xentools411/Makefile:1.31 pkgsrc/sysutils/xentools411/Makefile:1.32
--- pkgsrc/sysutils/xentools411/Makefile:1.31   Tue Mar 15 18:12:12 2022
+++ pkgsrc/sysutils/xentools411/Makefile        Thu May  5 08:27:13 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2022/03/15 18:12:12 nia Exp $
+# $NetBSD: Makefile,v 1.32 2022/05/05 08:27:13 nia Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 PKGREVISION=   7
@@ -210,8 +210,7 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/docs/misc/$f ${DESTDIR}${PREFIX}/share/doc/xen
 .endfor
 
-.if (${OPSYS} == "NetBSD" && \
-    (empty(OS_VERSION:M6.99.[3-9]?) && empty(OS_VERSION:M[7-9].*)))
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
 CPPFLAGS+=     -Dshm_open=open -Dshm_unlink=unlink
 .endif
 

Index: pkgsrc/sysutils/xentools413/Makefile
diff -u pkgsrc/sysutils/xentools413/Makefile:1.26 pkgsrc/sysutils/xentools413/Makefile:1.27
--- pkgsrc/sysutils/xentools413/Makefile:1.26   Sun Dec 19 09:47:59 2021
+++ pkgsrc/sysutils/xentools413/Makefile        Thu May  5 08:27:13 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2021/12/19 09:47:59 maya Exp $
+# $NetBSD: Makefile,v 1.27 2022/05/05 08:27:13 nia Exp $
 #
 VERSION=       4.13.4
 
@@ -208,8 +208,7 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/docs/misc/$f ${DESTDIR}${PREFIX}/share/doc/xen
 .endfor
 
-.if (${OPSYS} == "NetBSD" && \
-    (empty(OS_VERSION:M6.99.[3-9]?) && empty(OS_VERSION:M[7-9].*)))
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
 CPPFLAGS+=     -Dshm_open=open -Dshm_unlink=unlink
 .endif
 

Index: pkgsrc/sysutils/xentools415/Makefile
diff -u pkgsrc/sysutils/xentools415/Makefile:1.11 pkgsrc/sysutils/xentools415/Makefile:1.12
--- pkgsrc/sysutils/xentools415/Makefile:1.11   Sun Mar 13 20:44:56 2022
+++ pkgsrc/sysutils/xentools415/Makefile        Thu May  5 08:27:13 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/03/13 20:44:56 bouyer Exp $
+# $NetBSD: Makefile,v 1.12 2022/05/05 08:27:13 nia Exp $
 #
 VERSION=       4.15.2
 
@@ -210,8 +210,7 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/docs/misc/$f ${DESTDIR}${PREFIX}/share/doc/xen
 .endfor
 
-.if (${OPSYS} == "NetBSD" && \
-    (empty(OS_VERSION:M6.99.[3-9]?) && empty(OS_VERSION:M[7-9].*)))
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 069900
 CPPFLAGS+=     -Dshm_open=open -Dshm_unlink=unlink
 .endif