From owner-svn-ports-head@FreeBSD.ORG  Mon Dec  2 13:57:22 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 B70ACB25;
 Mon,  2 Dec 2013 13:57:22 +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 A458F1591;
 Mon,  2 Dec 2013 13:57:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB2DvMrT093743;
 Mon, 2 Dec 2013 13:57:22 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rB2DvM0P093742;
 Mon, 2 Dec 2013 13:57:22 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201312021357.rB2DvM0P093742@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 2 Dec 2013 13:57:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335488 - 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Dec 2013 13:57:22 -0000

Author: bdrewery
Date: Mon Dec  2 13:57:22 2013
New Revision: 335488
URL: http://svnweb.freebsd.org/changeset/ports/335488

Log:
  - Remove WITH_VIM_OPTIONS and respect ports framework
  
  PR:		ports/182749
  Submitted by:	Kevin Zheng <kevinz5000@gmail.com> (based on)
  Requested by:	many

Modified:
  head/editors/vim/Makefile

Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile	Mon Dec  2 13:47:06 2013	(r335487)
+++ head/editors/vim/Makefile	Mon Dec  2 13:57:22 2013	(r335488)
@@ -13,7 +13,7 @@ PORTNAME?=	vim
 PATCHLEVEL=	1314
 PORTVERSION=	7.3.${PATCHLEVEL}
 RELEASE=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	editors
 MASTER_SITES=	${MASTER_SITE_VIM}
 DISTFILES=	${RELEASE}${EXTRACT_SUFX}
@@ -35,16 +35,9 @@ SLAVEDIRS=	editors/vim-lite
 NO_STAGE=	yes
 
 .if !defined(LITE)
-.if defined(WITH_OPTIONS) || defined(WITH_VIM_OPTIONS)
 .include "${.CURDIR}/../vim/options"
 OPTIONS_DEFAULT+=	CSCOPE EXUBERANT_CTAGS PERL PYTHON RUBY \
 			TCL LUA X11 GTK2
-.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
 .endif
 
 .include <bsd.port.options.mk>
@@ -234,10 +227,7 @@ post-install:
 	cd ${WRKDIR} ; ex < ex.script
 
 show-options:
-	@${MAKE} -DWITH_OPTIONS showconfig
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Put \"WITH_OPTIONS=yes\" -or- \"WITH_VIM_OPTIONS=yes\""
-	@${ECHO_CMD} "in your /etc/make.conf or /etc/ports.conf file to enable OPTIONS processing.
+	@${MAKE} showconfig
 
 .if defined(ONT_CHECKSUM)
 checksum: