From 4bc2250050ae9b83470ee94408f0a363a287ba90 Mon Sep 17 00:00:00 2001 From: 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-gtk2/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'editors/vim-gtk2') diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile index a9c5c875c7f..74685487932 100644 --- a/editors/vim-gtk2/Makefile +++ b/editors/vim-gtk2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2008/01/09 13:47:43 martti Exp $ +# $NetBSD: Makefile,v 1.29 2008/03/02 16:01:32 jlam Exp $ PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL} -#PKGREVISION= 1 +PKGREVISION= 1 COMMENT= Vim editor (vi clone) with X11 GTK2 GUI @@ -14,7 +14,7 @@ CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]* CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* CONFIGURE_ARGS+= --enable-gui=gtk2 -CONFIGURE_ARGS+= --with-tlib=ncurses +CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} USE_TOOLS+= pkg-config @@ -36,9 +36,11 @@ 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 "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3