From owner-svn-ports-all@freebsd.org Thu Sep 28 22:53:05 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7505E0E46A; Thu, 28 Sep 2017 22:53:05 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00F8871073; Thu, 28 Sep 2017 22:53:04 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8SMr4SB000877; Thu, 28 Sep 2017 22:53:04 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8SMr4PB000876; Thu, 28 Sep 2017 22:53:04 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201709282253.v8SMr4PB000876@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Thu, 28 Sep 2017 22:53:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450878 - head/editors/vim X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: head/editors/vim X-SVN-Commit-Revision: 450878 X-SVN-Commit-Repository: ports 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.23 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: Thu, 28 Sep 2017 22:53:05 -0000 Author: adamw Date: Thu Sep 28 22:53:04 2017 New Revision: 450878 URL: https://svnweb.freebsd.org/changeset/ports/450878 Log: Reorganize patching and targets There are so many targets here that it's really hard to follow. Move the OPTIONS-related stuff away from the basic targets, and separate out a couple patches into more sensible targets so that it's clearer what things are doing. Modified: head/editors/vim/Makefile Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Thu Sep 28 22:47:57 2017 (r450877) +++ head/editors/vim/Makefile Thu Sep 28 22:53:04 2017 (r450878) @@ -157,34 +157,19 @@ post-extract: ${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${WRKSRC}/runtime/keymap post-patch: - @${FIND} ${WRKSRC}/ -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} -e 's| $$<| $$>|' - @${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g' ${WRKSRC}/src/auto/configure @${ECHO_CMD} '#define SYS_VIMRC_FILE "'${ETCDIR}'/vimrc"' >> ${WRKSRC}/src/feature.h @${ECHO_CMD} '#define SYS_GVIMRC_FILE "'${ETCDIR}'/gvimrc"' >> ${WRKSRC}/src/feature.h -.if empty(PORT_OPTIONS:MPYTHON) - @${REINPLACE_CMD} -e 1d ${WRKSRC}/runtime/tools/demoserver.py -.endif + @${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g; s|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/src/auto/configure -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 @${DO_MAKE_BUILD} -C ${WRKSRC}/src distclean - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - -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 -pre-configure-XTERM_SAVE-on: - @${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h - post-configure: @${DO_MAKE_BUILD} -C ${WRKSRC}/src scratch config - @${REINPLACE_CMD} -e 's|#define HAVE_SYSINFO 1|/* #undef HAVE_SYSINFO */|' ${WRKSRC}/src/auto/config.h +# Needed when devel/libsysinfo is installed: + @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/ d' ${WRKSRC}/src/auto/config.h post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/ex @@ -192,6 +177,23 @@ post-install: .for F in eview evim gview gvim gvimdiff rgview rgvim rview rvim vimdiff ${LN} -sf vim ${STAGEDIR}${PREFIX}/bin/$F .endfor + +# OPTIONS +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' + +post-patch-LUA-on: + @${REINPLACE_CMD} -e 's|set dummy lua;|set dummy ${LUA_CMD};|g' ${WRKSRC}/src/auto/configure + +post-patch-PYTHON-off: +# Work around qa-check shebang error + @${REINPLACE_CMD} -e 1d ${WRKSRC}/runtime/tools/demoserver.py + +post-patch-XTERM_SAVE-on: + @${REINPLACE_CMD} -e '/FEAT_XTERM_SAVE/ s|.*|#define FEAT_XTERM_SAVE|' ${WRKSRC}/src/feature.h post-install-DEFAULT_VIMRC-on: @${MKDIR} ${STAGEDIR}${ETCDIR}