Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors In directory sc8-pr-cvs17:/tmp/cvs-serv2899
Modified Files: vim.info vim.patch Removed Files: vim-nox.info vim-nox.patch Log Message: merge vim and vim-nox files Index: vim.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/vim.info,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- vim.info 5 Sep 2007 04:48:46 -0000 1.27 +++ vim.info 9 Sep 2007 20:04:47 -0000 1.28 @@ -1,18 +1,35 @@ -Package: vim +Info2: << +Package: vim%type_pkg[-nox] +Type: -nox (boolean) Version: 7.1.094 -Revision: 1 +Revision: 2 Source: http://www.cs.pdx.edu/~htodd/vim-%v.tar.bz2 Source-MD5: 2e210a05f70b1a4043075a584384ecc6 SourceDirectory: vim7.1 -BuildDepends: libgettext3-dev, gettext-bin, gettext-tools, libncurses5 (>= 5.4-20041023-1006), pkgconfig, glib2-dev (>= 2.6.6-1111), x11-dev, gtk+2-dev, pango1-xft2-dev, atk1 +BuildDepends: fink (>= 0.24.12), libgettext3-dev, gettext-bin, gettext-tools, libncurses5 (>= 5.4-20041023-1006), (%type_raw[-nox] = .) pkgconfig, (%type_raw[-nox] = .) glib2-dev (>= 2.6.6-1111), (%type_raw[-nox] = .) x11-dev, (%type_raw[-nox] = .) gtk+2-dev, (%type_raw[-nox] = .) pango1-xft2-dev, (%type_raw[-nox] = .) atk1 BuildConflicts: libiconv-dev -Depends: libgettext3-shlibs, libiconv, ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>= 5.4-20041023-1006), glib2-shlibs (>= 2.6.6-1111), x11, gtk+2-shlibs, pango1-xft2-shlibs, atk1-shlibs -Conflicts: vim-nox -Replaces: vim-nox +Depends: libgettext3-shlibs, libiconv, ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>= 5.4-20041023-1006), (%type_raw[-nox] = .) glib2-shlibs (>= 2.6.6-1111), (%type_raw[-nox] = .) x11, (%type_raw[-nox] = .) gtk+2-shlibs, (%type_raw[-nox] = .) pango1-xft2-shlibs, (%type_raw[-nox] = .) atk1-shlibs +Conflicts: vim, vim-nox +Replaces: vim, vim-nox + +#PatchScript: sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | patch -p1 +PatchFile: %{Ni}.patch +PatchFile-MD5: 2a8ac7af55e36139e62aa5b7d741e538 -PatchScript: sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | patch -p1 -CompileScript: (cd src; make prefix=%p) #CompileScript: ./configure %c; make +#CompileScript: (cd src; make prefix=%p) +CompileScript: << + #!/bin/sh -ev + if [ "%type_raw[-nox]" == "." ]; then + export CONF_OPT_GUI="--enable-gui=gtk2" + fi + if [ "%type_raw[-nox]" == "-nox" ]; then + export CONF_OPT_X="--without-x" + export CONF_OPT_GUI="--disable-gui" + fi + cd src + make prefix=%p CONF_ARGS="--with-gtk-prefix=%p --mandir=%p/share/man --with-prefix=%p" CONF_OPT_CSCOPE="--enable-cscope" CONF_OPT_MULTIBYTE="--enable-multibyte" CONF_OPT_FEAT="--with-features=big" +<< InstallScript: << cd src; make install prefix=%i perl -pi -e 's,%i,%p,g' %i/share/man/man1/* @@ -28,7 +45,9 @@ text selection), and much much more. << DescPort: << -Builds gtk GUI. If you don't have X11, use the vim-nox package. +The vim package builds gtk GUI. If you don't have X11, use the vim-nox package. << Homepage: http://www.vim.org/ Maintainer: H Todd Fujinaka <[EMAIL PROTECTED]> + +<< Index: vim.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/vim.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vim.patch 5 Sep 2007 04:48:46 -0000 1.3 +++ vim.patch 9 Sep 2007 20:04:47 -0000 1.4 @@ -1,51 +1,3 @@ -diff -Naur vim7.1.orig/src/Makefile vim7.1.not-fink/src/Makefile ---- vim7.1.orig/src/Makefile 2007-07-11 14:02:39.000000000 -0700 -+++ vim7.1.not-fink/src/Makefile 2007-08-21 19:24:00.000000000 -0700 -@@ -312,6 +312,8 @@ - # Use this one if you distribute a modified version of Vim. - #CONF_ARGS = --with-modified-by="John Doe" - -+CONF_ARGS = [EMAIL PROTECTED]@ --mandir='@FINKPREFIX@/share/man' [EMAIL PROTECTED]@ -+ - # GUI - For creating Vim with GUI (gvim) (B) - # Uncomment this line when you don't want to get the GUI version, although you - # have GTK, Motif and/or Athena. Also use --without-x if you don't want X11 -@@ -344,7 +346,7 @@ - # If the selected GUI isn't found, the GUI is disabled automatically - #CONF_OPT_GUI = --enable-gui=gtk - #CONF_OPT_GUI = --enable-gui=gtk --disable-gtktest --#CONF_OPT_GUI = --enable-gui=gtk2 -+CONF_OPT_GUI = --enable-gui=gtk2 - #CONF_OPT_GUI = --enable-gui=gtk2 --disable-gtktest - #CONF_OPT_GUI = --enable-gui=gnome - #CONF_OPT_GUI = --enable-gui=gnome2 -@@ -403,7 +405,7 @@ - - # CSCOPE - # Uncomment this when you want to include the Cscope interface. --#CONF_OPT_CSCOPE = --enable-cscope -+CONF_OPT_CSCOPE = --enable-cscope - - # WORKSHOP - Sun Visual Workshop interface. Only works with Motif! - #CONF_OPT_WORKSHOP = --enable-workshop -@@ -421,7 +423,7 @@ - # It's automatically enabled with big features or IME support. - # Note: Compile on a machine where setlocale() actually works, otherwise the - # configure tests may fail. --#CONF_OPT_MULTIBYTE = --enable-multibyte -+CONF_OPT_MULTIBYTE = --enable-multibyte - - # NLS - National Language Support - # Uncomment this when you do not want to support translated messages, even -@@ -456,7 +458,7 @@ - #CONF_OPT_FEAT = --with-features=tiny - #CONF_OPT_FEAT = --with-features=small - #CONF_OPT_FEAT = --with-features=normal --#CONF_OPT_FEAT = --with-features=big -+CONF_OPT_FEAT = --with-features=big - #CONF_OPT_FEAT = --with-features=huge - - # COMPILED BY - For including a specific e-mail address for ":version". diff -Naur vim7.1.orig/src/auto/configure vim7.1.not-fink/src/auto/configure --- vim7.1.orig/src/auto/configure 2007-07-11 14:02:21.000000000 -0700 +++ vim7.1.not-fink/src/auto/configure 2007-08-21 19:24:00.000000000 -0700 --- vim-nox.info DELETED --- --- vim-nox.patch DELETED --- ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits