--- a/components/vim/Makefile Tue Aug 13 08:45:47 2013 -0700
+++ b/components/vim/Makefile Tue Aug 13 09:49:16 2013 -0700
@@ -28,16 +28,15 @@
PATH=/usr/bin:/usr/gnu/bin
COMPONENT_NAME= vim
-COMPONENT_VERSION= 7.3
+COMPONENT_VERSION= 7.4
IPS_COMPONENT_VERSION= $(shell echo $(COMPONENT_HG_REV) | sed -e 's/-/./g' -e 's/v//')
COMPONENT_SRC= vim-$(COMPONENT_HG_REV)
COMPONENT_PROJECT_URL= http://www.vim.org/
COMPONENT_ARCHIVE= vim-$(COMPONENT_HG_REV).tar.bz2
COMPONENT_ARCHIVE_URL= $(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE)
-COMPONENT_ARCHIVE_HASH= sha256:eda12f4f14b6456a579cc9d0ac29ebeecb8ff89ad9d5eb313fab75a751cf59ff
+COMPONENT_ARCHIVE_HASH= sha256:e7f4f411d9ff4c9dbf0ec57cc5da2e9d5e586e69fe3d69f31cbce9118e443507
COMPONENT_HG_URL= https://vim.googlecode.com/hg
-COMPONENT_HG_REV= v7-3-882
-COMPONENT_HG_REV_OLD:= $(COMPONENT_HG_REV)
+COMPONENT_HG_REV= v7-4
COMPONENT_BUGDB= utility/vim
@@ -51,30 +50,26 @@
$(HGREPODIR)/.hg:
hg clone -U $(COMPONENT_HG_URL) $(@D)
-hgball-pull: $(HGREPODIR)/.hg
- hg -R $(HGREPODIR) pull
-
-hgball: COMPONENT_HG_REV = $(shell hg -R $(HGREPODIR) tags | awk '$$1 ~ /^v7-/ {print $$1; exit}')
-
-# Create the tarball. It should contain the working directory of the repo at
-# the desired revision, but not the .hg directory. Note that the digest will
-# be different every time because .hg doesn't set the timestamps of the files
-# in the working directory.
-hgball: hgball-pull
- rm -rf $(TARBALLDIR)
- hg clone -u $(COMPONENT_HG_REV) $(HGREPODIR) $(TARBALLDIR)
- rm -rf $(TARBALLDIR)/.hg
- tar jcf $(COMPONENT_ARCHIVE) $(TARBALLDIR)
- hg --cwd $(HGREPODIR) stat -ar --rev $(COMPONENT_HG_REV_OLD):$(COMPONENT_HG_REV) runtime src/po
- digest=$$(digest -a sha256 $(COMPONENT_ARCHIVE)); \
- /usr/gnu/bin/sed -i \
- -e "s/^COMPONENT_ARCHIVE_HASH=.*/COMPONENT_ARCHIVE_HASH= sha256:$$digest/" \
- -e "s/^COMPONENT_HG_REV=.*/COMPONENT_HG_REV= $(COMPONENT_HG_REV)/" \
- Makefile
+# Create the tarball.
+hgball: $(HGREPODIR)/.hg
+ cd $(HGREPODIR); \
+ hg pull; \
+ if [[ -n "$(COMPONENT_HG_NEWREV)" ]]; then \
+ newrev=$(COMPONENT_HG_NEWREV); \
+ else \
+ newrev=$$(hg tags | awk '$$1 ~ /^v7-/ {print $$1; exit}'); \
+ fi; \
+ hg archive -p vim-$$newrev -r $$newrev ../vim-$$newrev.tar.bz2; \
+ hg stat -ar --rev $(COMPONENT_HG_REV):$$newrev runtime src/po; \
+ digest=$$(digest -a sha256 ../vim-$$newrev.tar.bz2); \
+ $(GSED) -i \
+ -e "s/^COMPONENT_ARCHIVE_HASH=.*/COMPONENT_ARCHIVE_HASH= sha256:$$digest/" \
+ -e "s/^COMPONENT_HG_REV=.*/COMPONENT_HG_REV= $$newrev/" \
+ ../Makefile
PATCH_LEVEL = 0
-PKG_MACROS += VIMVER=vim73
+PKG_MACROS += VIMVER=vim74
ASLR_MODE = $(ASLR_ENABLE)