diff options
Diffstat (limited to 'editors')
-rw-r--r-- | editors/vim-gtk/distinfo | 6 | ||||
-rw-r--r-- | editors/vim-gtk/patches/patch-aa | 20 | ||||
-rw-r--r-- | editors/vim-gtk/patches/patch-zb | 13 | ||||
-rw-r--r-- | editors/vim-share/Makefile.common | 5 | ||||
-rw-r--r-- | editors/vim-share/distinfo | 5 | ||||
-rw-r--r-- | editors/vim-xaw/distinfo | 7 | ||||
-rw-r--r-- | editors/vim-xaw/patches/patch-aa | 20 | ||||
-rw-r--r-- | editors/vim-xaw/patches/patch-ad | 42 | ||||
-rw-r--r-- | editors/vim-xaw/patches/patch-zb | 13 | ||||
-rw-r--r-- | editors/vim/distinfo | 5 | ||||
-rw-r--r-- | editors/vim/patches/patch-zb | 13 |
11 files changed, 8 insertions, 141 deletions
diff --git a/editors/vim-gtk/distinfo b/editors/vim-gtk/distinfo deleted file mode 100644 index cfb481e2968..00000000000 --- a/editors/vim-gtk/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.5 2001/10/04 10:18:11 martti Exp $ - -SHA1 (vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a -Size (vim-6.0.tar.bz2) = 2776551 bytes -SHA1 (patch-aa) = 1cae1dd34074204c2d673a5013a2e3b0a11c663b -SHA1 (patch-zb) = 466456c472aa62785e81724aae4646650330da9c diff --git a/editors/vim-gtk/patches/patch-aa b/editors/vim-gtk/patches/patch-aa deleted file mode 100644 index efde2b368c4..00000000000 --- a/editors/vim-gtk/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2001/10/04 10:18:12 martti Exp $ - ---- auto/configure.orig Thu Oct 4 10:02:00 2001 -+++ auto/configure Thu Oct 4 10:02:49 2001 -@@ -2212,6 +2212,7 @@ - # Look for the header file in a standard set of common directories. - # Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ -+ ${BUILDLINK_X11_DIR}/include \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ -@@ -2287,6 +2288,7 @@ - # First see if replacing the include by lib works. - # Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ -+ ${BUILDLINK_X11_DIR}/lib \ - /usr/X11/lib \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ diff --git a/editors/vim-gtk/patches/patch-zb b/editors/vim-gtk/patches/patch-zb deleted file mode 100644 index 2a189d6cd8a..00000000000 --- a/editors/vim-gtk/patches/patch-zb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-zb,v 1.3 2001/10/04 10:18:12 martti Exp $ - ---- feature.h.orig Tue Sep 25 20:51:26 2001 -+++ feature.h Thu Oct 4 09:44:15 2001 -@@ -489,7 +489,7 @@ - * (used only with NO_BUILTIN_TCAPS not defined). - */ - #ifdef HAVE_TGETENT --/* #define NO_BUILTIN_TCAPS */ -+#define NO_BUILTIN_TCAPS - #endif - - #if !defined(NO_BUILTIN_TCAPS) && !defined(FEAT_GUI_W16) diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common index d4ffc60d7e4..a1df1e34359 100644 --- a/editors/vim-share/Makefile.common +++ b/editors/vim-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2001/10/04 10:18:12 martti Exp $ +# $NetBSD: Makefile.common,v 1.11 2001/10/04 12:38:02 agc Exp $ VIM_VERSION= 6.0 DISTNAME= vim-${VIM_VERSION} CATEGORIES= editors @@ -12,3 +12,6 @@ HOMEPAGE= http://www.vim.org/ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/vim60/src + +PATCHDIR?= ${.CURDIR}/../vim-share/patches +DISTINFO_FILE?= ${.CURDIR}/../vim-share/distinfo diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo index a92cddd3704..45e31b5c988 100644 --- a/editors/vim-share/distinfo +++ b/editors/vim-share/distinfo @@ -1,4 +1,7 @@ -$NetBSD: distinfo,v 1.6 2001/10/04 11:34:14 martti Exp $ +$NetBSD: distinfo,v 1.7 2001/10/04 12:38:03 agc Exp $ SHA1 (vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a Size (vim-6.0.tar.bz2) = 2776551 bytes +SHA1 (patch-aa) = 1cae1dd34074204c2d673a5013a2e3b0a11c663b +SHA1 (patch-ad) = 2a1668bde592e75a1c001dea5b16b65a4c6ce780 +SHA1 (patch-zb) = 466456c472aa62785e81724aae4646650330da9c diff --git a/editors/vim-xaw/distinfo b/editors/vim-xaw/distinfo deleted file mode 100644 index aa2415fa53a..00000000000 --- a/editors/vim-xaw/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.6 2001/10/04 10:18:13 martti Exp $ - -SHA1 (vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a -Size (vim-6.0.tar.bz2) = 2776551 bytes -SHA1 (patch-aa) = 1cae1dd34074204c2d673a5013a2e3b0a11c663b -SHA1 (patch-ad) = 72e873105060fac0909e2a22de98b401c27f0767 -SHA1 (patch-zb) = 466456c472aa62785e81724aae4646650330da9c diff --git a/editors/vim-xaw/patches/patch-aa b/editors/vim-xaw/patches/patch-aa deleted file mode 100644 index efa2b809118..00000000000 --- a/editors/vim-xaw/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2001/10/04 10:18:13 martti Exp $ - ---- auto/configure.orig Thu Oct 4 10:02:00 2001 -+++ auto/configure Thu Oct 4 10:02:49 2001 -@@ -2212,6 +2212,7 @@ - # Look for the header file in a standard set of common directories. - # Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ -+ ${BUILDLINK_X11_DIR}/include \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ -@@ -2287,6 +2288,7 @@ - # First see if replacing the include by lib works. - # Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ -+ ${BUILDLINK_X11_DIR}/lib \ - /usr/X11/lib \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ diff --git a/editors/vim-xaw/patches/patch-ad b/editors/vim-xaw/patches/patch-ad deleted file mode 100644 index 0ef47e1bf2f..00000000000 --- a/editors/vim-xaw/patches/patch-ad +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2001/10/04 10:18:13 martti Exp $ - ---- Makefile.orig Wed Sep 26 14:10:59 2001 -+++ Makefile Thu Oct 4 10:08:55 2001 -@@ -990,26 +990,29 @@ - ### Athena GUI - ### Use Xaw3d to make the menus look a little bit nicer - #XAW_LIB = -lXaw3d --XAW_LIB = -lXaw -+#XAW_LIB = -lXaw - - ### When using Xaw3d, uncomment/comment the following lines to also get the - ### scrollbars from Xaw3d. --#ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c --#ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \ --# objects/pty.o objects/gui_at_fs.o --#ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \ --# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \ --# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb -+.if ($(XAW_LIB) != "Xaw") -+ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_at_fs.c -+ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \ -+ objects/pty.o objects/gui_at_fs.o -+ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \ -+ -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \ -+ -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb -+.else - ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \ - gui_at_sb.c gui_at_fs.c - ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \ - objects/pty.o objects/gui_beval.o \ - objects/gui_at_sb.o objects/gui_at_fs.o - ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) -+.endif - - ATHENA_IPATH = $(GUI_INC_LOC) - ATHENA_LIBS_DIR = $(GUI_LIB_LOC) --ATHENA_LIBS1 = $(XAW_LIB) -+ATHENA_LIBS1 = ${LIBXAW} - ATHENA_LIBS2 = -lXt - ATHENA_TARGETS = installglinks - ATHENA_MAN_TARGETS = installghelplinks diff --git a/editors/vim-xaw/patches/patch-zb b/editors/vim-xaw/patches/patch-zb deleted file mode 100644 index ac041ee3b50..00000000000 --- a/editors/vim-xaw/patches/patch-zb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-zb,v 1.3 2001/10/04 10:18:13 martti Exp $ - ---- feature.h.orig Tue Sep 25 20:51:26 2001 -+++ feature.h Thu Oct 4 09:44:15 2001 -@@ -489,7 +489,7 @@ - * (used only with NO_BUILTIN_TCAPS not defined). - */ - #ifdef HAVE_TGETENT --/* #define NO_BUILTIN_TCAPS */ -+#define NO_BUILTIN_TCAPS - #endif - - #if !defined(NO_BUILTIN_TCAPS) && !defined(FEAT_GUI_W16) diff --git a/editors/vim/distinfo b/editors/vim/distinfo deleted file mode 100644 index 389b6f6d818..00000000000 --- a/editors/vim/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.4 2001/10/04 10:18:11 martti Exp $ - -SHA1 (vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a -Size (vim-6.0.tar.bz2) = 2776551 bytes -SHA1 (patch-zb) = 466456c472aa62785e81724aae4646650330da9c diff --git a/editors/vim/patches/patch-zb b/editors/vim/patches/patch-zb deleted file mode 100644 index a0767156331..00000000000 --- a/editors/vim/patches/patch-zb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-zb,v 1.2 2001/10/04 10:18:11 martti Exp $ - ---- feature.h.orig Tue Sep 25 20:51:26 2001 -+++ feature.h Thu Oct 4 09:44:15 2001 -@@ -489,7 +489,7 @@ - * (used only with NO_BUILTIN_TCAPS not defined). - */ - #ifdef HAVE_TGETENT --/* #define NO_BUILTIN_TCAPS */ -+#define NO_BUILTIN_TCAPS - #endif - - #if !defined(NO_BUILTIN_TCAPS) && !defined(FEAT_GUI_W16) |