Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sc8-pr-cvs17:/tmp/cvs-serv6653
Modified Files:
vim.info vim.patch
Log Message:
Welcome to vim-7.1.094
Index: vim.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/vim.info,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- vim.info 14 Aug 2007 01:16:48 -0000 1.26
+++ vim.info 5 Sep 2007 04:48:46 -0000 1.27
@@ -1,23 +1,23 @@
Package: vim
-Version: 7.1.068
+Version: 7.1.094
Revision: 1
Source: http://www.cs.pdx.edu/~htodd/vim-%v.tar.bz2
-Source-MD5: 2ae043985bc835a266ef0f9d17f2fbbc
+Source-MD5: 2e210a05f70b1a4043075a584384ecc6
SourceDirectory: vim7.1
-BuildDepends: libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev,
libncurses5 (>= 5.4-20041023-1006), pkgconfig, glib2-dev (>= 2.6.6-1111),
x11-dev, gtk+2-dev, pango1-xft2-dev, atk1
+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
+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
-Patch: %n.patch
-#SetCFLAGS: -Os
-ConfigureParams: --with-features=big --with-gtk-prefix=%p
--mandir='${prefix}/share/man' --enable-multibyte --enable-cscope
--enable-gui=gtk2 --disable-darwin
-#ConfigureParams: --mandir='%p/share/man' --disable-darwin
--with-tlib=%lib/ncurses --enable-gui=gtk2 --enable-cscope --with-features=huge
--with-gtk-prefix=%p
-CompileScript: (cd src; ./configure %c; make)
+
+PatchScript: sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | patch -p1
+CompileScript: (cd src; make prefix=%p)
#CompileScript: ./configure %c; make
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"
Index: vim.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/vim.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vim.patch 14 Aug 2007 01:16:48 -0000 1.2
+++ vim.patch 5 Sep 2007 04:48:46 -0000 1.3
@@ -1,34 +1,54 @@
-diff -Naur vim7.1.orig/src/Makefile vim7.1/src/Makefile
---- vim7.1.orig/src/Makefile 2007-08-13 11:22:13.000000000 -0700
-+++ vim7.1/src/Makefile 2007-08-13 11:37:04.000000000 -0700
-@@ -357,7 +357,7 @@
- # DARWIN - detecting Mac OS X
- # Uncomment this line when you want to compile a Unix version of Vim on
- # Darwin. None of the Mac specific options or files will be used.
--#CONF_OPT_DARWIN = --disable-darwin
-+CONF_OPT_DARWIN = --disable-darwin
+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"
- # Select the architecture supported. Default is to build for the current
- # platform. Use "both" for a universal binary. That probably doesn't work
-diff -Naur vim7.1.orig/src/auto/configure vim7.1/src/auto/configure
---- vim7.1.orig/src/auto/configure 2007-08-13 11:22:13.000000000 -0700
-+++ vim7.1/src/auto/configure 2007-08-13 11:37:05.000000000 -0700
-@@ -3005,11 +3005,11 @@
- OS_EXTRA_SCR="os_macosx.c os_mac_conv.c";
- OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
- CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
-- if test "x$MACARCH" = "xboth"; then
-+# if test "x$MACARCH" = "xboth"; then
- CPPFLAGS="$CPPFLAGS
-I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
-- else
-- CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
-- fi
-+# else
-+# CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
-+# fi
++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 @@
- echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ # 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
@@ -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'`
@@ -38,19 +58,37 @@
fi
fi
-diff -Naur vim7.1.orig/src/os_unix.c vim7.1/src/os_unix.c
---- vim7.1.orig/src/os_unix.c 2007-08-13 11:22:15.000000000 -0700
-+++ vim7.1/src/os_unix.c 2007-08-13 11:37:05.000000000 -0700
-@@ -754,10 +754,12 @@
- {
- # ifdef HAVE_SIGALTSTACK
- # ifdef __APPLE__
-+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
- /* missing prototype. Adding it to osdef?.h.in doesn't work, because
- * "struct sigaltstack" needs to be declared. */
- extern int sigaltstack __ARGS((const struct sigaltstack *ss, struct
sigaltstack *oss));
- # endif
-+# endif
+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
- # ifdef HAVE_SS_BASE
- sigstk.ss_base = signal_stack;
+ #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
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
