From owner-svn-ports-all@FreeBSD.ORG Sat Jun 29 00:43:14 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7A802D3E; Sat, 29 Jun 2013 00:43:14 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6AFA31E55; Sat, 29 Jun 2013 00:43:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5T0hE4D061661; Sat, 29 Jun 2013 00:43:14 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5T0hEmN061659; Sat, 29 Jun 2013 00:43:14 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201306290043.r5T0hEmN061659@svn.freebsd.org> From: "David E. O'Brien" Date: Sat, 29 Jun 2013 00:43:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322016 - 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.14 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: Sat, 29 Jun 2013 00:43:14 -0000 Author: obrien Date: Sat Jun 29 00:43:13 2013 New Revision: 322016 URL: http://svnweb.freebsd.org/changeset/ports/322016 Log: Update the personality of the port. Added: head/editors/vim/options - copied, changed from r314777, head/editors/vim/options Modified: head/editors/vim/Makefile Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Fri Jun 28 23:49:49 2013 (r322015) +++ head/editors/vim/Makefile Sat Jun 29 00:43:13 2013 (r322016) @@ -1,4 +1,6 @@ -# Created by: David O'Brien +# ex:ts=8 +# Created by: David O'Brien +# Created: Sat June 29, 1996 # $FreeBSD$ PORTNAME?= vim @@ -36,23 +38,19 @@ COMMENT?= Vi "workalike", with many addi SLAVEDIRS= editors/vim-lite -.if !defined(LITE) -OPTIONS_DEFINE= PERL PYTHON TCL LUA CSCOPE EXUBERANT_CTAGS \ - XTERM_SAVE RUBY NLS X11 -OPTIONS_RADIO= UI -OPTIONS_RADIO_UI= ATHENA GTK2 GNOME MOTIF - -UI_DESC= Graphical toolkit to use -ATHENA_DESC= Athena GUI toolkit -XTERM_SAVE_DESC= Restore xterm screen after exit -CSCOPE_DESC= cscope support -EXUBERANT_CTAGS_DESC= Use exctags instead of ctags -.if defined(PACKAGE_BUILDING) +.if defined(WITH_OPTIONS) || defined(WITH_VIM_OPTIONS) || !defined(LITE) && defined(PACKAGE_BUILDING) +.include "${.CURDIR}/../vim/options" +. if !defined(LITE) && defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= CSCOPE EXUBERANT_CTAGS PERL PYTHON RUBY \ TCL LUA X11 GTK2 -.endif -.endif +. endif .include +.else +VIM_PORT_SCRIPT_LANGS?= LUA PERL PYTHON RUBY TCL +VIM_PORT_OPTIONS= CSCOPE DOCS EXAMPLES EXUBERANT_CTAGS \ + ${VIM_PORT_SCRIPT_LANGS} +PORT_OPTIONS?= ${VIM_PORT_OPTIONS} +.endif CONFLICTS= vim6* vim*-gnome libsysinfo .if defined(LITE) @@ -140,7 +138,6 @@ CTAGS_CMD= exctags -R . CTAGS_CMD= ${FIND} . -type f \\|${XARGS} ctags .endif - .if ${PORT_OPTIONS:MX11} CONF_OPT_GUI="--enable-gui=no --with-x" @@ -236,6 +233,9 @@ post-install: ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-vim cd ${WRKDIR} ; ex < ex.script +show-options: + @${MAKE} -DWITH_OPTIONS showconfig + .if defined(ONT_CHECKSUM) checksum: .endif Copied and modified: head/editors/vim/options (from r314777, head/editors/vim/options) ============================================================================== --- head/editors/vim/options Wed Mar 20 23:32:00 2013 (r314777, copy source) +++ head/editors/vim/options Sat Jun 29 00:43:13 2013 (r322016) @@ -1,15 +1,24 @@ -OPTIONS= PERL "Enable Perl interpreter" off \ - PYTHON "Enable Python interpreter" off \ - RUBY "Enable Ruby interpreter" off \ - TCL "Enable TCL interpreter" off \ - LUA "Enable lua interpreter" off \ - LANG "VIm Translations" off \ - CSCOPE "Enable cscope" off \ - EXUBERANT_CTAGS "Use exctags instead of ctags" off \ - X11 "X11 support (required for options below)" off \ - X11_ONLY "CLI-only Vim, but with basic X11 support" off \ - XTERM_SAVE "Restore xterm screen after exit" off \ - ATHENA "Athena GUI" off \ - GTK2 "GTK2 GUI" off \ - GNOME2 "Gnome2 GUI" off \ - MOTIF "Motif GUI" off \ +OPTIONS_DEFINE= \ + PERL \ + PYTHON \ + RUBY \ + TCL \ + LUA \ + CSCOPE \ + EXUBERANT_CTAGS \ + XTERM_SAVE \ + NLS \ + X11 +OPTIONS_RADIO= \ + UI +OPTIONS_RADIO_UI=\ + ATHENA \ + GTK2 \ + GNOME \ + MOTIF + +CSCOPE_DESC= cscope support +EXUBERANT_CTAGS_DESC= Use exctags instead of ctags +ATHENA_DESC= Athena GUI toolkit +XTERM_SAVE_DESC= Restore xterm screen after exit +UI_DESC= Graphical toolkit to use