CVS commit: pkgsrc/editors/nvi-m17n

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Aug 16 08:07:41 UTC 2023

Modified Files:
        pkgsrc/editors/nvi-m17n: Makefile

Log Message:
nvi-m17n: check for CIRCLEQ using the infrastructure variable


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/editors/nvi-m17n/Makefile

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

Modified files:

Index: pkgsrc/editors/nvi-m17n/Makefile
diff -u pkgsrc/editors/nvi-m17n/Makefile:1.61 pkgsrc/editors/nvi-m17n/Makefile:1.62
--- pkgsrc/editors/nvi-m17n/Makefile:1.61       Tue Jun 28 11:33:46 2022
+++ pkgsrc/editors/nvi-m17n/Makefile    Wed Aug 16 08:07:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2022/06/28 11:33:46 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2023/08/16 08:07:41 nia Exp $
 
 DISTNAME=      nvi-1.79
 PKGNAME=       nvi-m17n-1.79.20040608
@@ -55,10 +55,9 @@ CONFIGURE_ENV+=              vi_cv_sys5_pty=no
 .endif
 
 post-patch:
-# DragonFly has no CIRCLEQ_* so it wants the provided <sys/queue.h>
-.if ${OPSYS} == "NetBSD" || \
-    ${OPSYS} == "FreeBSD" || \
-    ${OPSYS} == "OpenBSD"
+# want the provided legacy CIRCLEQ code on newer NetBSD versions,
+# don't want to obscure the system header on older versions
+.if ${OPSYS} == "NetBSD" && defined(OPSYS_HAS_CIRCLEQ)
        ${RM} -f ${WRKSRC}/include/sys/queue.h
 .endif