Author: alexander Date: 2006-06-05 05:33:35 -0600 (Mon, 05 Jun 2006) New Revision: 1575
Modified: trunk/packages/vim/Makefile Log: Upgraded to Vim-7.0 Modified: trunk/packages/vim/Makefile =================================================================== --- trunk/packages/vim/Makefile 2006-06-04 15:21:25 UTC (rev 1574) +++ trunk/packages/vim/Makefile 2006-06-05 11:33:35 UTC (rev 1575) @@ -1,17 +1,25 @@ # Vim Makefile NM= vim -VRS= 6.4 -DIR= $(NM)64 +VRS= 7.0 +DIR= $(NM)70 FILE= $(NM)-$(VRS).tar.bz2 -URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) -SHA-$(FILE)= 4ecc16d704b303db25c52c6bc33ab65e661ace93 +URL-$(FILE)= http://ftp.vim.org/pub/vim/unix/$(FILE) +SHA-$(FILE)= 38ef48cabf942d0dc804a794dcc6f002b9457fc8 FILE2= $(NM)-$(VRS)-lang.tar.gz -URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2) -SHA-$(FILE2)= 4b80d0f2a0643ab942a9297b88a5447f654e998e +URL-$(FILE2)= http://ftp.vim.org/pub/vim/extra/$(FILE2) +SHA-$(FILE2)= 3db6b0004d213490cc00d361835e7a7c685adb52 +PATCH1= $(NM)-$(VRS)-fixes-3.patch +URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) +SHA-$(PATCH1)= 32eb47a09feeb33deeeca7d397aa4580353b1073 + +PATCH2= $(NM)-$(VRS)-mandir-1.patch +URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH2) +SHA-$(PATCH2)= 182f46dfacefdd3bf6f821dea71f90547d414230 + # Targets include $(ROOT)/scripts/functions @@ -24,12 +32,14 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make chroot-gvim $(chbash-post-bash)' -stage2: Makefile $(FILE) $(FILE2) +stage2: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(std_build) cp $(SRC)/{$(FILE),$(FILE2)} $(LFSSRC) compile-stage2: unpack ../$(FILE2) --strip-components=1 + patch -Np1 -i ../$(PATCH1) + patch -Np1 -i ../$(PATCH2) echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h ./configure --prefix=/usr --enable-multibyte make $(PM) @@ -41,11 +51,13 @@ ln -sfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS) cp $(ROOT)/etc/vimrc /etc -stage3: Makefile $(FILE) $(FILE2) +stage3: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(std_build) compile-stage3: unpack ../$(FILE2) --strip-components=1 + patch -Np1 -i ../$(PATCH1) + patch -Np1 -i ../$(PATCH2) echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h ./configure --prefix=/usr --with-features=huge -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
