vim: update to 7.3.600; merge vim-x11 and gvim as subpkgs.

srcpkgs/vim/files/gvim.desktop

@@ -0,0 +1,43 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=gVim
+Name[eo]=VIM-fasado
+Name[sv]=gVim
+Name[xx]=xx
+Comment=GTK2 enhanced vim text editor
+Comment[ar]=محرر نصوص
+Comment[bg]=Текст Редактор
+Comment[de]=Texteditor
+Comment[el]=Διορθωτής Κειμένου
+Comment[eo]=Tekstredaktilo
+Comment[es]=Editor de textos
+Comment[et]=Tekstiredaktor
+Comment[eu]=Testu Editorea
+Comment[fi]=Tekstieditori
+Comment[he]=עורך טקסט
+Comment[is]=Textaritill
+Comment[ja]=テキストエディタ
+Comment[lt]=Teksto redaktorius
+Comment[mt]=Editur tat-test
+Comment[pt_BR]=Editor de Texto
+Comment[ro]=Editor de text
+Comment[ru]=редактор
+Comment[sk]=Textový editor
+Comment[sl]=Urejevalnik besedil
+Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷
+Comment[tr]=Metin Düzenleyici
+Comment[uk]=Редактор текстів
+Comment[vi]=Trình soạn văn bản
+Comment[xx]=xx
+Comment[zh_CN]=文本编辑器
+Comment[zh_TW]=文字編輯器
+GenericName=Text Editor
+Type=Application
+TryExec=gvim
+Exec=gvim
+Icon=gvim
+Terminal=false
+X-MultipleArgs=false
+Categories=GTK;Application;Utility;TextEditor;
+MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-c;text/x-objc;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-php;text/x-php-source;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt;

srcpkgs/vim/gvim.rshlibs

@@ -0,0 +1,15 @@
+libgtk-x11-2.0.so.0
+libgdk-x11-2.0.so.0
+libgdk_pixbuf-2.0.so.0
+libpango-1.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libSM.so.6
+libICE.so.6
+libXt.so.6
+libX11.so.6
+libm.so.6
+libncursesw.so.6
+libacl.so.1
+libdl.so.2
+libc.so.6

srcpkgs/vim/gvim.template

@@ -0,0 +1,19 @@
+# Template file for 'vim-x11'.
+#
+depends="desktop-file-utils hicolor-icon-theme"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+short_desc="VI iMproved - GTK+ GUI"
+long_desc="${long_desc}
+
+ This packages contains gvim, the GTK+ GUI version of vim."
+
+do_install() {
+	cd $wrksrc/gvim
+        sed -i "s|/locolor|/hicolor|g" src/Makefile
+        for d in 16 32 48; do
+                vmkdir usr/share/icons/hicolor/${d}x${d}/apps
+        done
+	make -C src DESTDIR=$DESTDIR installvimbin install-icons
+
+	vinstall ${FILESDIR}/gvim.desktop 644 usr/share/applications
+}

srcpkgs/vim/template

@@ -1,29 +1,66 @@
 # Template file for 'vim'
 pkgname=vim
 _distver=7.3
-_patchver=515
+_patchver=600
 version=${_distver}.${_patchver}
-build_style=gnu-configure
-configure_args="--disable-perlinterp --disable-pythoninterp --disable-rubyinterp
---disable-cscope --disable-workshop --disable-netbeans --disable-sniff
---disable-gpm --disable-hangulinput --disable-xim --enable-gui=no
---without-x --enable-multibyte --with-tlib=ncursesw"
-depends="vim-common>=7.3.515"
-makedepends="mercurial ncurses-devel acl-devel"
 revision=1
+nofetch=yes
+noextract=yes
+subpackages="vim-common vim-x11 gvim"
+depends="vim-common>=$version"
+makedepends="mercurial ncurses-devel acl-devel pkg-config libXt-devel gtk+-devel"
 short_desc="Vim editor (vi clone)"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.vim.org"
+license=""
 long_desc="
  Vim is an almost compatible version of the UNIX editor Vi. Many new features
  have been added: multi level undo, syntax highlighting, command line history,
  on-line help, filename completion, block operations, etc."
 
-nofetch=yes
-noextract=yes
-subpackages="vim-common"
-
-
 do_fetch() {
 	local url="http://code.google.com/p/vim/"
 	hg clone -u v7-3-${_patchver} ${url} ${pkgname}-${version}
 }
+
+pre_configure() {
+	mkdir -p /tmp/vim-x11
+	cp -a $wrksrc/* /tmp/vim-x11
+	mv /tmp/vim-x11 $wrksrc/
+	mkdir -p /tmp/gvim
+	cp -a $wrksrc/* /tmp/gvim
+	mv /tmp/gvim $wrksrc/gvim
+}
+
+do_configure() {
+	local sharedargs="--disable-perlinterp --disable-pythoninterp \
+		--disable-rubyinterp --disable-cscope --disable-workshop \
+		--disable-netbeans --disable-sniff --disable-gpm \
+		--disable-hangulinput --disable-xim --enable-multibyte \
+		--with-tlib=ncursesw"
+
+	# Normal version.
+	cd $wrksrc
+	./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \
+		--enable-gui=no --with-x=no
+
+	# X11 version.
+	cd $wrksrc/vim-x11
+	./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \
+		--enable-gui=no --with-x
+
+	# GTK+ version.
+	cd $wrksrc/gvim
+	./configure ${CONFIGURE_SHARED_ARGS} ${sharedargs} \
+		--enable-gui=gtk2 --with-x --with-vim-name=gvim
+}
+
+do_build() {
+	for f in "" vim-x11 gvim; do
+		cd $wrksrc/$f && make ${makejobs}
+	done
+}
+
+do_install() {
+	make DESTDIR=$DESTDIR install
+}

srcpkgs/vim/vim-common.template

@@ -8,8 +8,6 @@ long_desc="${long_desc}
 noarch=yes
 replaces="vim<=7.2_2"
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/vim ${DESTDIR}/usr/share
+do_install() {
+	vmove usr/share/vim usr/share
 }

srcpkgs/vim/vim-x11.rshlibs

@@ -0,0 +1,9 @@
+libSM.so.6
+libICE.so.6
+libXt.so.6
+libX11.so.6
+libm.so.6
+libncursesw.so.6
+libacl.so.1
+libdl.so.2
+libc.so.6

srcpkgs/vim/vim-x11.template

@@ -0,0 +1,14 @@
+# Template file for 'vim-x11'.
+#
+provides="vim-${version}"
+replaces="vim>=0"
+short_desc="VI iMproved - X11 version"
+long_desc="${long_desc}
+
+ This packages contains vim-x11, the x11 capable version of vim."
+
+do_install() {
+	cd $wrksrc/vim-x11
+	make DESTDIR=$DESTDIR install
+	rm -rf $DESTDIR/usr/share
+}