Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a783376f78b9b3620beccaba4067bbbafcd02131)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a783376f78b9b3620beccaba4067bbbafcd02131)
  • Date: Sun, 13 Sep 2015 09:09:49 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

editors/vim/DETAILS | 22 +++++-----------------
editors/vim/HISTORY | 5 +++++
editors/vim/PRE_BUILD | 10 +---------
editors/vim/vim-patches-tarball | 28 ----------------------------
4 files changed, 11 insertions(+), 54 deletions(-)

New commits:
commit a783376f78b9b3620beccaba4067bbbafcd02131
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

editors/vim: version 7.4.865

diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index f42ddc2..840d0ad 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -8,26 +8,14 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=hg_http://vim.googlecode.com/hg:${SPELL}-hg
SOURCE_IGNORE=volatile
else
- XVERSION=7.4
- PATCH_VERSION=843
- VERSION=$XVERSION.$PATCH_VERSION
- PATCHLEVEL=3
- SOURCE=${SPELL}-${XVERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${XVERSION/\./}
- SOURCE_URL[0]=http://ftp.vim.org/pub/vim/unix/${SOURCE}
- SOURCE_URL[1]=ftp://ftp.home.vim.org/pub/vim/unix/${SOURCE}
- SOURCE_URL[2]=ftp://ftp.uk.vim.org/pub/vim/unix/${SOURCE}
- SOURCE_URL[3]=ftp://ftp2.us.vim.org/pub/vim/unix/${SOURCE}
- SOURCE_URL[4]=ftp://ftp.us.vim.org/pub/vim/unix/${SOURCE}
+ VERSION=7.4.865
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL[0]=https://github.com/vim/vim/archive/v${VERSION}.tar.gz
# SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
-
SOURCE_HASH=sha512:65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e
+
SOURCE_HASH=sha512:6432e660a1774cc2b603fee6c916646df52f51491a2525f509732493d2e7b91ae08af656e782deeea08cef7e933d77b2194a5c13a260ad8f7158b3a1e3b56474

- SOURCE2=vim-$XVERSION-patches-001-$PATCH_VERSION.tar.xz
- SOURCE2_URL[0]=http://www.hawo.net/~siflfran/smgl/$SOURCE2
- SOURCE2_URL[1]=http://download.sourcemage.org/grimoire/distro/$SOURCE2
-
SOURCE2_HASH=sha512:9f93b355ba3fcfa0fb72a0b3dd0eb96d8f918da3eb6bb7fada68cae0b515fa99d01ce855f2727492cc6449642285f65b461b9854e8351106bd5f56f67f375993
fi
-
WEB_SITE=http://www.vim.org
LICENSE[0]=http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
ENTERED=20010922
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 35d9b47..b7d535f 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,8 @@
+2015-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.4.865
+ * DETAILS, PRE_BUILD: switch to github
+ * vim-patches-tarball: remove obsolete helper script
+
2015-08-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.4.843

diff --git a/editors/vim/PRE_BUILD b/editors/vim/PRE_BUILD
index e108912..7ce88e7 100755
--- a/editors/vim/PRE_BUILD
+++ b/editors/vim/PRE_BUILD
@@ -1,17 +1,9 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-if [[ "${VIM_BRANCH}" == "scm" ]]
-then
+if [[ "${VIM_BRANCH}" == "scm" ]]; then
message "${MESSAGE_COLOR}Building from SCM...${DEFAULT_COLOR}"
# message "${MESSAGE_COLOR}Fixing if_perl.xs...${DEFAULT_COLOR}" &&
# patch "${SOURCE_DIRECTORY}"/src/if_perl.xs \
# "${SPELL_DIRECTORY}"/if_perl.patch
-else
- message "${MESSAGE_COLOR}Building from stable tarball...${DEFAULT_COLOR}"
- unpack_file 2 &&
- for i in $(seq -w 1 $PATCH_VERSION); do
- message "${MESSAGE_COLOR}applying patch $XVERSION.$i
...${DEFAULT_COLOR}" &&
- patch -p0 < vim-$XVERSION-patches-001-$PATCH_VERSION/$XVERSION.$i
- done
fi
diff --git a/editors/vim/vim-patches-tarball b/editors/vim/vim-patches-tarball
deleted file mode 100755
index 7d460c1..0000000
--- a/editors/vim/vim-patches-tarball
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# creates up-to-date vim patches tarball
-
-VERSION=7.4
-
-wget ftp://ftp.vim.org/pub/vim/patches/${VERSION}/MD5SUMS &&
-LAST=$(tail -n 1 MD5SUMS | cut -f 3 -d " " | cut -f 3 -d .) &&
-
-SOURCE_DIRECTORY=vim-${VERSION}-patches-001-$LAST &&
-DISTFILE=vim-${VERSION}-patches-001-$LAST.tar.xz
-
-mkdir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-
-PATCHES=$(eval echo {001..$LAST}) &&
-
-for i in $PATCHES; do
- wget ftp://ftp.vim.org/pub/vim/patches/${VERSION}/${VERSION}.$i
-done &&
-
-cd .. &&
-
-
-tar cvf - $SOURCE_DIRECTORY | xz -9 > $DISTFILE &&
-
-rm -r $SOURCE_DIRECTORY &&
-
-sha512sum $DISTFILE



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a783376f78b9b3620beccaba4067bbbafcd02131), Florian Franzmann, 09/13/2015

Archive powered by MHonArc 2.6.24.

Top of Page