Wed Aug 16 08:07:41 2023 UTC ()
nvi-m17n: check for CIRCLEQ using the infrastructure variable


(nia)
diff -r1.61 -r1.62 pkgsrc/editors/nvi-m17n/Makefile
cvs diff -r1.61 -r1.62 pkgsrc/editors/nvi-m17n/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/nvi-m17n/Makefile 2022/06/28 11:33:46 1.61
+++ pkgsrc/editors/nvi-m17n/Makefile 2023/08/16 08:07:41 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.61 2022/06/28 11:33:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.62 2023/08/16 08:07:41 nia Exp $
2 2
3DISTNAME= nvi-1.79 3DISTNAME= nvi-1.79
4PKGNAME= nvi-m17n-1.79.20040608 4PKGNAME= nvi-m17n-1.79.20040608
5PKGREVISION= 11 5PKGREVISION= 11
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= http://www.bostic.com/files/ 7MASTER_SITES= http://www.bostic.com/files/
8 8
9#PATCH_SITES= ftp://ftp.itojun.org/pub/nvi/ 9#PATCH_SITES= ftp://ftp.itojun.org/pub/nvi/
10PATCHFILES= nvi-m17n-1.79-20040608.diff.gz 10PATCHFILES= nvi-m17n-1.79-20040608.diff.gz
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13COMMENT= Clone of vi/ex, with multilingual patch 13COMMENT= Clone of vi/ex, with multilingual patch
14 14
@@ -45,30 +45,29 @@ AUTODETECT.iso-2022-kr= kr @@ -45,30 +45,29 @@ AUTODETECT.iso-2022-kr= kr
45AUTODETECT.sjis= jp 45AUTODETECT.sjis= jp
46 46
47ENCODINGS+= iso-2022-cn iso-2022-jp iso-2022-kr 47ENCODINGS+= iso-2022-cn iso-2022-jp iso-2022-kr
48ENCODINGS+= euc-jp euc-cn euc-kr sjis big5 euc-tw hz 48ENCODINGS+= euc-jp euc-cn euc-kr sjis big5 euc-tw hz
49 49
50.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
51 51
52.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" 52.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
53# XXX ignore NetBSD 2.0F and later's grantpt(3) and SysV pty for just now 53# XXX ignore NetBSD 2.0F and later's grantpt(3) and SysV pty for just now
54CONFIGURE_ENV+= vi_cv_sys5_pty=no 54CONFIGURE_ENV+= vi_cv_sys5_pty=no
55.endif 55.endif
56 56
57post-patch: 57post-patch:
58# DragonFly has no CIRCLEQ_* so it wants the provided <sys/queue.h> 58# want the provided legacy CIRCLEQ code on newer NetBSD versions,
59.if ${OPSYS} == "NetBSD" || \ 59# don't want to obscure the system header on older versions
60 ${OPSYS} == "FreeBSD" || \ 60.if ${OPSYS} == "NetBSD" && defined(OPSYS_HAS_CIRCLEQ)
61 ${OPSYS} == "OpenBSD" 
62 ${RM} -f ${WRKSRC}/include/sys/queue.h 61 ${RM} -f ${WRKSRC}/include/sys/queue.h
63.endif 62.endif
64 63
65post-build: 64post-build:
66.for encoding in ${ENCODINGS} 65.for encoding in ${ENCODINGS}
67 @${SED} -e 's|$${CANNA_OPT}|${CANNA_OPT.${encoding}}|' \ 66 @${SED} -e 's|$${CANNA_OPT}|${CANNA_OPT.${encoding}}|' \
68 -e 's|$${AUTODETECT}|${AUTODETECT.${encoding}}|' \ 67 -e 's|$${AUTODETECT}|${AUTODETECT.${encoding}}|' \
69 -e 's|$${ENCODING}|${encoding}|g' \ 68 -e 's|$${ENCODING}|${encoding}|g' \
70 -e 's|$${PREFIX}|${PREFIX}|' \ 69 -e 's|$${PREFIX}|${PREFIX}|' \
71 ${FILESDIR}/nvi-m17n > ${WRKDIR}/nvi-${encoding} 70 ${FILESDIR}/nvi-m17n > ${WRKDIR}/nvi-${encoding}
72.endfor 71.endfor
73 72
74post-install: 73post-install: