* Update ncurses dependency.

    * Find termcap.h from ncurses.

2 files changed, 38 insertions, 106 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 87657a03fe9..2e8de68fae0 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,22 +1,26 @@
-# $NetBSD: Makefile,v 1.16 1999/04/27 22:27:14 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/07/06 08:00:50 jlam Exp $
 
-DISTNAME=	vim-5.3
-CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.oce.nl/pub/vim/unix/ \
-		ftp://ftp.vim.org/pub/misc/editors/vim/unix/ \
-		ftp://uiarchive.uiuc.edu/pub/packages/vim/ \
-		ftp://ftp.progsoc.uts.edu.au/pub/vim/unix/
-DISTFILES=	vim-5.3-src.tar.gz vim-5.3-rt.tar.gz
+DISTNAME=		vim-5.3
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
+CATEGORIES=		editors
+MASTER_SITES=		ftp://ftp.oce.nl/pub/vim/unix/ \
+			ftp://ftp.vim.org/pub/misc/editors/vim/unix/ \
+			ftp://uiarchive.uiuc.edu/pub/packages/vim/ \
+			ftp://ftp.progsoc.uts.edu.au/pub/vim/unix/
+DISTFILES=		vim-5.3-src.tar.gz vim-5.3-rt.tar.gz
+DISTFILES=		${DISTNAME}-src${EXTRACT_SUFX} \
+			${DISTNAME}-rt${EXTRACT_SUFX}
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.vim.org/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.vim.org/
 
-DEPENDS=	ncurses-1.9.9g:../../devel/ncurses
+DEPENDS=		ncurses-4.2:../../devel/ncurses
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
 CONFIGURE_ARGS+=	--enable-gui=athena --with-tlib=ncurses
-LDFLAGS+=		"-L${LOCALBASE}/lib"
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
+CPPFLAGS+=		-I${LOCALBASE}/include	# for ncurses' termcap.h
+LDFLAGS+=		-L${LOCALBASE}/lib	# for -lncurses
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim/patches/patch-aa b/editors/vim/patches/patch-aa
index ae076e48291..2a599be4fe9 100644
--- a/editors/vim/patches/patch-aa
+++ b/editors/vim/patches/patch-aa
@@ -1,94 +1,22 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:33 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/07/06 08:00:50 jlam Exp $
 
---- configure.orig	Tue Apr  7 08:05:44 1998
-+++ configure	Tue Apr 21 23:38:17 1998
-@@ -9,7 +9,7 @@
- 
- # Defaults:
- ac_help=
--ac_default_prefix=/usr/local
-+ac_default_prefix=${prefix}
- # Any additions from configure.in:
- ac_help="$ac_help
-   --enable-perlinterp     Include Perl interpreter."
-@@ -1327,25 +1327,25 @@
-     /usr/include/X11R5        \
-     /usr/include/X11R4        \
-                               \
--    /usr/local/X11/include    \
--    /usr/local/X11R6/include  \
--    /usr/local/X11R5/include  \
--    /usr/local/X11R4/include  \
-+    ${prefix}/X11/include    \
-+    ${prefix}/X11R6/include  \
-+    ${prefix}/X11R5/include  \
-+    ${prefix}/X11R4/include  \
-                               \
--    /usr/local/include/X11    \
--    /usr/local/include/X11R6  \
--    /usr/local/include/X11R5  \
--    /usr/local/include/X11R4  \
-+    ${prefix}/include/X11    \
-+    ${prefix}/include/X11R6  \
-+    ${prefix}/include/X11R5  \
-+    ${prefix}/include/X11R4  \
-                               \
-     /usr/X386/include         \
-     /usr/x386/include         \
-     /usr/XFree86/include/X11  \
-                               \
-     /usr/include              \
--    /usr/local/include        \
-+    ${prefix}/include        \
-     /usr/unsupported/include  \
-     /usr/athena/include       \
--    /usr/local/x11r5/include  \
-+    ${prefix}/x11r5/include  \
-     /usr/lpp/Xamples/include  \
-                               \
-     /usr/openwin/include      \
-@@ -1402,25 +1402,25 @@
-     /usr/lib/X11R5        \
-     /usr/lib/X11R4        \
-                           \
--    /usr/local/X11/lib    \
--    /usr/local/X11R6/lib  \
--    /usr/local/X11R5/lib  \
--    /usr/local/X11R4/lib  \
-+    ${prefix}/X11/lib    \
-+    ${prefix}/X11R6/lib  \
-+    ${prefix}/X11R5/lib  \
-+    ${prefix}/X11R4/lib  \
-                           \
--    /usr/local/lib/X11    \
--    /usr/local/lib/X11R6  \
--    /usr/local/lib/X11R5  \
--    /usr/local/lib/X11R4  \
-+    ${prefix}/lib/X11    \
-+    ${prefix}/lib/X11R6  \
-+    ${prefix}/lib/X11R5  \
-+    ${prefix}/lib/X11R4  \
-                           \
-     /usr/X386/lib         \
-     /usr/x386/lib         \
-     /usr/XFree86/lib/X11  \
-                           \
-     /usr/lib              \
--    /usr/local/lib        \
-+    ${prefix}/lib        \
-     /usr/unsupported/lib  \
-     /usr/athena/lib       \
--    /usr/local/x11r5/lib  \
-+    ${prefix}/x11r5/lib  \
-     /usr/lpp/Xamples/lib  \
-     /lib/usr/lib/X11	  \
-                           \
-@@ -2280,7 +2280,7 @@
- 
- 
- if test -z "$SKIP_MOTIF"; then
--  gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` /local/Motif*/include /local/include/Motif* /usr/local/Motif*/include /usr/local/include/Motif* /usr/include/Motif* /usr/Motif*/include /usr/local/include /usr/local/X11*/include /usr/include /usr/X11*/include /usr/include/X11* /usr/dt/include $MOTIFHOME/include $GUI_INC_LOC"
-+  gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` /local/Motif*/include /local/include/Motif* ${prefix}/Motif*/include ${prefix}/include/Motif* /usr/include/Motif* /usr/Motif*/include ${prefix}/include ${prefix}/X11*/include /usr/include /usr/X11*/include /usr/include/X11* /usr/dt/include $MOTIFHOME/include $GUI_INC_LOC"
-   echo $ac_n "checking for location of Motif GUI includes""... $ac_c" 1>&6
- echo "configure:2286: checking for location of Motif GUI includes" >&5
-   GUI_INC_LOC=
+--- configure.orig	Sun Aug 23 14:00:40 1998
++++ configure	Fri Jul  2 07:26:56 1999
+@@ -1507,6 +1507,8 @@
+   # 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               \
++    ${X11BASE}/include        \
++                              \
+     /usr/X11/include          \
+     /usr/X11R6/include        \
+     /usr/X11R5/include        \
+@@ -1582,6 +1584,8 @@
+ # 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/` \
++    ${X11BASE}/lib        \
++                          \
+     /usr/X11/lib          \
+     /usr/X11R6/lib        \
+     /usr/X11R5/lib        \