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-gtk/Makefile | 10 ++++++---- editors/vim-gtk2/Makefile | 10 ++++++---- editors/vim-kde/Makefile | 10 ++++++---- editors/vim-motif/Makefile | 11 ++++++----- editors/vim-share/distinfo | 3 ++- editors/vim-share/patches/patch-af | 13 +++++++++++++ editors/vim-xaw/Makefile | 11 ++++++----- editors/vim/Makefile | 9 +++++---- 8 files changed, 50 insertions(+), 27 deletions(-) create mode 100644 editors/vim-share/patches/patch-af (limited to 'editors') diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index 8a55f490f69..090951db399 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2008/01/09 13:47:43 martti Exp $ +# $NetBSD: Makefile,v 1.58 2008/03/02 16:01:32 jlam Exp $ PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL} -#PKGREVISION= 1 +PKGREVISION= 1 COMMENT= Vim editor (vi clone) with X11 GTK+ GUI @@ -14,7 +14,7 @@ CONFLICTS+= vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]* CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* CONFIGURE_ARGS+= --enable-gui=gtk -CONFIGURE_ARGS+= --with-tlib=ncurses +CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} BUILD_TARGET= vim INSTALL_TARGET= installvimbin @@ -34,8 +34,10 @@ 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/gtk/buildlink3.mk" +.include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" 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" diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile index 40342bb49d7..37a0c81ed90 100644 --- a/editors/vim-kde/Makefile +++ b/editors/vim-kde/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2008/01/18 05:06:32 tnn Exp $ +# $NetBSD: Makefile,v 1.51 2008/03/02 16:01:32 jlam Exp $ DISTNAME= kvim-${KVIM_VERSION} PKGNAME= vim-kde-${KVIM_VERSION} -PKGREVISION= 15 +PKGREVISION= 16 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE:=apps/KDE3.x/utils/} EXTRACT_SUFX= .tar.bz2 @@ -27,15 +27,17 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-gui=kde CONFIGURE_ARGS+= --enable-kde-toolbar CONFIGURE_ARGS+= --with-features=huge -CONFIGURE_ARGS+= --with-tlib=ncurses +CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} post-configure: ${TOUCH} ${WRKSRC}/auto/configure ${WRKSRC}/auto/config.mk +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../meta-pkgs/kde3/kde3.mk" -.include "../../devel/ncurses/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile index 38e4f9540f9..06da9e9947b 100644 --- a/editors/vim-motif/Makefile +++ b/editors/vim-motif/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2008/01/09 13:47:43 martti Exp $ +# $NetBSD: Makefile,v 1.27 2008/03/02 16:01:32 jlam Exp $ PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL} -#PKGREVISION= 1 +PKGREVISION= 1 COMMENT= Vim editor (vi clone) with X11 Motif GUI @@ -14,7 +14,7 @@ CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* CONFIGURE_ARGS+= --enable-gui=motif -CONFIGURE_ARGS+= --with-tlib=ncurses +CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} @@ -37,8 +37,9 @@ 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 "../../mk/motif.buildlink3.mk" - +.include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo index 50e75a559e7..de0c91138a7 100644 --- a/editors/vim-share/distinfo +++ b/editors/vim-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.92 2008/02/15 06:36:10 martti Exp $ +$NetBSD: distinfo,v 1.93 2008/03/02 16:01:32 jlam Exp $ SHA1 (vim/7.1.001-100.gz) = 6571772fb45d8b5a28fa7cdee5c131555ac3bb48 RMD160 (vim/7.1.001-100.gz) = 65aebf5446773169d077f49dcee1e29ea0457cc4 @@ -174,4 +174,5 @@ Size (vim/vim-7.1.tar.bz2) = 6876053 bytes SHA1 (patch-aa) = 30fe8e0b6b117c0d14f7e272b28f3100f3e7bc01 SHA1 (patch-ab) = 6d27ed09cb741313e57b3550e62977797f7b285e SHA1 (patch-ad) = 64a58a538f8f48b4db7416b4ffec081ed6625329 +SHA1 (patch-af) = 0b43a34040bd0ce29f358119b2eaa777914ed6b6 SHA1 (patch-zb) = d52bdc3b77c30c804e78c2c6a4182fad8096c9f0 diff --git a/editors/vim-share/patches/patch-af b/editors/vim-share/patches/patch-af new file mode 100644 index 00000000000..6c0c68051f7 --- /dev/null +++ b/editors/vim-share/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2008/03/02 16:01:32 jlam Exp $ + +--- src/link.sh.orig 2006-09-26 05:22:11.000000000 -0400 ++++ src/link.sh +@@ -41,7 +41,7 @@ else + if sh link.cmd; then + touch auto/link.sed + cp link.cmd linkit.sh +- for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do ++ for libname in SM ICE nsl dnet dnet_stub inet socket dir elf Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do + cont=yes + while test -n "$cont"; do + if grep "l$libname " linkit.sh >/dev/null; then diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 0e84aea6d07..47bb6724fd7 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2008/01/09 13:47:43 martti Exp $ +# $NetBSD: Makefile,v 1.47 2008/03/02 16:01:32 jlam Exp $ PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL} -#PKGREVISION= 1 +PKGREVISION= 1 COMMENT= Vim editor (vi clone) with X11 Athena GUI @@ -14,7 +14,7 @@ CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]* CONFIGURE_ARGS+= --enable-gui=athena -CONFIGURE_ARGS+= --with-tlib=ncurses +CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} BUILD_TARGET= vim INSTALL_TARGET= installvimbin @@ -45,8 +45,9 @@ 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 "../../mk/xaw.buildlink3.mk" - +.include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" 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