r770 - in x86/branches/utf8-newmake: . etc packages/vim

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Sep 25 07:24:17 PDT 2005


Author: alexander
Date: 2005-09-25 08:24:16 -0600 (Sun, 25 Sep 2005)
New Revision: 770

Modified:
   x86/branches/utf8-newmake/Makefile
   x86/branches/utf8-newmake/etc/vimrc
   x86/branches/utf8-newmake/packages/vim/Makefile
Log:
Built Vim with all upstream patches.
Note: now Vim is built only once, after GTK2


Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile	2005-09-25 08:52:06 UTC (rev 769)
+++ x86/branches/utf8-newmake/Makefile	2005-09-25 14:24:16 UTC (rev 770)
@@ -213,7 +213,7 @@
 	ch-fonts-kochi ch-fonts-arphic update-fontsdir ch-libjpeg ch-libtiff ch-openssh \
 	ch-glib2 ch-libungif ch-imlib ch-imlib2 ch-gc ch-w3m ch-pango ch-atk ch-gtk2 \
 	ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
-	ch-startup-notification stop-here chroot-gvim ch-xfce ch-lua ch-ion ch-irssi \
+	ch-startup-notification ch-vim stop-here ch-xfce ch-lua ch-ion ch-irssi \
 	ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
 	ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
@@ -264,10 +264,6 @@
 	make -C $(PKG)/$* chroot
 	make unmount
 
-gvim: prep-chroot
-	make -C $(PKG)/vim chroot3
-	make unmount
-
 # The targets below can be called manually, but are also used by the
 # scripts internally.
 #==============================================================================
@@ -384,9 +380,6 @@
 	cd /usr/X11R6/lib/X11/fonts/TTF ; /usr/X11R6/bin/mkfontscale ; \
 	/usr/X11R6/bin/mkfontdir ; /usr/bin/fc-cache -f
 
-chroot-gvim: popdev
-	make -C $(PKG)/vim stage3
-
 # Targets to create the iso
 #==============================================================================
 

Modified: x86/branches/utf8-newmake/etc/vimrc
===================================================================
--- x86/branches/utf8-newmake/etc/vimrc	2005-09-25 08:52:06 UTC (rev 769)
+++ x86/branches/utf8-newmake/etc/vimrc	2005-09-25 14:24:16 UTC (rev 770)
@@ -3,12 +3,7 @@
 set nocompatible
 set backspace=2
 syntax on
-if (&term == "iterm") || (&term == "putty")
-  set background=dark
-endif
-if (&term == "xterm") || (&term == "xterm-color")
-  set background=light
-endif
+set background=dark
 set ruler
 
 " End /etc/vimrc

Modified: x86/branches/utf8-newmake/packages/vim/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/vim/Makefile	2005-09-25 08:52:06 UTC (rev 769)
+++ x86/branches/utf8-newmake/packages/vim/Makefile	2005-09-25 14:24:16 UTC (rev 770)
@@ -3,6 +3,7 @@
 NM= vim
 VRS= 6.3
 DIR= $(NM)63
+PATCHLEVEL= 088
 
 FILE= $(NM)-$(VRS).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
@@ -16,46 +17,43 @@
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 97c323f0c6ff807d89e8e3ce64f20101a097f281
 
+URL3= ftp://ftp.vim.org/pub/vim/patches/$(VRS)/
+
 # Targets
 
 include $(ROOT)/scripts/functions
 
-chroot:
-	chroot "$(MP)" $(chenv-pre-bash) \
-	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+patches/$(VRS).$(PATCHLEVEL):
+	mkdir -p patches
+	cd patches ; $(WGET) -np -r -nd $(URL3)
+	cd patches ; sed 's,^MD5 (\(.*\)) = \(.*\),\2  \1,' MD5 | md5sum -c
 
-chroot3:
+chroot:
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make chroot-gvim $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE2) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE2) $(PATCH1) patches/$(VRS).$(PATCHLEVEL)
 	$(std_build)
 	cp $(SRC)/{$(FILE),$(FILE2),$(PATCH1)} $(LFSSRC)
 
 compile-stage2:
-	unpack ../$(FILE2) --strip-components=1
+	cd .. ; unpack $(FILE2)
+	for P in ../patches/$(VRS).* ; do \
+	 if patch -Np0 --dry-run -s -t -b -i $$P >/dev/null ; then \
+	  echo "+ Applying $$P..." && patch -s -Np0 -i $$P ; \
+	 else echo "- Rejecting $$P" ; \
+	 fi ; \
+	done
 	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
-	patch -Np1 -i ../$(PATCH1)
-	./configure --prefix=/usr --enable-multibyte
-	make $(PM)
-	make install
-	ln -sf vim /usr/bin/vi
-	cp $(ROOT)/etc/vimrc /etc
-
-
-stage3: Makefile $(FILE) $(FILE2) $(PATCH1)
-	$(std_build)
-
-compile-stage3:
-	unpack ../$(FILE2) --strip-components=1
-	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 	echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
-	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=/usr --with-features=huge
 	make $(PM)
 	make install
+	rm -f /usr/share/vim/$(DIR)/tutor/tutor.{gr,pl,ru,sk}
+	rm -f /usr/share/vim/$(DIR)/tutor/tutor.??.*
 	ln -sf vim /usr/bin/vi
 	cp $(ROOT)/etc/vimrc /etc
+
 clean:
 	-rm -rf $(DIR)
 




More information about the livecd mailing list