Mon Dec 13 08:56:32 2021 UTC ()
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.sub


(wiz)
diff -r1.75 -r1.76 pkgsrc/editors/vile/Makefile
diff -r1.19 -r1.20 pkgsrc/editors/vile/distinfo
diff -r1.1 -r0 pkgsrc/editors/vile/patches/patch-filters_makefile.in
diff -r1.3 -r0 pkgsrc/editors/vile/patches/patch-makefile.in
diff -r1.78 -r1.79 pkgsrc/editors/xvile/Makefile

cvs diff -r1.75 -r1.76 pkgsrc/editors/vile/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vile/Makefile 2021/05/24 19:52:08 1.75
+++ pkgsrc/editors/vile/Makefile 2021/12/13 08:56:32 1.76
@@ -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
3DISTNAME= vile-9.8u 3DISTNAME= vile-9.8v
4PKGREVISION= 2 
5CATEGORIES= editors 4CATEGORIES= editors
6MASTER_SITES= ftp://ftp.invisible-island.net/vile/current/ 5MASTER_SITES= ftp://ftp.invisible-island.net/pub/vile/current/ \
 6 https://invisible-mirror.net/archives/vile/current/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://invisible-island.net/vile/ 10HOMEPAGE= https://invisible-island.net/vile/
11COMMENT= VI Like Emacs. a vi "workalike", with many additional features 11COMMENT= VI Like Emacs. a vi "workalike", with many additional features
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14.include "options.mk" 14.include "options.mk"
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --with-perl 17CONFIGURE_ARGS+= --with-perl
18CONFIGURE_ARGS+= --datadir=${DATADIR:Q} 18CONFIGURE_ARGS+= --datadir=${PREFIX}/share
19CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q} 19CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q}
20USE_TOOLS+= perl:run 20USE_TOOLS+= perl:run
21 21
22REPLACE_PERL= perl/vileget 22REPLACE_PERL= perl/vileget
23 23
24CPPFLAGS.NetBSD+= -DMISSING_EXTERN_ENVIRON 24CPPFLAGS.NetBSD+= -DMISSING_EXTERN_ENVIRON
25 25
26MAKE_FILE= makefile 26MAKE_FILE= makefile
27INSTALL_TARGET= install install-doc install-perl 27INSTALL_TARGET= install install-doc install-perl
28 28
29DATADIR= ${PREFIX}/share/vile 29DATADIR= ${PREFIX}/share/vile
30FILTERDIR= ${PREFIX}/libexec/vile 30FILTERDIR= ${PREFIX}/libexec/vile
31EGDIR= ${PREFIX}/share/examples/vile 31EGDIR= ${PREFIX}/share/examples/vile

cvs diff -r1.19 -r1.20 pkgsrc/editors/vile/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/vile/distinfo 2021/10/26 10:21:42 1.19
+++ pkgsrc/editors/vile/distinfo 2021/12/13 08:56:32 1.20
@@ -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
3BLAKE2s (vile-9.8u.tgz) = 407e9469ad657a5b9582f9acce7cc9b434ff634d889cf1e576cde3d1d32071f2 3BLAKE2s (vile-9.8v.tgz) = 111282085e4670d2dbdef36cd9b4dee7c1a756b7862d1fa8965b62b67f8155b7
4SHA512 (vile-9.8u.tgz) = fad06c8e341feec7e9aed1e53cd9a1e7fe79fdeb050aba743ac4edfb6096db88c1ef63377d6ecbeddd0eb8ad46a323bcc55d09b1ff221a75cd74a3f991e3f24d 4SHA512 (vile-9.8v.tgz) = b752f26148bd4411ab6b31697459a16d8168f79ffad6b3509d6cf5d40611176b833e56f4bac21fe18ecdd256be467ba96ea98149daceab671002df49508eb8d2
5Size (vile-9.8u.tgz) = 2375989 bytes 5Size (vile-9.8v.tgz) = 2405398 bytes
6SHA1 (patch-filters_makefile.in) = c2127de2f65ee09bce3ee0fd9163be95bf686c61 
7SHA1 (patch-makefile.in) = ed2be4b98d6a44231271c79c9cbe1b93bc410a4b 

File Deleted: pkgsrc/editors/vile/patches/Attic/patch-filters_makefile.in

File Deleted: pkgsrc/editors/vile/patches/Attic/patch-makefile.in

cvs diff -r1.78 -r1.79 pkgsrc/editors/xvile/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/xvile/Makefile 2021/05/24 19:52:09 1.78
+++ pkgsrc/editors/xvile/Makefile 2021/12/13 08:56:32 1.79
@@ -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
3DISTNAME= vile-9.8u 3DISTNAME= vile-9.8v
4PKGNAME= x${DISTNAME} 4PKGNAME= x${DISTNAME}
5PKGREVISION= 2 
6CATEGORIES= editors 5CATEGORIES= editors
7MASTER_SITES= ftp://ftp.invisible-island.net/vile/current/ 6MASTER_SITES= ftp://ftp.invisible-island.net/vile/current/ \
 7 https://invisible-mirror.net/archives/vile/current/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://invisible-island.net/vile/ 11HOMEPAGE= https://invisible-island.net/vile/
12COMMENT= VI Like Emacs, X11 version -- a fully "X aware" vi work-alike 12COMMENT= VI Like Emacs, X11 version -- a fully "X aware" vi work-alike
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15DISTINFO_FILE= ${.CURDIR}/../../editors/vile/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../editors/vile/distinfo
16PATCHDIR= ${.CURDIR}/../../editors/vile/patches 16PATCHDIR= ${.CURDIR}/../../editors/vile/patches
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --disable-imake 19CONFIGURE_ARGS+= --disable-imake
20CONFIGURE_ARGS+= --with-perl 20CONFIGURE_ARGS+= --with-perl
21CONFIGURE_ARGS+= --datadir=${DATADIR:Q} 21CONFIGURE_ARGS+= --datadir=${PREFIX}/share
22CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q} 22CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q}
 23CONFIGURE_ARGS+= --with-startup-path=${DATADIR:Q}
23 24
24MAKE_FILE= makefile 25MAKE_FILE= makefile
25INSTALL_TARGET= install install-doc install-perl 26INSTALL_TARGET= install install-doc install-perl
26 27
27REPLACE_PERL= perl/vileget 28REPLACE_PERL= perl/vileget
28REPLACE_PERL+= macros/lxvile 29REPLACE_PERL+= macros/lxvile
29REPLACE_PERL+= macros/lxvile-fonts 30REPLACE_PERL+= macros/lxvile-fonts
30USE_TOOLS+= perl:run 31USE_TOOLS+= perl:run
31 32
32DATADIR= ${PREFIX}/share/xvile 33DATADIR= ${PREFIX}/share/xvile
33FILTERDIR= ${PREFIX}/libexec/xvile 34FILTERDIR= ${PREFIX}/libexec/xvile
34EGDIR= ${PREFIX}/share/examples/xvile 35EGDIR= ${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")
39CONFIGURE_ARGS+= --with-screen=Xaw3d 40CONFIGURE_ARGS+= --with-screen=Xaw3d
40CONFIGURE_ARGS+= --with-Xaw3d 41CONFIGURE_ARGS+= --with-Xaw3d
41.else 42.else
42CONFIGURE_ARGS+= --with-screen=Xaw 43CONFIGURE_ARGS+= --with-screen=Xaw
43.endif 44.endif
44CONFIGURE_ARGS+= --with-xpm 45CONFIGURE_ARGS+= --with-xpm
45 46
 47pre-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
46post-install: 55post-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"