From ab605f3f4abe04acc732ec35c5fca9d5623f5dbc Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 2 Mar 2008 16:01:31 +0000
Subject: + Remove the check for whether you can remove -liconv from the linker
   command line or not -- we want to do what the user specifies via   the
 pkgsrc PREFER_* settings.

+ Drop dependency on ncurses -- vim only wants a termcap library.
  This should fix PR pkg/38110.

+ Add missing dependency on gettext-lib as one of the "normal" feature
  sets is to build with gettext and multi-language support.

Bump the PKGREVISION of vim editor packages to 1.
---
 editors/vim/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'editors/vim')

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 7d9188b57c7..6e091b59e9f 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2008/01/09 13:47:42 martti Exp $
+# $NetBSD: Makefile,v 1.68 2008/03/02 16:01:31 jlam Exp $
 
 PKGNAME=		vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
-#PKGREVISION=		1
+PKGREVISION=		1
 
 COMMENT=		Vim editor (vi clone) without GUI
 
@@ -15,7 +15,7 @@ CONFLICTS+=		vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
 CONFLICTS+=		vim-xaw-[0-9]* vim-kde-[0-9]*
 
 CONFIGURE_ARGS+=	--enable-gui=no --without-x
-CONFIGURE_ARGS+=	--with-tlib=ncurses
+CONFIGURE_ARGS+=	--with-tlib=${BUILDLINK_LIBNAME.termcap}
 
 BUILD_TARGET=		vim
 INSTALL_TARGET=		installvimbin
@@ -27,6 +27,7 @@ post-install:
 	${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
 .endfor
 
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3