Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Aug 2015 03:56:23 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r395581 - head/editors/vim
Message-ID:  <201508300356.t7U3uNn9003584@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Aug 30 03:56:22 2015
New Revision: 395581
URL: https://svnweb.freebsd.org/changeset/ports/395581

Log:
  - Convert to new options targer helper

Modified:
  head/editors/vim/Makefile

Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile	Sun Aug 30 02:59:01 2015	(r395580)
+++ head/editors/vim/Makefile	Sun Aug 30 03:56:22 2015	(r395581)
@@ -98,14 +98,6 @@ X11_MAKE_ARGS=		CONF_OPT_GUI="--enable-g
 X11_PLIST_SUB=		GUI="@comment "
 X11_USE=		XORG=x11,xt
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEXUBERANT_CTAGS}
-CTAGS_CMD=	exctags -R .
-.else
-CTAGS_CMD=	${FIND} . -type f \\| ${XARGS} ctags
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
@@ -119,10 +111,15 @@ MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-py
 post-patch:
 	@${REINPLACE_CMD} -e '/^install_normal: / s|install-icons|# &|; /cd $$(DEST_BIN); ln -s/d' ${WRKSRC}/src/Makefile
 	@${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g' ${WRKSRC}/src/auto/configure
-	@${FIND} ${WRKSRC}/runtime/ -name menu\*.vim -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's,ctags -R \.,${CTAGS_CMD},g'
 	@${ECHO_CMD} '#define SYS_VIMRC_FILE "'${ETCDIR}'/vimrc"' >> ${WRKSRC}/src/feature.h
 	@${ECHO_CMD} '#define SYS_GVIMRC_FILE "'${ETCDIR}'/gvimrc"' >> ${WRKSRC}/src/feature.h
 
+post-patch-EXUBERANT_CTAGS-off:
+	@${FIND} ${WRKSRC}/runtime/ -name 'menu*.vim' -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|ctags -R \.|${FIND} . -type f \| ${XARGS} ctags|g'
+
+post-patch-EXUBERANT_CTAGS-on:
+	@${FIND} ${WRKSRC}/runtime/ -name 'menu*.vim' -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e 's|ctags -R \.|exctags -R .|g'
+
 pre-configure:
 	@${CP} ${WRKSRC}/src/config.mk.dist ${WRKSRC}/src/auto/config.mk
 	@(cd ${WRKSRC}/src/ && ${MAKE_CMD} distclean)
@@ -130,9 +127,9 @@ pre-configure:
 		-e 's|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
 		-e 's|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g' \
 		-e 's|set dummy lua;|set dummy ${LUA_CMD};|g' ${WRKSRC}/src/auto/configure
-.if ${PORT_OPTIONS:MXTERM_SAVE}
+
+pre-configure-XTERM_SAVE-on:
 	@${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h
-.endif
 
 post-configure:
 	@(cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} scratch config)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508300356.t7U3uNn9003584>