pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vim-classic*: Update package to release 8.3.0, fix all lint errors and warnings

Module Name:	pkgsrc-wip
Committed By:	Jeff Frasca <thatguy%jeff-frasca.name@localhost>
Pushed By:	phaedrus
Date:		Wed Jun 3 11:44:15 2026 -0700
Changeset:	5562d33939bc311615d8b676c9036a0d18a6e1f4

Modified Files:
	vim-classic-lang/PLIST
	vim-classic-share/Makefile.common
	vim-classic-share/PLIST
	vim-classic-share/distinfo
	vim-classic-share/options.mk
	vim-classic-share/patches/patch-Makefile
	vim-classic-share/patches/patch-feature.h
	vim-classic-share/patches/patch-link.sh
	vim-classic-share/version.mk
	vim-classic/DESCR
	vim-classic/Makefile
Added Files:
	vim-classic-lang/COMMIT_MSG
	vim-classic-share/COMMIT_MSG
	vim-classic-share/patches/patch-src_auto_configure
	vim-classic/COMMIT_MSG
Removed Files:
	vim-classic-share/patches/patch-auto_configure

Log Message:
vim-classic*: Update package to release 8.3.0, fix all lint errors and warnings

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5562d33939bc311615d8b676c9036a0d18a6e1f4

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

diffstat:
 vim-classic-lang/COMMIT_MSG                        |  5 +++++
 vim-classic-lang/PLIST                             | 24 ++++++++++++++++++++++
 vim-classic-share/COMMIT_MSG                       |  5 +++++
 vim-classic-share/Makefile.common                  |  9 ++++----
 vim-classic-share/PLIST                            | 13 ++++++++++++
 vim-classic-share/distinfo                         | 14 ++++++-------
 vim-classic-share/options.mk                       |  2 +-
 vim-classic-share/patches/patch-Makefile           | 16 ++++++++++-----
 vim-classic-share/patches/patch-auto_configure     | 15 --------------
 vim-classic-share/patches/patch-feature.h          |  2 ++
 vim-classic-share/patches/patch-link.sh            |  2 ++
 vim-classic-share/patches/patch-src_auto_configure | 15 ++++++++++++++
 vim-classic-share/version.mk                       | 10 +++------
 vim-classic/COMMIT_MSG                             |  5 +++++
 vim-classic/DESCR                                  |  2 +-
 vim-classic/Makefile                               |  2 --
 16 files changed, 99 insertions(+), 42 deletions(-)

diffs:
diff --git a/vim-classic-lang/COMMIT_MSG b/vim-classic-lang/COMMIT_MSG
new file mode 100644
index 0000000000..7f990eee4e
--- /dev/null
+++ b/vim-classic-lang/COMMIT_MSG
@@ -0,0 +1,5 @@
+editors/vim-classic-lang: Add vim-classic-lang version 8.3.0
+
+Packaged in wip by Jeff Frasca
+
+Adapt the vim packaging from 2022Q2 to build the vim-classic, a fork of vim-8.2
diff --git a/vim-classic-lang/PLIST b/vim-classic-lang/PLIST
index 5395150c04..6c709b6b83 100644
--- a/vim-classic-lang/PLIST
+++ b/vim-classic-lang/PLIST
@@ -131,6 +131,30 @@ man/ru.UTF-8/man1/view.1
 man/ru.UTF-8/man1/vim.1
 man/ru.UTF-8/man1/vimdiff.1
 man/ru.UTF-8/man1/vimtutor.1
