From 01146deaee007157c9c5dd42a4468fd16cc7a505 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sun, 23 Oct 2016 05:57:05 -0500 Subject: [PATCH] Added patch to enable /etc/vimrc and /etc/gvimrc. Also fixed patch loop. --- Makefile | 11 ++++++----- SRC/patches/01_global_vimrc.patch | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 SRC/patches/01_global_vimrc.patch diff --git a/Makefile b/Makefile index 09c2089..afabb36 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,12 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = +DEPENDS = acl,attr,glibc,ncurses ARCH = x86_64 URL = http://www.vim.org/ DESC = Vim is an advanced text editor that seeks to provide the power of \ the de-facto Unix editor 'Vi', with a more complete feature set. -SNAPVER = sr0 +SNAPVER = sr2 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -44,9 +44,10 @@ $(SRCDIR)/configure: $(ARCHIVE) @touch $(SRCDIR)/configure $(SRCDIR)/src/auto/config.log: $(SRCDIR)/configure - @if [ -f $(PATCHDIR)/*.patch ]; then \ - cd $(SRCDIR) && cat $(PATCHDIR)/*.patch|patch --verbose -Np1; \ - fi + @cd $(SRCDIR) && \ + for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \ + patch --verbose -Np1 -i $$patch; \ + done @cd $(SRCDIR); \ ./configure \ --prefix=/usr \ diff --git a/SRC/patches/01_global_vimrc.patch b/SRC/patches/01_global_vimrc.patch new file mode 100644 index 0000000..4427dab --- /dev/null +++ b/SRC/patches/01_global_vimrc.patch @@ -0,0 +1,18 @@ +diff -Naur a/src/feature.h b/src/feature.h +--- a/src/feature.h 2016-09-06 14:18:24.000000000 -0500 ++++ b/src/feature.h 2016-10-23 05:47:56.716000000 -0500 +@@ -933,12 +933,12 @@ + /* + * SYS_VIMRC_FILE Name of the system-wide .vimrc file. + */ +-/* #define SYS_VIMRC_FILE "/etc/vimrc" */ ++#define SYS_VIMRC_FILE "/etc/vimrc" + + /* + * SYS_GVIMRC_FILE Name of the system-wide .gvimrc file. + */ +-/* #define SYS_GVIMRC_FILE "/etc/gvimrc" */ ++#define SYS_GVIMRC_FILE "/etc/gvimrc" + + /* + * DFLT_HELPFILE Name of the help file.