X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils%2Fvim%2FMakefile;h=230b5d4e82eafb40ed34f6c8865e6b7fd4934e87;hb=f49abbcc444ea87d7d3ca60907c8ee4559862f75;hp=92e204cd4a4466d76415c26a8b3dc80378fc1ea6;hpb=24d4284b0ba733e726d7f73288fdda7c8f988519;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index 92e204cd4a..230b5d4e82 100644
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -1,22 +1,23 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vim
-PKG_VERSION:=7.1
-PKG_RELEASE:=2
+PKG_VERSION:=7.3
+PKG_RELEASE:=1
+VIMVER:=73
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.vim.org/pub/vim/unix/
-PKG_MD5SUM:=44c6b4914f38d6f9aa959640b89da329
+PKG_MD5SUM:=5b9510a17074e2b37d8bb38ae09edbf2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)71
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER)
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,22 +31,22 @@ define Package/vim/Default
 endef
 
 define Package/vim
-  $(call Packages/vim/Default)
+  $(call Package/vim/Default)
   TITLE+= (Tiny)
 endef
 
 define Package/vim-full
-  $(call Packages/vim/Default)
+  $(call Package/vim/Default)
   TITLE+= (Normal)
 endef
 
 define Package/vim-runtime
-  $(call Packages/vim/Default)
+  $(call Package/vim/Default)
   TITLE+= (runtime files)
 endef
 
 define Package/vim-help
-  $(call Packages/vim/Default)
+  $(call Package/vim/Default)
   TITLE+= (help files)
 endef
 
@@ -83,19 +84,29 @@ CONFIGURE_ARGS += \
 	--disable-gtktest \
 	--disable-xim \
 	--without-x \
-	--disable-multibyte \
 	--disable-netbeans \
 	--disable-cscope \
 	--disable-gpm \
 	--with-tlib=ncurses
 
+CONFIGURE_VARS += \
+        vim_cv_getcwd_broken=no \
+        vim_cv_memmove_handles_overlap=yes \
+        vim_cv_stat_ignores_slash=yes \
+        vim_cv_tgetent=zero \
+        vim_cv_terminfo=yes \
+        vim_cv_toupper_broken=no \
+        vim_cv_tty_group=root \
+        vim_cv_tty_mode=0620
+
 ifneq ($(CONFIG_PACKAGE_vim),)
 define Build/Compile/vim
 	$(call Build/Configure/Default, \
 	  --with-features=tiny \
+	  --disable-multibyte \
 	 )
 	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 	  DESTDIR="$(PKG_INSTALL_DIR)" \
 	  all
 	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny
@@ -106,19 +117,20 @@ ifneq ($(CONFIG_PACKAGE_vim-full),)
 define Build/Compile/vim-full
 	$(call Build/Configure/Default, \
 	  --with-features=normal \
+	  --enable-multibyte \
 	)
 	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 	  DESTDIR="$(PKG_INSTALL_DIR)" \
 	  all
 	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal
 endef
-endif    
+endif
 
 define Build/Compile/vim-runtime
 	$(MAKE) -C $(PKG_BUILD_DIR)/src DESTDIR="$(PKG_INSTALL_DIR)" installrtbase
-	tar -czf $(PKG_BUILD_DIR)/docs.tgz $(PKG_INSTALL_DIR)/usr/share/vim/vim*/doc 
-	rm -rf $(PKG_INSTALL_DIR)/usr/share/vim/vim*/doc
+	(cd $(PKG_INSTALL_DIR) && tar -cf $(PKG_BUILD_DIR)/docs.tar ./usr/share/vim/vim$(VIMVER)/doc)
+	rm -rf $(PKG_INSTALL_DIR)/usr/share/vim/vim$(VIMVER)/doc
 	rm -rf $(PKG_INSTALL_DIR)/usr/man
 endef
 
@@ -148,33 +160,11 @@ endef
 
 define Package/vim-runtime/install
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)
-	rm -rf $(1)/usr/share/vim/vim*/doc
+	rm -rf $(1)/usr/share/vim/vim$(VIMVER)/doc
 endef
 
 define Package/vim-help/install
-	tar -C $(1) -xzf $(PKG_BUILD_DIR)/docs.tgz 
-endef
-
-define Package/vim-full/postinst
-#!/bin/sh
-  if [ $${IPKG_INSTROOT} != / ]
-  then
-    if [ -d /usr/share/ ]
-      then
-        ln -s $${IPKG_INSTROOT}/usr/share/vim/ /usr/share/
-    fi
-  fi
-endef
-
-define Package/vim/postinst
-#!/bin/sh
-  if [ $${IPKG_INSTROOT} != / ]
-  then
-    if [ -d /usr/share/ ]
-      then
-        ln -s $${IPKG_INSTROOT}/usr/share/vim/vimrc /usr/share/vim/vimrc
-    fi
-  fi
+	tar -C $(1) -xf $(PKG_BUILD_DIR)/docs.tar
 endef
 
 $(eval $(call BuildPackage,vim))