+man/tr.ISO8859-9/man1/evim.1
+man/tr.ISO8859-9/man1/ex.1
+man/tr.ISO8859-9/man1/rview.1
+man/tr.ISO8859-9/man1/rvim.1
+man/tr.ISO8859-9/man1/view.1
+man/tr.ISO8859-9/man1/vim.1
+man/tr.ISO8859-9/man1/vimdiff.1
+man/tr.ISO8859-9/man1/vimtutor.1
+man/tr.UTF-8/man1/evim.1
+man/tr.UTF-8/man1/ex.1
+man/tr.UTF-8/man1/rview.1
+man/tr.UTF-8/man1/rvim.1
+man/tr.UTF-8/man1/view.1
+man/tr.UTF-8/man1/vim.1
+man/tr.UTF-8/man1/vimdiff.1
+man/tr.UTF-8/man1/vimtutor.1
+man/tr/man1/evim.1
+man/tr/man1/ex.1
+man/tr/man1/rview.1
+man/tr/man1/rvim.1
+man/tr/man1/view.1
+man/tr/man1/vim.1
+man/tr/man1/vimdiff.1
+man/tr/man1/vimtutor.1
 share/vim/${VIM_SUBDIR}/keymap/README.txt
 share/vim/${VIM_SUBDIR}/keymap/accents.vim
 share/vim/${VIM_SUBDIR}/keymap/arabic.vim
diff --git a/vim-classic-share/COMMIT_MSG b/vim-classic-share/COMMIT_MSG
new file mode 100644
index 0000000000..3fca148209
--- /dev/null
+++ b/vim-classic-share/COMMIT_MSG
@@ -0,0 +1,5 @@
+editors/vim-classic-share: Add vim-classic-share version 8.3.0
+
+Packaged in wip by Jeff Frasca
+
+Adapt the vim packaging from 2022Q2 to build the vim-classic, a fork of vim-8.2
diff --git a/vim-classic-share/Makefile.common b/vim-classic-share/Makefile.common
index e0bedd3623..7bac7fbcb4 100644
--- a/vim-classic-share/Makefile.common
+++ b/vim-classic-share/Makefile.common
@@ -5,10 +5,10 @@
 .include "../../wip/vim-classic-share/version.mk"
 
 DISTNAME=		vim-classic-${VIM_VERSION}.${VIM_PATCHLEVEL}
-CATEGORIES=		wip
+CATEGORIES=		editors
 MASTER_SITES=		https://git.sr.ht/~sircmpwn/vim-classic/archive/
-DISTFILES=		2c86ef534c55d9b1e9290cbafb30c4e3227ffc82.tar.gz
-EXTRACT_OPTS_TAR=	-s /2c86ef534c55d9b1e9290cbafb30c4e3227ffc82/8.2.5172/
+DISTFILES=		v8.3.0.tar.gz
+EXTRACT_OPTS_TAR=	-s /v8.3.0/8.3.0/
 
 # vim disables it, sometimes unsuccessfully.
 FORTIFY_SUPPORTED=	no
@@ -23,7 +23,8 @@ CONFLICTS+=		vim-kde-[0-9]*
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=		yes
-USE_LANGUAGES+=		c99
+USE_LANGUAGES+=		c
+USE_CC_FEATURES=	c99
 
 # http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=38710
 CHECK_INTERPRETER_SKIP=	share/vim/${VIM_SUBDIR}/tools/vim132
diff --git a/vim-classic-share/PLIST b/vim-classic-share/PLIST
index 31ba387cae..71abb96e22 100644
--- a/vim-classic-share/PLIST
+++ b/vim-classic-share/PLIST
@@ -90,6 +90,7 @@ share/vim/${VIM_SUBDIR}/compiler/decada.vim
 share/vim/${VIM_SUBDIR}/compiler/dot.vim
 share/vim/${VIM_SUBDIR}/compiler/erlang.vim
 share/vim/${VIM_SUBDIR}/compiler/eruby.vim
+share/vim/${VIM_SUBDIR}/compiler/eslint.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_F.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_cv.vim
 share/vim/${VIM_SUBDIR}/compiler/fortran_elf90.vim
@@ -136,6 +137,7 @@ share/vim/${VIM_SUBDIR}/compiler/sass.vim
 share/vim/${VIM_SUBDIR}/compiler/se.vim
 share/vim/${VIM_SUBDIR}/compiler/splint.vim
 share/vim/${VIM_SUBDIR}/compiler/stack.vim
+share/vim/${VIM_SUBDIR}/compiler/standard.vim
 share/vim/${VIM_SUBDIR}/compiler/tcl.vim
 share/vim/${VIM_SUBDIR}/compiler/tex.vim
 share/vim/${VIM_SUBDIR}/compiler/tidy.vim
