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

srcpkgs/gvim

@@ -0,0 +1 @@
+vim

srcpkgs/gvim/template

@@ -1,30 +0,0 @@
-# Build template file for 'gvim'.
-#
-# Source vim template and overwrite some vars, it's stupid
-# to duplicate all this stuff again!
-#
-. ${XBPS_SRCPKGDIR}/vim/template
-unset subpackages revision
-
-pkgname=gvim
-revision=1
-configure_args="${configure_args} --enable-gui=gtk2 --with-x --with-vim-name=gvim"
-make_install_target="-C src DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} installvimbin install-icons"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-depends="desktop-file-utils hicolor-icon-theme"
-makedepends="mercurial pkg-config gtk+-devel"
-short_desc="${short_desc} (GTK+ GUI)"
-long_desc="${long_desc}
-
- This packages contains gvim, the GTK+ GUI version of vim."
-
-pre_install() {
-	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
-}
-
-post_install() {
-	vinstall ${FILESDIR}/gvim.desktop 644 usr/share/applications
-}

srcpkgs/vim-x11

@@ -0,0 +1 @@
+vim

srcpkgs/vim-x11/template

@@ -1,25 +0,0 @@
-# Build template file for 'vim-x11'.
-#
-# Source vim template and overwrite some vars, it's stupid
-# to duplicate all this stuff again!
-#
-. ${XBPS_SRCPKGDIR}/vim/template
-unset subpackages
-pkgname=vim-x11
-configure_args="${configure_args} --enable-gui=no --with-x"
-depends="vim-common>=7.3.515"
-makedepends="mercurial ncurses-devel acl-devel pkg-config libXt-devel"
-revision=1
-short_desc="${short_desc} (x11)"
-long_desc="${long_desc}
-
- This packages contains vim-x11, the x11 capable version of vim."
-
-provides="vim-${version}"
-replaces="vim>=${version}"
-build_requires=11
-
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/share
-}

srcpkgs/vim/gvim.rshlibs

@@ -10,5 +10,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.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
+}