Copy common patch-zb file to the three packages that share it.

Not nice, but IMHO much nicer than the previous
copy-patch-files-just-before-patching-hack.

6 files changed, 35 insertions, 15 deletions

diff --git a/editors/vim-gtk/distinfo b/editors/vim-gtk/distinfo
index 93411a1b82d..ed668ee742f 100644
--- a/editors/vim-gtk/distinfo
+++ b/editors/vim-gtk/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:07 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/22 16:25:57 wiz Exp $
 
 SHA1 (vim-5.7-src.tar.gz) = 71e263e9072118e5e56dad77a4bfbaed363bf591
 Size (vim-5.7-src.tar.gz) = 1230942 bytes
 SHA1 (vim-5.7-rt.tar.gz) = c60c2996547e8b3939cbe744f7d2520b47a9060f
 Size (vim-5.7-rt.tar.gz) = 1098901 bytes
+SHA1 (patch-aa) = 1f38e5291e4803abeed50ffa403ec897ffb856bd
+SHA1 (patch-zb) = c929da81e94120a6540b6a503d40dd9f9ffc83ff
diff --git a/editors/vim-share/patches.common/patch-zb b/editors/vim-gtk/patches/patch-zb
index bb0795f10b5..3ea55cc7d32 100644
--- a/editors/vim-share/patches.common/patch-zb
+++ b/editors/vim-gtk/patches/patch-zb
@@ -1,4 +1,4 @@
-$NetBSD: patch-zb,v 1.2 2000/06/25 11:50:39 pooka Exp $
+$NetBSD: patch-zb,v 1.1 2001/04/22 16:25:58 wiz Exp $
 
 --- feature.h.orig	Wed Mar 29 17:10:34 2000
 +++ feature.h	Sun Jun 25 12:42:47 2000
diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 55bd82efd06..e82ed91f2dc 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile.common,v 1.6 2001/04/19 13:55:17 wiz Exp $
-
+# $NetBSD: Makefile.common,v 1.7 2001/04/22 16:25:58 wiz Exp $
 VIM_VERSION=		5.7
-
 DISTNAME=		vim-${VIM_VERSION}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
@@ -15,12 +13,3 @@ HOMEPAGE=		http://www.vim.org
 
 GNU_CONFIGURE=		yes
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
-
-DISTINFO_FILE=		${.CURDIR}/../vim-share/distinfo
-PATCHDIR=		${WRKDIR}/.patches
-
-pre-patch:
-	@${MKDIR} ${WRKDIR}/.patches
-	@${CP} ${.CURDIR}/../vim-share/patches.common/patch* ${WRKDIR}/.patches
-	@if [ -d ${.CURDIR}/patches ] ; then \
-		${CP} ${.CURDIR}/patches/patch* ${WRKDIR}/.patches ; fi
diff --git a/editors/vim-share/patches/patch-zb b/editors/vim-share/patches/patch-zb
new file mode 100644
index 00000000000..3ea55cc7d32
--- /dev/null
+++ b/editors/vim-share/patches/patch-zb
@@ -0,0 +1,13 @@
+$NetBSD: patch-zb,v 1.1 2001/04/22 16:25:58 wiz Exp $
+
+--- feature.h.orig	Wed Mar 29 17:10:34 2000
++++ feature.h	Sun Jun 25 12:42:47 2000
+@@ -349,7 +349,7 @@
+  *			(used only with NO_BUILTIN_TCAPS not defined).
+  */
+ #ifdef HAVE_TGETENT
+-/* #define NO_BUILTIN_TCAPS */
++#define NO_BUILTIN_TCAPS
+ #endif
+ 
+ #ifndef NO_BUILTIN_TCAPS
diff --git a/editors/vim-xaw/distinfo b/editors/vim-xaw/distinfo
index f0175caf6c1..a8d605c24e3 100644
--- a/editors/vim-xaw/distinfo
+++ b/editors/vim-xaw/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:08 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/22 16:25:59 wiz Exp $
 
 SHA1 (vim-5.7-src.tar.gz) = 71e263e9072118e5e56dad77a4bfbaed363bf591
 Size (vim-5.7-src.tar.gz) = 1230942 bytes
+SHA1 (patch-aa) = 1f38e5291e4803abeed50ffa403ec897ffb856bd
+SHA1 (patch-ad) = ca6e453bc26a29ae327d297accd7ad12f3641aea
+SHA1 (patch-zb) = c929da81e94120a6540b6a503d40dd9f9ffc83ff
diff --git a/editors/vim-xaw/patches/patch-zb b/editors/vim-xaw/patches/patch-zb
new file mode 100644
index 00000000000..14e85a2e5b0
--- /dev/null
+++ b/editors/vim-xaw/patches/patch-zb
@@ -0,0 +1,13 @@
+$NetBSD: patch-zb,v 1.1 2001/04/22 16:25:59 wiz Exp $
+
+--- feature.h.orig	Wed Mar 29 17:10:34 2000
++++ feature.h	Sun Jun 25 12:42:47 2000
+@@ -349,7 +349,7 @@
+  *			(used only with NO_BUILTIN_TCAPS not defined).
+  */
+ #ifdef HAVE_TGETENT
+-/* #define NO_BUILTIN_TCAPS */
++#define NO_BUILTIN_TCAPS
+ #endif
+ 
+ #ifndef NO_BUILTIN_TCAPS