From owner-svn-ports-all@FreeBSD.ORG Mon Feb 24 18:39:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68BCB375; Mon, 24 Feb 2014 18:39:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 51FF7179F; Mon, 24 Feb 2014 18:39:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1OIdpS0055442; Mon, 24 Feb 2014 18:39:51 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1OIdorc055440; Mon, 24 Feb 2014 18:39:50 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201402241839.s1OIdorc055440@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Mon, 24 Feb 2014 18:39:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345888 - head/editors/vim X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2014 18:39:51 -0000 Author: sunpoet Date: Mon Feb 24 18:39:50 2014 New Revision: 345888 URL: http://svnweb.freebsd.org/changeset/ports/345888 QAT: https://qat.redports.org/buildarchive/r345888/ Log: - Add missing dependency for GNOME, GTK2 and X11 options - Remove outdated configure option - Fix PLIST - Bump PORTREVISION for dependency and package change PR: ports/186921 Submitted by: zeising, Tsurutani Naoki Modified: head/editors/vim/Makefile head/editors/vim/pkg-plist Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Mon Feb 24 18:12:33 2014 (r345887) +++ head/editors/vim/Makefile Mon Feb 24 18:39:50 2014 (r345888) @@ -3,7 +3,7 @@ PORTNAME= vim PORTVERSION= 7.4.${PATCHLEVEL} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= editors MASTER_SITES= VIM:source \ ${MASTER_SITE_VIM:S|unix|patches/${PORTVERSION:R}|}:patch \ @@ -88,12 +88,11 @@ CONSOLE_MAKE_ARGS= CONF_OPT_GUI="--enabl CSCOPE_MAKE_ARGS= CONF_OPT_CSCOPE=--enable-cscope CSCOPE_RUN_DEPENDS= ${LOCALBASE}/bin/cscope:${PORTSDIR}/devel/cscope EXUBERANT_CTAGS_RUN_DEPENDS= ${LOCALBASE}/bin/exctags:${PORTSDIR}/devel/ctags -GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$(X_LIBS) -lX11 -lXt" -GNOME_USE= GNOME=libgnomeui XORG=glproto,xt -GTK2_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" X_LIBS="$(X_LIBS) -lX11 -lXt" -GTK2_USE= GNOME=gtk20 XORG=xt -LUA_MAKE_ARGS= CONF_OPT_LUA=--enable-luainterp=dynamic \ - CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE} +GNOME_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt" +GNOME_USE= GNOME=libgnomeui XORG=glproto,xpm,xt +GTK2_MAKE_ARGS= CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt" +GTK2_USE= GNOME=gtk20 XORG=xpm,xt +LUA_MAKE_ARGS= CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE} LUA_USES= lua MOTIF_MAKE_ARGS= CONF_OPT_GUI='--enable-gui=motif --with-motif-lib="${MOTIFLIB}"' MOTIFHOME=${LOCALBASE} MOTIF_USES= motif @@ -106,6 +105,7 @@ RUBY_USE= RUBY=yes TCL_MAKE_ARGS= CONF_OPT_TCL="--enable-tclinterp --with-tclsh=tclsh${TCL_VER}" TCL_USES= tcl:85+ X11_MAKE_ARGS= CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$(X_LIBS) -lX11 -lXt" +X11_USE= XORG=x11,xt .include @@ -113,7 +113,7 @@ X11_MAKE_ARGS= CONF_OPT_GUI="--enable-g IGNORE= this port has new UI option (CONSOLE) for users who do not need GUI support. Please run "make config" to modify your setting .endif -.if ${PORT_OPTIONS:MCONSOLE} +.if ${PORT_OPTIONS:MCONSOLE} || ${PORT_OPTIONS:MX11} PLIST_SUB+= GUI="@comment " .else PLIST_SUB+= GUI="" @@ -173,7 +173,7 @@ post-install: .for file in evim rview rvim vimdiff ${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file} .endfor -.if !${PORT_OPTIONS:MCONSOLE} +.if !${PORT_OPTIONS:MCONSOLE} && !${PORT_OPTIONS:MX11} .for file in eview gview gvim gvimdiff rgview rgvim ${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file} .endfor Modified: head/editors/vim/pkg-plist ============================================================================== --- head/editors/vim/pkg-plist Mon Feb 24 18:12:33 2014 (r345887) +++ head/editors/vim/pkg-plist Mon Feb 24 18:39:50 2014 (r345888) @@ -190,6 +190,8 @@ man/man1/xxd.1.gz %%NON_LITE%%%%NLS%%@dirrmtry man/pl.UTF-8 %%NON_LITE%%%%NLS%%@dirrmtry man/pl.ISO8859-2/man1 %%NON_LITE%%%%NLS%%@dirrmtry man/pl.ISO8859-2 +%%NON_LITE%%%%NLS%%@dirrmtry man/pl/man1 +%%NON_LITE%%%%NLS%%@dirrmtry man/pl %%NON_LITE%%%%NLS%%@dirrmtry man/it.UTF-8/man1 %%NON_LITE%%%%NLS%%@dirrmtry man/it.UTF-8 %%NON_LITE%%%%NLS%%@dirrmtry man/it.ISO8859-1/man1