diff options
| author | markd <markd> | 2017-01-19 09:54:56 +0000 |
|---|---|---|
| committer | markd <markd> | 2017-01-19 09:54:56 +0000 |
| commit | b700ca89636fd652a6d9c2a5a2e811cd4870c08e (patch) | |
| tree | 54dd127f0fae44ec5b903a91e85a58a438627066 /editors | |
| parent | 41466f731fff81b2283c0e93b7f076366a1f494d (diff) | |
| download | pkgsrc-b700ca89636fd652a6d9c2a5a2e811cd4870c08e.tar.gz | |
Allow system-wide vimrc in PKG_SYSCONFDIR
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vim-share/Makefile.common | 7 | ||||
| -rw-r--r-- | editors/vim-share/distinfo | 4 | ||||
| -rw-r--r-- | editors/vim-share/patches/patch-feature.h | 13 |
3 files changed, 19 insertions, 5 deletions
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common index a0a4dd2e590..8ae8e60ee94 100644 --- a/editors/vim-share/Makefile.common +++ b/editors/vim-share/Makefile.common @@ -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}/../../editors/vim-share/ALTERNATIVES 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 {} \; diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo index 432169fcbfb..9e0a682aab5 100644 --- a/editors/vim-share/distinfo +++ b/editors/vim-share/distinfo @@ -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 bytes 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 diff --git a/editors/vim-share/patches/patch-feature.h b/editors/vim-share/patches/patch-feature.h index 0e11ce9364d..ae88e5b23c8 100644 --- a/editors/vim-share/patches/patch-feature.h +++ b/editors/vim-share/patches/patch-feature.h @@ -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/03 13:20:59 morr Exp $ #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. |