@@ -194,6 +196,7 @@ share/vim/${VIM_SUBDIR}/doc/os_390.txt
 share/vim/${VIM_SUBDIR}/doc/os_amiga.txt
 share/vim/${VIM_SUBDIR}/doc/os_beos.txt
 share/vim/${VIM_SUBDIR}/doc/os_dos.txt
+share/vim/${VIM_SUBDIR}/doc/os_haiku.txt
 share/vim/${VIM_SUBDIR}/doc/os_mac.txt
 share/vim/${VIM_SUBDIR}/doc/os_mint.txt
 share/vim/${VIM_SUBDIR}/doc/os_msdos.txt
@@ -297,6 +300,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/alsaconf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ant.vim
 share/vim/${VIM_SUBDIR}/ftplugin/arch.vim
 share/vim/${VIM_SUBDIR}/ftplugin/art.vim
+share/vim/${VIM_SUBDIR}/ftplugin/asm.vim
 share/vim/${VIM_SUBDIR}/ftplugin/aspvbs.vim
 share/vim/${VIM_SUBDIR}/ftplugin/automake.vim
 share/vim/${VIM_SUBDIR}/ftplugin/awk.vim
@@ -342,6 +346,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/dtrace.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dune.vim
 share/vim/${VIM_SUBDIR}/ftplugin/eiffel.vim
 share/vim/${VIM_SUBDIR}/ftplugin/elinks.vim
+share/vim/${VIM_SUBDIR}/ftplugin/elm.vim
 share/vim/${VIM_SUBDIR}/ftplugin/erlang.vim
 share/vim/${VIM_SUBDIR}/ftplugin/eruby.vim
 share/vim/${VIM_SUBDIR}/ftplugin/eterm.vim
@@ -407,6 +412,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/make.vim
 share/vim/${VIM_SUBDIR}/ftplugin/man.vim
 share/vim/${VIM_SUBDIR}/ftplugin/manconf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/markdown.vim
+share/vim/${VIM_SUBDIR}/ftplugin/masm.vim
 share/vim/${VIM_SUBDIR}/ftplugin/matlab.vim
 share/vim/${VIM_SUBDIR}/ftplugin/meson.vim
 share/vim/${VIM_SUBDIR}/ftplugin/mf.vim
@@ -548,6 +554,7 @@ share/vim/${VIM_SUBDIR}/indent/dtd.vim
 share/vim/${VIM_SUBDIR}/indent/dtrace.vim
 share/vim/${VIM_SUBDIR}/indent/dylan.vim
 share/vim/${VIM_SUBDIR}/indent/eiffel.vim
+share/vim/${VIM_SUBDIR}/indent/elm.vim
 share/vim/${VIM_SUBDIR}/indent/erlang.vim
 share/vim/${VIM_SUBDIR}/indent/eruby.vim
 share/vim/${VIM_SUBDIR}/indent/eterm.vim
@@ -618,6 +625,7 @@ share/vim/${VIM_SUBDIR}/indent/sh.vim
 share/vim/${VIM_SUBDIR}/indent/sml.vim
 share/vim/${VIM_SUBDIR}/indent/sql.vim
 share/vim/${VIM_SUBDIR}/indent/sqlanywhere.vim
+share/vim/${VIM_SUBDIR}/indent/sshconfig.vim
 share/vim/${VIM_SUBDIR}/indent/systemd.vim
 share/vim/${VIM_SUBDIR}/indent/systemverilog.vim
 share/vim/${VIM_SUBDIR}/indent/tcl.vim
@@ -770,6 +778,7 @@ share/vim/${VIM_SUBDIR}/syntax/ant.vim
 share/vim/${VIM_SUBDIR}/syntax/antlr.vim
 share/vim/${VIM_SUBDIR}/syntax/apache.vim
 share/vim/${VIM_SUBDIR}/syntax/apachestyle.vim
+share/vim/${VIM_SUBDIR}/syntax/apkbuild.vim
 share/vim/${VIM_SUBDIR}/syntax/aptconf.vim
 share/vim/${VIM_SUBDIR}/syntax/arch.vim
 share/vim/${VIM_SUBDIR}/syntax/arduino.vim
