vile, xvile: update to 9.8v Update provided by Thomas Dickey. Changes: 20211212 (v) > Lois Mansot + corrected range for &random function. + move the reframe_cursor_position() in update() to ensure that $cwline is shown correctly when viewing [Variables] while showvariables is set. > Mark Robinson: + modify c-filt.c + include the quote chars in the literal colouring for C/C++/Java/etc to make it the same as most other syntax highlighting + add backquote "`" as a quoting character for JavaScript, e.g., for multi-line quotes. + highlight embedded "${xxx}" markers in JavaScript strings using the Ident2 color. + modify sh-filt.l + improve parsing of the beginning of here-document to allow for here-documents piped to programs, e.g., cat <<EOF | pr something EOF or cat <<EOF && date something EOF + do not treat "#" as a comment marker if it is adjacent to nonblank text. > Stephan Schulz: + add popup-choices mode (Savannah #58999) > Tom Dickey: + eliminate filename conflict between vile/xvile in test-packages for FreeBSD ports, e.g., xvile's vileget becomes xvileget. + suppress some of the gcc warnings due to perl header-files. + updated plink.sh, from xterm, to work around poor performance of gcc on Fedora. + modify perl scripts to use /usr/bin/env to locate the perl program, and eliminate sinstall.sh + modify curses-driver to support italics, e.g., as in ncurses 6. + apply Xaw header-fix for XawPlus, neXtaw and Xaw3dxft. + use Xaw3d menu-headers for x11vile.h and x11menu.c (FreeBSD #186420). + replace Header keywords with Id, to make Git-snapshots match. + continue development of xftplain.c (--enable-freetype). The current driver is able to display a single TrueType font using Xft. The menu entries for the bitmap-fonts are replaced by a single menu with sizes. Some of the remaining issues: + provide conversion for X displays other than 24-bit TrueColor + implement fallback fonts, i.e., --enable-fontsets + modify configure script to check for ssp library, needed for some misconfigured libraries when cross-compiling to MinGW. + fix a case in vile-manfilt where cur_line may not have been allocated before first use. + update configure script to work with _Noreturn changes in ncurses 20210320 development version. + modify makefile.in, wrapping cd commands in a subshell to work around "jobs" misfeature of pmake. + improve c-filt.c support for JavaScript + handle ranges, i.e., to avoid stopping on "/" + check for regex after ":" + add m,s,u,y to permissable flags ending regex + quoting-fixes in autoconf macros, per shellcheck warnings. + add check for 'U' in read_quoted() needed to make ^VUxxxx work. + modify lins_chars() to handle a case where a script inserts a UTF-8 character (report by Thomas Dupond). + modify configure/makefiles to support ".PHONY" feature. + change configure/makefiles to use ARFLAGS rather than AR_OPTS + change configure --with-warnings to --enable-warnings for consistency with other configure scripts, using recent changes in that to filter gcc -Werror options to avoid breaking configure checks. + fix a few build problems with --disable-extensions + split-out x11plain.c, to start work on TrueType font support in xvile + modify configure script to allow clang to support loadable filters, since recent configurations work. + add/fix NetBSD pkgsrc-files for 9.8u + update FreeBSD package-files for 9.8u + update config.guess, config.subdiff -r1.75 -r1.76 pkgsrc/editors/vile/Makefile
(wiz)
@@ -1,31 +1,31 @@ | @@ -1,31 +1,31 @@ | |||
1 | # $NetBSD: Makefile,v 1.75 2021/05/24 19:52:08 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.76 2021/12/13 08:56:32 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= vile-9.8u | 3 | DISTNAME= vile-9.8v | |
4 | PKGREVISION= 2 | |||
5 | CATEGORIES= editors | 4 | CATEGORIES= editors | |
6 | MASTER_SITES= ftp://ftp.invisible-island.net/vile/current/ | 5 | MASTER_SITES= ftp://ftp.invisible-island.net/pub/vile/current/ \ | |
6 | https://invisible-mirror.net/archives/vile/current/ | |||
7 | EXTRACT_SUFX= .tgz | 7 | EXTRACT_SUFX= .tgz | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://invisible-island.net/vile/ | 10 | HOMEPAGE= https://invisible-island.net/vile/ | |
11 | COMMENT= VI Like Emacs. a vi "workalike", with many additional features | 11 | COMMENT= VI Like Emacs. a vi "workalike", with many additional features | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | .include "options.mk" | 14 | .include "options.mk" | |
15 | 15 | |||
16 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
17 | CONFIGURE_ARGS+= --with-perl | 17 | CONFIGURE_ARGS+= --with-perl | |
18 | CONFIGURE_ARGS+= --datadir=${DATADIR:Q} | 18 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share | |
19 | CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q} | 19 | CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q} | |
20 | USE_TOOLS+= perl:run | 20 | USE_TOOLS+= perl:run | |
21 | 21 | |||
22 | REPLACE_PERL= perl/vileget | 22 | REPLACE_PERL= perl/vileget | |
23 | 23 | |||
24 | CPPFLAGS.NetBSD+= -DMISSING_EXTERN_ENVIRON | 24 | CPPFLAGS.NetBSD+= -DMISSING_EXTERN_ENVIRON | |
25 | 25 | |||
26 | MAKE_FILE= makefile | 26 | MAKE_FILE= makefile | |
27 | INSTALL_TARGET= install install-doc install-perl | 27 | INSTALL_TARGET= install install-doc install-perl | |
28 | 28 | |||
29 | DATADIR= ${PREFIX}/share/vile | 29 | DATADIR= ${PREFIX}/share/vile | |
30 | FILTERDIR= ${PREFIX}/libexec/vile | 30 | FILTERDIR= ${PREFIX}/libexec/vile | |
31 | EGDIR= ${PREFIX}/share/examples/vile | 31 | EGDIR= ${PREFIX}/share/examples/vile |
@@ -1,7 +1,5 @@ | @@ -1,7 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.19 2021/10/26 10:21:42 nia Exp $ | 1 | $NetBSD: distinfo,v 1.20 2021/12/13 08:56:32 wiz Exp $ | |
2 | 2 | |||
3 | BLAKE2s (vile-9.8u.tgz) = 407e9469ad657a5b9582f9acce7cc9b434ff634d889cf1e576cde3d1d32071f2 | 3 | BLAKE2s (vile-9.8v.tgz) = 111282085e4670d2dbdef36cd9b4dee7c1a756b7862d1fa8965b62b67f8155b7 | |
4 | SHA512 (vile-9.8u.tgz) = fad06c8e341feec7e9aed1e53cd9a1e7fe79fdeb050aba743ac4edfb6096db88c1ef63377d6ecbeddd0eb8ad46a323bcc55d09b1ff221a75cd74a3f991e3f24d | 4 | SHA512 (vile-9.8v.tgz) = b752f26148bd4411ab6b31697459a16d8168f79ffad6b3509d6cf5d40611176b833e56f4bac21fe18ecdd256be467ba96ea98149daceab671002df49508eb8d2 | |
5 | Size (vile-9.8u.tgz) = 2375989 bytes | 5 | Size (vile-9.8v.tgz) = 2405398 bytes | |
6 | SHA1 (patch-filters_makefile.in) = c2127de2f65ee09bce3ee0fd9163be95bf686c61 | |||
7 | SHA1 (patch-makefile.in) = ed2be4b98d6a44231271c79c9cbe1b93bc410a4b |
@@ -1,58 +1,67 @@ | @@ -1,58 +1,67 @@ | |||
1 | # $NetBSD: Makefile,v 1.78 2021/05/24 19:52:09 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.79 2021/12/13 08:56:32 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= vile-9.8u | 3 | DISTNAME= vile-9.8v | |
4 | PKGNAME= x${DISTNAME} | 4 | PKGNAME= x${DISTNAME} | |
5 | PKGREVISION= 2 | |||
6 | CATEGORIES= editors | 5 | CATEGORIES= editors | |
7 | MASTER_SITES= ftp://ftp.invisible-island.net/vile/current/ | 6 | MASTER_SITES= ftp://ftp.invisible-island.net/vile/current/ \ | |
7 | https://invisible-mirror.net/archives/vile/current/ | |||
8 | EXTRACT_SUFX= .tgz | 8 | EXTRACT_SUFX= .tgz | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= https://invisible-island.net/vile/ | 11 | HOMEPAGE= https://invisible-island.net/vile/ | |
12 | COMMENT= VI Like Emacs, X11 version -- a fully "X aware" vi work-alike | 12 | COMMENT= VI Like Emacs, X11 version -- a fully "X aware" vi work-alike | |
13 | LICENSE= gnu-gpl-v2 | 13 | LICENSE= gnu-gpl-v2 | |
14 | 14 | |||
15 | DISTINFO_FILE= ${.CURDIR}/../../editors/vile/distinfo | 15 | DISTINFO_FILE= ${.CURDIR}/../../editors/vile/distinfo | |
16 | PATCHDIR= ${.CURDIR}/../../editors/vile/patches | 16 | PATCHDIR= ${.CURDIR}/../../editors/vile/patches | |
17 | 17 | |||
18 | GNU_CONFIGURE= yes | 18 | GNU_CONFIGURE= yes | |
19 | CONFIGURE_ARGS+= --disable-imake | 19 | CONFIGURE_ARGS+= --disable-imake | |
20 | CONFIGURE_ARGS+= --with-perl | 20 | CONFIGURE_ARGS+= --with-perl | |
21 | CONFIGURE_ARGS+= --datadir=${DATADIR:Q} | 21 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share | |
22 | CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q} | 22 | CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q} | |
23 | CONFIGURE_ARGS+= --with-startup-path=${DATADIR:Q} | |||
23 | 24 | |||
24 | MAKE_FILE= makefile | 25 | MAKE_FILE= makefile | |
25 | INSTALL_TARGET= install install-doc install-perl | 26 | INSTALL_TARGET= install install-doc install-perl | |
26 | 27 | |||
27 | REPLACE_PERL= perl/vileget | 28 | REPLACE_PERL= perl/vileget | |
28 | REPLACE_PERL+= macros/lxvile | 29 | REPLACE_PERL+= macros/lxvile | |
29 | REPLACE_PERL+= macros/lxvile-fonts | 30 | REPLACE_PERL+= macros/lxvile-fonts | |
30 | USE_TOOLS+= perl:run | 31 | USE_TOOLS+= perl:run | |
31 | 32 | |||
32 | DATADIR= ${PREFIX}/share/xvile | 33 | DATADIR= ${PREFIX}/share/xvile | |
33 | FILTERDIR= ${PREFIX}/libexec/xvile | 34 | FILTERDIR= ${PREFIX}/libexec/xvile | |
34 | EGDIR= ${PREFIX}/share/examples/xvile | 35 | EGDIR= ${PREFIX}/share/examples/xvile | |
35 | 36 | |||
36 | .include "../../mk/bsd.prefs.mk" | 37 | .include "../../mk/bsd.prefs.mk" | |
37 | 38 | |||
38 | .if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm") | 39 | .if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm") | |
39 | CONFIGURE_ARGS+= --with-screen=Xaw3d | 40 | CONFIGURE_ARGS+= --with-screen=Xaw3d | |
40 | CONFIGURE_ARGS+= --with-Xaw3d | 41 | CONFIGURE_ARGS+= --with-Xaw3d | |
41 | .else | 42 | .else | |
42 | CONFIGURE_ARGS+= --with-screen=Xaw | 43 | CONFIGURE_ARGS+= --with-screen=Xaw | |
43 | .endif | 44 | .endif | |
44 | CONFIGURE_ARGS+= --with-xpm | 45 | CONFIGURE_ARGS+= --with-xpm | |
45 | 46 | |||
47 | pre-configure: | |||
48 | for f in \ | |||
49 | ${WRKDIR}/${DISTNAME}/makefile.in \ | |||
50 | ${WRKDIR}/${DISTNAME}/filters/makefile.in; do \ | |||
51 | ${MV} $$f $$f.bak; \ | |||
52 | sed -e '/^datadir[ ]*=[ ]*@datadir@/s%/vile%/xvile%' $$f.bak >$$f; \ | |||
53 | done | |||
54 | ||||
46 | post-install: | 55 | post-install: | |
47 | ${INSTALL_SCRIPT} ${WRKSRC}/perl/vileget \ | 56 | ${INSTALL_SCRIPT} ${WRKSRC}/perl/vileget \ | |
48 | ${DESTDIR}${PREFIX}/bin/xvileget | 57 | ${DESTDIR}${PREFIX}/bin/xvileget | |
49 | ${RM} -f ${DESTDIR}${PREFIX}/bin/vileget | 58 | ${RM} -f ${DESTDIR}${PREFIX}/bin/vileget | |
50 | ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} | 59 | ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} | |
51 | set -e; \ | 60 | set -e; \ | |
52 | for f in filters/spell.rc filters/filters.rc \ | 61 | for f in filters/spell.rc filters/filters.rc \ | |
53 | macros/digraphs.rc macros/pictmode.rc \ | 62 | macros/digraphs.rc macros/pictmode.rc \ | |
54 | macros/manpage.rc visvile/visvile.rc; do \ | 63 | macros/manpage.rc visvile/visvile.rc; do \ | |
55 | ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${EGDIR}; \ | 64 | ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${EGDIR}; \ | |
56 | done | 65 | done | |
57 | 66 | |||
58 | .include "../../x11/libXmu/buildlink3.mk" | 67 | .include "../../x11/libXmu/buildlink3.mk" |