pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vim-classic*: set myself as MAINTAINER, more complete CONFLICTS



Module Name:	pkgsrc-wip
Committed By:	Jeff Frasca <thatguy%jeff-frasca.name@localhost>
Pushed By:	phaedrus
Date:		Mon Apr 6 20:05:06 2026 -0700
Changeset:	6d7449346cbff9dc68b72dedc7c744be23e099c3

Modified Files:
	vim-classic-lang/Makefile
	vim-classic-share/Makefile
	vim-classic-share/Makefile.common

Log Message:
vim-classic*: set myself as MAINTAINER, more complete CONFLICTS

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

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

diffstat:
 vim-classic-lang/Makefile         | 2 ++
 vim-classic-share/Makefile        | 2 ++
 vim-classic-share/Makefile.common | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diffs:
diff --git a/vim-classic-lang/Makefile b/vim-classic-lang/Makefile
index 03c2dc3dcd..06feb2deec 100644
--- a/vim-classic-lang/Makefile
+++ b/vim-classic-lang/Makefile
@@ -8,6 +8,8 @@ COMMENT=	Language files for the vim-classic editor (vi clone)
 
 DEPENDS+=	vim-classic-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../wip/vim-classic-share
 
+CONFLICTS+=		vim-lang-[0-9]*
+
 USE_TOOLS+=	msgfmt
 BUILD_TARGET=	languages
 INSTALL_TARGET=	install-languages
diff --git a/vim-classic-share/Makefile b/vim-classic-share/Makefile
index a494f58ecf..d8a86f2c06 100644
--- a/vim-classic-share/Makefile
+++ b/vim-classic-share/Makefile
@@ -5,6 +5,8 @@ COMMENT=		Data files for the vim-classic editor (vi clone)
 
 .include		"Makefile.common"
 
+CONFLICTS+=		vim-share-[0-9]*
+
 CONFIGURE_ARGS+=	--disable-gui
 CONFIGURE_ARGS+=	--without-x
 
diff --git a/vim-classic-share/Makefile.common b/vim-classic-share/Makefile.common
index 91ef7bd741..e0bedd3623 100644
--- a/vim-classic-share/Makefile.common
+++ b/vim-classic-share/Makefile.common
@@ -15,7 +15,7 @@ FORTIFY_SUPPORTED=	no
 
 .include "../../mk/bsd.prefs.mk"
 
-MAINTAINER=		
+MAINTAINER=		thatguy%jeff-frasca.name@localhost
 HOMEPAGE=		https://vim-classic.org/
 LICENSE=		vim-license OR gnu-gpl-v2
 


Home | Main Index | Thread Index | Old Index