@@ -801,6 +810,7 @@ share/vim/${VIM_SUBDIR}/syntax/bdf.vim
 share/vim/${VIM_SUBDIR}/syntax/bib.vim
 share/vim/${VIM_SUBDIR}/syntax/bindzone.vim
 share/vim/${VIM_SUBDIR}/syntax/blank.vim
+share/vim/${VIM_SUBDIR}/syntax/bsdl.vim
 share/vim/${VIM_SUBDIR}/syntax/bst.vim
 share/vim/${VIM_SUBDIR}/syntax/btm.vim
 share/vim/${VIM_SUBDIR}/syntax/bzl.vim
@@ -902,6 +912,7 @@ share/vim/${VIM_SUBDIR}/syntax/edif.vim
 share/vim/${VIM_SUBDIR}/syntax/eiffel.vim
 share/vim/${VIM_SUBDIR}/syntax/elf.vim
 share/vim/${VIM_SUBDIR}/syntax/elinks.vim
+share/vim/${VIM_SUBDIR}/syntax/elm.vim
 share/vim/${VIM_SUBDIR}/syntax/elmfilt.vim
 share/vim/${VIM_SUBDIR}/syntax/erlang.vim
 share/vim/${VIM_SUBDIR}/syntax/eruby.vim
@@ -935,6 +946,7 @@ share/vim/${VIM_SUBDIR}/syntax/fvwm2m4.vim
 share/vim/${VIM_SUBDIR}/syntax/gdb.vim
 share/vim/${VIM_SUBDIR}/syntax/gdmo.vim
 share/vim/${VIM_SUBDIR}/syntax/gedcom.vim
+share/vim/${VIM_SUBDIR}/syntax/gemtext.vim
 share/vim/${VIM_SUBDIR}/syntax/git.vim
 share/vim/${VIM_SUBDIR}/syntax/gitcommit.vim
 share/vim/${VIM_SUBDIR}/syntax/gitconfig.vim
@@ -1110,6 +1122,7 @@ share/vim/${VIM_SUBDIR}/syntax/openroad.vim
 share/vim/${VIM_SUBDIR}/syntax/opl.vim
 share/vim/${VIM_SUBDIR}/syntax/ora.vim
 share/vim/${VIM_SUBDIR}/syntax/pamconf.vim
+share/vim/${VIM_SUBDIR}/syntax/pamenv.vim
 share/vim/${VIM_SUBDIR}/syntax/papp.vim
 share/vim/${VIM_SUBDIR}/syntax/pascal.vim
 share/vim/${VIM_SUBDIR}/syntax/passwd.vim
diff --git a/vim-classic-share/distinfo b/vim-classic-share/distinfo
index 7088f5fc43..dbbc11568f 100644
--- a/vim-classic-share/distinfo
+++ b/vim-classic-share/distinfo
@@ -1,10 +1,10 @@
 $NetBSD: $
 
-BLAKE2s (2c86ef534c55d9b1e9290cbafb30c4e3227ffc82.tar.gz) = ee16ec80c8ec7d43bc84dbfbece3b1d8fdb843a7fb92263207314924dea5959f
-SHA512 (2c86ef534c55d9b1e9290cbafb30c4e3227ffc82.tar.gz) = 05d098672960885797f0da7f9a014b670d87f874f5baa593ab33768c05577e9ef7175a491b3feb498c03e5e9850005783183798bd4bef7016df163acdf29a49b
-Size (2c86ef534c55d9b1e9290cbafb30c4e3227ffc82.tar.gz) = 14560445 bytes
-SHA1 (patch-Makefile) = 1a6c0f7db80b599b1c6f37f2742da12558d4b94f
-SHA1 (patch-auto_configure) = f12b0ff8f80740289edee0002c49a056c8b08a20
+BLAKE2s (v8.3.0.tar.gz) = 8bdf82229944394aeab069850a81e96f39e7acacb4c2657f31959149e95725cf
+SHA512 (v8.3.0.tar.gz) = 83417abe7989728aa4ed9da26b2779578cbad676f501953eaf04d4b99ea5615e8cf1df129c18c3e745aba7ed065d37c59015bc6461a5e5d4a5ea8a9c0364d7ca
+Size (v8.3.0.tar.gz) = 14767832 bytes
+SHA1 (patch-Makefile) = 81590efc2ae21fb013688d4552a01434f9cd871d
 SHA1 (patch-configure) = 4514af45a71309dabfecb8aae019fdc2e36e45b6
-SHA1 (patch-feature.h) = a6cd7ae6267cb7e28d2a174226ccebb94b49dc16
-SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd
+SHA1 (patch-feature.h) = d179fd090adebdf106a2a9ebac14975295c73aa5
+SHA1 (patch-link.sh) = 8f08006811a3756bfa2cb7529d88b6ff14378d7d
+SHA1 (patch-src_auto_configure) = f12b0ff8f80740289edee0002c49a056c8b08a20
diff --git a/vim-classic-share/options.mk b/vim-classic-share/options.mk
index a5807ac86a..07b5089aeb 100644
--- a/vim-classic-share/options.mk
+++ b/vim-classic-share/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD: $
 
-PKG_SUPPORTED_OPTIONS+=	ruby python perl lua luajit
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vim-classic
+PKG_SUPPORTED_OPTIONS+=	ruby python perl lua luajit
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/vim-classic-share/patches/patch-Makefile b/vim-classic-share/patches/patch-Makefile
index e919094c85..b2d53d4d5f 100644
--- a/vim-classic-share/patches/patch-Makefile
+++ b/vim-classic-share/patches/patch-Makefile
@@ -4,9 +4,9 @@ Handle Xaw support appropiately.
 
 Fix GNUmakeism by not depending on $< in non-suffix rules.
 
---- src/Makefile.orig	2026-03-28 09:43:14.000000000 -0000
-+++ src/Makefile
-@@ -2364,7 +2364,7 @@
+--- src/Makefile.orig	2026-06-03 10:43:57.910250937 -0700
++++ src/Makefile	2026-06-03 10:41:42.141184327 -0700
+@@ -2406,7 +2406,7 @@
  		mv -f tags tags.dist; fi
  	@echo generating help tags
  	-@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \
@@ -15,7 +15,7 @@ Fix GNUmakeism by not depending on $< in non-suffix rules.
  	cd $(HELPSOURCE); \
  		files=`ls *.txt tags`; \
  		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
