Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors
In directory sc8-pr-cvs17:/tmp/cvs-serv22059

Modified Files:
        vim.info vim.patch 
Removed Files:
        vim-nox.info vim-nox.patch 
Log Message:
backport new (unified!) version


Index: vim.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/vim.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- vim.info    13 Oct 2006 04:12:32 -0000      1.20
+++ vim.info    25 Sep 2007 02:49:31 -0000      1.21
@@ -1,21 +1,39 @@
-Package: vim
-Version: 7.0
-Revision: 1
-Source: ftp://ftp.vim.org/pub/editors/vim/unix/vim-%v.tar.bz2
-Source-MD5: 4ca69757678272f718b1041c810d82d8
-BuildDepends: libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, 
libncurses5, pkgconfig, glib2-dev, x11-dev, gtk+2-dev, pango1-xft2-dev, atk1
-Depends: libgettext3-shlibs, libiconv, ncurses, libncurses5-shlibs, 
glib2-shlibs, x11, gtk+2-shlibs, pango1-xft2-shlibs, atk1-shlibs
-Conflicts: vim-nox
-Replaces: vim-nox
-Patch: %n.patch
-SourceDirectory: vim70
-#SetCFLAGS: -Os
-ConfigureParams: --with-features=big --with-gtk-prefix=%p 
--mandir='${prefix}/share/man' --enable-multibyte --enable-cscope 
--enable-gui=gtk2 --disable-darwin
-CompileScript: (cd src; ./configure %c; make)
+Info2: <<
+Package: vim%type_pkg[-nox]
+Type: -nox (boolean)
+Version: 7.1.116
+Revision: 2
+Source: http://www.cs.pdx.edu/~htodd/vim-%v.tar.bz2
+Source-MD5: 1916d03366e105b1e074607c1ddb46e0
+SourceDirectory: vim7.1
+BuildDepends: fink (>= 0.24.12), libgettext3-dev, gettext-bin, gettext-tools, 
libncurses5 (>= 5.4-20041023-1), (%type_raw[-nox] = .) pkgconfig, 
(%type_raw[-nox] = .) glib2-dev (>= 2.12.0-1), (%type_raw[-nox] = .) x11-dev, 
(%type_raw[-nox] = .) gtk+2-dev, (%type_raw[-nox] = .) pango1-xft2-dev, 
(%type_raw[-nox] = .) atk1
+Depends: libgettext3-shlibs, libiconv, ncurses (>= 5.4-20041023-1), 
libncurses5-shlibs (>= 5.4-20041023-1), (%type_raw[-nox] = .) glib2-shlibs (>= 
2.12.0-1), (%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
+
+#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=%i/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/* 
 <<
+
 DocFiles: README.txt src/INSTALL
 License: Restrictive/Distributable
 Description: Improved version of the editor "vi"
@@ -26,7 +44,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: None <[EMAIL PROTECTED]>
+
+<<

Index: vim.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/vim.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vim.patch   21 Oct 2003 21:49:32 -0000      1.1
+++ vim.patch   25 Sep 2007 02:49:31 -0000      1.2
@@ -1,7 +1,8 @@
---- vim-6.1/src/auto/configure.orig    Sat Aug 31 13:10:39 2002
-+++ vim-6.1/src/auto/configure Sat Aug 31 13:12:26 2002
-@@ -1164,7 +1164,7 @@
- if test -d /usr/local/include; then
+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
+@@ -3427,7 +3427,7 @@
+ if test -z "$have_local_include" -a -d /usr/local/include; then
    tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 
's+-I/usr/local/include$++g'`
    if test "$tt" = "$CPPFLAGS"; then
 -    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -9,3 +10,37 @@
    fi
  fi
  
+diff -Naur vim7.1.orig/src/feature.h vim7.1.not-fink/src/feature.h
+--- vim7.1.orig/src/feature.h  2007-08-05 11:35:48.000000000 -0700
++++ vim7.1.not-fink/src/feature.h      2007-08-21 19:49:53.000000000 -0700
+@@ -1202,6 +1202,7 @@
+  *                    debugger and for tooltips.
+  *                    Only for GUIs where it was implemented.
+  */
++#if 0
+ #if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \
+       || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)) \
+       && (   ((defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE)) \
+@@ -1214,6 +1215,7 @@
+ #  define FEAT_XFONTSET
+ # endif
+ #endif
++#endif
+ 
+ #if defined(FEAT_BEVAL) && (defined(FEAT_GUI_MOTIF) || 
defined(FEAT_GUI_ATHENA))
+ # define FEAT_BEVAL_TIP               /* balloon eval used for toolbar 
tooltip */
+diff -Naur vim7.1.orig/src/vim.h vim7.1.not-fink/src/vim.h
+--- vim7.1.orig/src/vim.h      2007-08-11 09:44:57.000000000 -0700
++++ vim7.1.not-fink/src/vim.h  2007-08-21 20:02:24.000000000 -0700
+@@ -201,9 +201,11 @@
+ #endif
+ 
+ /* The Mac conversion stuff doesn't work under X11. */
++#if 0
+ #if defined(FEAT_MBYTE) && defined(MACOS_X)
+ # define MACOS_CONVERT
+ #endif
++#endif
+ 
+ /* Can't use "PACKAGE" here, conflicts with a Perl include file. */
+ #ifndef VIMPACKAGE

--- 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

Reply via email to