CVS commit: pkgsrc/editors/vim-share

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Jan 19 09:54:56 UTC 2017

Modified Files:
        pkgsrc/editors/vim-share: Makefile.common distinfo
        pkgsrc/editors/vim-share/patches: patch-feature.h

Log Message:
Allow system-wide vimrc in PKG_SYSCONFDIR


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 pkgsrc/editors/vim-share/Makefile.common
cvs rdiff -u -r1.158 -r1.159 pkgsrc/editors/vim-share/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/vim-share/patches/patch-feature.h

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

Modified files:

Index: pkgsrc/editors/vim-share/Makefile.common
diff -u pkgsrc/editors/vim-share/Makefile.common:1.155 pkgsrc/editors/vim-share/Makefile.common:1.156
--- pkgsrc/editors/vim-share/Makefile.common:1.155      Wed Nov 16 10:38:35 2016
+++ pkgsrc/editors/vim-share/Makefile.common    Thu Jan 19 09:54:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.155 2016/11/16 10:38:35 wiz Exp $
+# $NetBSD: Makefile.common,v 1.156 2017/01/19 09:54:56 markd Exp $
 
 # used by editors/vim/Makefile
 # used by editors/vim-gtk2/Makefile
@@ -56,5 +56,10 @@ ALTERNATIVES_SRC=    ${.CURDIR}/../../edito
 ALTERNATIVES_SRC=
 .endif
 
+SUBST_CLASSES+=                sysconfdir
+SUBST_FILES.sysconfdir=        feature.h
+SUBST_STAGE.sysconfdir=        post-patch
+SUBST_VARS.sysconfdir= PKG_SYSCONFDIR
+
 post-patch:
        find ${WRKDIR} -name '*.orig_dist' -exec rm -f {} \;

Index: pkgsrc/editors/vim-share/distinfo
diff -u pkgsrc/editors/vim-share/distinfo:1.158 pkgsrc/editors/vim-share/distinfo:1.159
--- pkgsrc/editors/vim-share/distinfo:1.158     Mon Jan  9 19:26:14 2017
+++ pkgsrc/editors/vim-share/distinfo   Thu Jan 19 09:54:56 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.158 2017/01/09 19:26:14 morr Exp $
+$NetBSD: distinfo,v 1.159 2017/01/19 09:54:56 markd Exp $
 
 SHA1 (vim-8.0.0161.tar.gz) = a45c6fabee77bc2494ca39f4f2198e14741d6b5d
 RMD160 (vim-8.0.0161.tar.gz) = a6b6a6a43851fd5073fd08a61e80d9c7162c54d1
@@ -7,5 +7,5 @@ Size (vim-8.0.0161.tar.gz) = 12952775 by
 SHA1 (patch-Makefile) = 38fc271ce8feaeefbf22595eef8921d652737519
 SHA1 (patch-auto_configure) = 58a0d41f257d39f61d7705c65737bd9bcb3bf719
 SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56
-SHA1 (patch-feature.h) = 6fc4b6c07d33af4df44e12af8d1148931a848ef4
+SHA1 (patch-feature.h) = 19c5ac2d7056adf9e6e074732871abc4058a59eb
 SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd

Index: pkgsrc/editors/vim-share/patches/patch-feature.h
diff -u pkgsrc/editors/vim-share/patches/patch-feature.h:1.2 pkgsrc/editors/vim-share/patches/patch-feature.h:1.3
--- pkgsrc/editors/vim-share/patches/patch-feature.h:1.2        Sun Jul  3 13:20:59 2016
+++ pkgsrc/editors/vim-share/patches/patch-feature.h    Thu Jan 19 09:54:56 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-feature.h,v 1.2 2016/07/03 13:20:59 morr Exp $
+$NetBSD: patch-feature.h,v 1.3 2017/01/19 09:54:56 markd Exp $
 
---- src/feature.h.orig 2012-05-25 09:26:32.000000000 +0000
+--- src/feature.h.orig 2014-12-23 13:34:10.000000000 +0000
 +++ src/feature.h
 @@ -548,7 +548,7 @@
   *                    (used only with NO_BUILTIN_TCAPS not defined).
@@ -11,3 +11,12 @@ $NetBSD: patch-feature.h,v 1.2 2016/07/0
  #endif
  
  #if !defined(NO_BUILTIN_TCAPS)
+@@ -931,7 +931,7 @@
+ /*
+  * SYS_VIMRC_FILE     Name of the system-wide .vimrc file.
+  */
+-/* #define SYS_VIMRC_FILE     "/etc/vimrc" */
++#define SYS_VIMRC_FILE        "@PKG_SYSCONFDIR@/vimrc"
+ 
+ /*
+  * SYS_GVIMRC_FILE    Name of the system-wide .gvimrc file.