-@@ -2507,32 +2507,32 @@
+@@ -2549,35 +2549,35 @@
  	      fi
  	-chmod $(FILEMOD) $(DEST_TOOLS)/*
  # replace the path in some tools
@@ -47,6 +47,9 @@ Fix GNUmakeism by not depending on $< in non-suffix rules.
 -	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
 -	-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
 -	-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_TR) "-tr" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_TR_I) "-tr" $(INSTALLMANARGS)
+-	-$(SHELL) ./installman.sh xxd $(DEST_MAN_TR_U) "-tr.UTF-8" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_DA) "-da" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_DA_I) "-da" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_DA_U) "-da.UTF-8" $(INSTALLMANARGS)
@@ -65,6 +68,9 @@ Fix GNUmakeism by not depending on $< in non-suffix rules.
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
 +	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_TR) "-tr" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_TR_I) "-tr" $(INSTALLMANARGS)
++	#-$(SHELL) ./installman.sh xxd $(DEST_MAN_TR_U) "-tr.UTF-8" $(INSTALLMANARGS)
+ 
  
  # install the language specific files, if they were unpacked
- install-languages: languages $(DEST_LANG) $(DEST_KMAP)
diff --git a/vim-classic-share/patches/patch-auto_configure b/vim-classic-share/patches/patch-auto_configure
deleted file mode 100644
index 9419cf23a4..0000000000
--- a/vim-classic-share/patches/patch-auto_configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: $
-
-Buildlink takes care of include files.
-
---- src/auto/configure.orig	2026-03-28 12:14:35.000000000 -0000
-+++ src/auto/configure
-@@ -11157,7 +11157,7 @@
- 
- 
- if test -z "$SKIP_MOTIF"; then
--  gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
-+  gui_XXX="${MOTIFBASE}/include"
-     GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
- 
-   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5
diff --git a/vim-classic-share/patches/patch-feature.h b/vim-classic-share/patches/patch-feature.h
index 42bb437317..18d7924778 100644
--- a/vim-classic-share/patches/patch-feature.h
+++ b/vim-classic-share/patches/patch-feature.h
@@ -1,5 +1,7 @@
 $NetBSD: $
 
+Patch feature.h to allow pkgsrc to retarget system config to the install tree
+
 --- src/feature.h.orig	2019-12-03 21:59:23.000000000 +0000
 +++ src/feature.h
 @@ -814,7 +814,7 @@
diff --git a/vim-classic-share/patches/patch-link.sh b/vim-classic-share/patches/patch-link.sh
index 1985cdff10..549166614d 100644
--- a/vim-classic-share/patches/patch-link.sh
+++ b/vim-classic-share/patches/patch-link.sh
@@ -1,5 +1,7 @@
 $NetBSD: $
 
+Remove iconv from lib list NOTE: this was inherited from the 2022Q2 packaging
+
 --- src/link.sh.orig	2012-05-25 09:25:48.000000000 +0000
 +++ src/link.sh
 @@ -53,7 +53,7 @@ else
diff --git a/vim-classic-share/patches/patch-src_auto_configure b/vim-classic-share/patches/patch-src_auto_configure
new file mode 100644
index 0000000000..9419cf23a4
--- /dev/null
+++ b/vim-classic-share/patches/patch-src_auto_configure
@@ -0,0 +1,15 @@
+$NetBSD: $
+
+Buildlink takes care of include files.
+
+--- src/auto/configure.orig	2026-03-28 12:14:35.000000000 -0000
++++ src/auto/configure
+@@ -11157,7 +11157,7 @@
+ 
+ 
+ if test -z "$SKIP_MOTIF"; then
+-  gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
++  gui_XXX="${MOTIFBASE}/include"
+     GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
+ 
+   { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5
diff --git a/vim-classic-share/version.mk b/vim-classic-share/version.mk
index 5a7e5196d3..f3a8863dd1 100644
--- a/vim-classic-share/version.mk
+++ b/vim-classic-share/version.mk
@@ -1,11 +1,7 @@
 # $NetBSD: $
 
-VIM_VERSION=		8.2
-# XXX This version of vim-classic is Drew Devault's fork.  He's about to cut an
-# 8.3.0 release in April.  When that happens, I'll update the packaging again,
-# as the code changes I saw today (30mar2026) look like they solve most of this
-# and will simplify the distfile situation.
-VIM_PATCHLEVEL=		5172
-VIM_SUBDIR=		vim82
+VIM_VERSION=		8.3
+VIM_PATCHLEVEL=		0
+VIM_SUBDIR=		vim83
 
 PRINT_PLIST_AWK+=	{ gsub(/${VIM_SUBDIR}/, "$${VIM_SUBDIR}"); print; next; }
diff --git a/vim-classic/COMMIT_MSG b/vim-classic/COMMIT_MSG
new file mode 100644
index 0000000000..4c80d56c59
--- /dev/null
+++ b/vim-classic/COMMIT_MSG
@@ -0,0 +1,5 @@
+editors/vim-classic: Add vim-classic version 8.3.0
+
+Packaged in wip by Jeff Frasca
+
+Adapt the vim packaging from 2022Q2 to build the vim-classic, a fork of vim-8.2
diff --git a/vim-classic/DESCR b/vim-classic/DESCR
index 718e993fbb..9a4d0d7c2d 100644
--- a/vim-classic/DESCR
+++ b/vim-classic/DESCR
@@ -7,4 +7,4 @@ If you are building the package from source you may want to enable some
 features such as a perl or python interpreter which are not enabled by
 default.
 
-This version does not contain a gui. 
+This version does not contain a gui.
diff --git a/vim-classic/Makefile b/vim-classic/Makefile
index 7e704891ce..811b2e38b1 100644
--- a/vim-classic/Makefile
+++ b/vim-classic/Makefile
@@ -1,7 +1,5 @@
 # $NetBSD: $
 
-PKGNAME=		vim-classic-${VIM_VERSION}.${VIM_PATCHLEVEL}
-
 COMMENT=		Vim-Classic editor (vi clone) without GUI
 
 .include		"../../wip/vim-classic-share/Makefile.common"
Home | Main Index | Thread Index | Old Index