Thu Jan 19 09:54:56 2017 UTC ()
Allow system-wide vimrc in PKG_SYSCONFDIR


(markd)
diff -r1.155 -r1.156 pkgsrc/editors/vim-share/Makefile.common
diff -r1.158 -r1.159 pkgsrc/editors/vim-share/distinfo
diff -r1.2 -r1.3 pkgsrc/editors/vim-share/patches/patch-feature.h
cvs diff -r1.155 -r1.156 pkgsrc/editors/vim-share/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/Makefile.common 2016/11/16 10:38:35 1.155
+++ pkgsrc/editors/vim-share/Makefile.common 2017/01/19 09:54:56 1.156
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.155 2016/11/16 10:38:35 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.156 2017/01/19 09:54:56 markd Exp $
2 2
3# used by editors/vim/Makefile 3# used by editors/vim/Makefile
4# used by editors/vim-gtk2/Makefile 4# used by editors/vim-gtk2/Makefile
5# used by editors/vim-lang/Makefile 5# used by editors/vim-lang/Makefile
6# used by editors/vim-motif/Makefile 6# used by editors/vim-motif/Makefile
7# used by editors/vim-xaw/Makefile 7# used by editors/vim-xaw/Makefile
8 8
9.include "../../editors/vim-share/version.mk" 9.include "../../editors/vim-share/version.mk"
10 10
11DISTNAME= vim-${VIM_VERSION}.${VIM_PATCHLEVEL} 11DISTNAME= vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
12CATEGORIES= editors 12CATEGORIES= editors
13GITHUB_PROJECT= vim 13GITHUB_PROJECT= vim
14GITHUB_TAG= v${VIM_VERSION}.${VIM_PATCHLEVEL} 14GITHUB_TAG= v${VIM_VERSION}.${VIM_PATCHLEVEL}
@@ -46,15 +46,20 @@ PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME @@ -46,15 +46,20 @@ PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME
46PATCHDIR= ${.CURDIR}/../../editors/vim-share/patches 46PATCHDIR= ${.CURDIR}/../../editors/vim-share/patches
47DISTINFO_FILE?= ${.CURDIR}/../../editors/vim-share/distinfo 47DISTINFO_FILE?= ${.CURDIR}/../../editors/vim-share/distinfo
48 48
49.if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon) 49.if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon)
50BUILDLINK_PASSTHRU_DIRS+= /Developer/Headers/FlatCarbon 50BUILDLINK_PASSTHRU_DIRS+= /Developer/Headers/FlatCarbon
51.endif 51.endif
52 52
53.if empty(PKGNAME:Mvim-share*) 53.if empty(PKGNAME:Mvim-share*)
54ALTERNATIVES_SRC= ${.CURDIR}/../../editors/vim-share/ALTERNATIVES 54ALTERNATIVES_SRC= ${.CURDIR}/../../editors/vim-share/ALTERNATIVES
55.else 55.else
56ALTERNATIVES_SRC= 56ALTERNATIVES_SRC=
57.endif 57.endif
58 58
 59SUBST_CLASSES+= sysconfdir
 60SUBST_FILES.sysconfdir= feature.h
 61SUBST_STAGE.sysconfdir= post-patch
 62SUBST_VARS.sysconfdir= PKG_SYSCONFDIR
 63
59post-patch: 64post-patch:
60 find ${WRKDIR} -name '*.orig_dist' -exec rm -f {} \; 65 find ${WRKDIR} -name '*.orig_dist' -exec rm -f {} \;
cvs diff -r1.158 -r1.159 pkgsrc/editors/vim-share/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/distinfo 2017/01/09 19:26:14 1.158
+++ pkgsrc/editors/vim-share/distinfo 2017/01/19 09:54:56 1.159
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.158 2017/01/09 19:26:14 morr Exp $ 1$NetBSD: distinfo,v 1.159 2017/01/19 09:54:56 markd Exp $
2 2
3SHA1 (vim-8.0.0161.tar.gz) = a45c6fabee77bc2494ca39f4f2198e14741d6b5d 3SHA1 (vim-8.0.0161.tar.gz) = a45c6fabee77bc2494ca39f4f2198e14741d6b5d
4RMD160 (vim-8.0.0161.tar.gz) = a6b6a6a43851fd5073fd08a61e80d9c7162c54d1 4RMD160 (vim-8.0.0161.tar.gz) = a6b6a6a43851fd5073fd08a61e80d9c7162c54d1
5SHA512 (vim-8.0.0161.tar.gz) = b64994ec684ad69ab3f144f7caa11973697b676b5f1dc61af9d933f16167381e20a35c39ac5a29d95ff1a1300ba5cf907ce28090d11876335c8d4b20290db242 5SHA512 (vim-8.0.0161.tar.gz) = b64994ec684ad69ab3f144f7caa11973697b676b5f1dc61af9d933f16167381e20a35c39ac5a29d95ff1a1300ba5cf907ce28090d11876335c8d4b20290db242
6Size (vim-8.0.0161.tar.gz) = 12952775 bytes 6Size (vim-8.0.0161.tar.gz) = 12952775 bytes
7SHA1 (patch-Makefile) = 38fc271ce8feaeefbf22595eef8921d652737519 7SHA1 (patch-Makefile) = 38fc271ce8feaeefbf22595eef8921d652737519
8SHA1 (patch-auto_configure) = 58a0d41f257d39f61d7705c65737bd9bcb3bf719 8SHA1 (patch-auto_configure) = 58a0d41f257d39f61d7705c65737bd9bcb3bf719
9SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56 9SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56
10SHA1 (patch-feature.h) = 6fc4b6c07d33af4df44e12af8d1148931a848ef4 10SHA1 (patch-feature.h) = 19c5ac2d7056adf9e6e074732871abc4058a59eb
11SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd 11SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd
cvs diff -r1.2 -r1.3 pkgsrc/editors/vim-share/patches/patch-feature.h (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/patches/patch-feature.h 2016/07/03 13:20:59 1.2
+++ pkgsrc/editors/vim-share/patches/patch-feature.h 2017/01/19 09:54:56 1.3
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-feature.h,v 1.2 2016/07/03 13:20:59 morr Exp $ 1$NetBSD: patch-feature.h,v 1.3 2017/01/19 09:54:56 markd Exp $
2 2
3--- src/feature.h.orig 2012-05-25 09:26:32.000000000 +0000 3--- src/feature.h.orig 2014-12-23 13:34:10.000000000 +0000
4+++ src/feature.h 4+++ src/feature.h
5@@ -548,7 +548,7 @@ 5@@ -548,7 +548,7 @@
6 * (used only with NO_BUILTIN_TCAPS not defined). 6 * (used only with NO_BUILTIN_TCAPS not defined).
7 */ 7 */
8 #ifdef HAVE_TGETENT 8 #ifdef HAVE_TGETENT
9-/* #define NO_BUILTIN_TCAPS */ 9-/* #define NO_BUILTIN_TCAPS */
10+#define NO_BUILTIN_TCAPS 10+#define NO_BUILTIN_TCAPS
11 #endif 11 #endif
12  12
13 #if !defined(NO_BUILTIN_TCAPS) 13 #if !defined(NO_BUILTIN_TCAPS)
 14@@ -931,7 +931,7 @@
 15 /*
 16 * SYS_VIMRC_FILE Name of the system-wide .vimrc file.
 17 */
 18-/* #define SYS_VIMRC_FILE "/etc/vimrc" */
 19+#define SYS_VIMRC_FILE "@PKG_SYSCONFDIR@/vimrc"
 20
 21 /*
 22 * SYS_GVIMRC_FILE Name of the system-wide .gvimrc file.