I have been upgrading an old 9.1 machine that has pkg installed and has been converted to pkgNG. It has asciidoc and vim-lite installed. I accepted default options, meaning that asciidoc is supposed to install vim syntax files, and now I get this when installing vim-lite: ===> Registering installation for vim-lite-7.4.110 Installing vim-lite-7.4.110...pkg-static: vim-lite-7.4.110 conflicts with asciidoc-8.6.9 (installs files into the same place). Problematic file: /usr/local/share/vim/vim74/syntax/asciidoc.vim Could we optimize that so that only one port owns the asciidoc.vim file?
Responsible Changed From-To: freebsd-ports-bugs->sunpoet Over to maintainer (via the GNATS Auto Assign Tool)
Author: sunpoet Date: Thu Dec 5 12:13:01 2013 New Revision: 335663 URL: http://svnweb.freebsd.org/changeset/ports/335663 Log: - Remove VIM option: editors/vim installs identical syntax/asciidoc.vim now - Bump PORTREVISION for package change PR: ports/184511 Submitted by: mandree Modified: head/textproc/asciidoc/Makefile head/textproc/asciidoc/pkg-plist Modified: head/textproc/asciidoc/Makefile ============================================================================== --- head/textproc/asciidoc/Makefile Thu Dec 5 12:07:00 2013 (r335662) +++ head/textproc/asciidoc/Makefile Thu Dec 5 12:13:01 2013 (r335663) @@ -3,6 +3,7 @@ PORTNAME= asciidoc PORTVERSION= 8.6.9 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF @@ -14,11 +15,6 @@ LICENSE_COMB= multi RUN_DEPENDS= python2:${PORTSDIR}/lang/python2 -OPTIONS_DEFINE= VIM -OPTIONS_DEFAULT=VIM -OPTIONS_SUB= yes -VIM_DESC= Install Vim syntax file - GNU_CONFIGURE= yes USE_PYTHON= -2.7 USES= gmake @@ -34,18 +30,9 @@ CONF_FILES= asciidoc.conf docbook45.conf lang-ru.conf lang-uk.conf latex.conf slidy.conf text.conf \ xhtml11.conf xhtml11-quirks.conf -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MVIM} -PLIST_SUB+= VIM_DATADIR=${VIM_DATADIR} -VIM_DATADIR!= ${MAKE} -C ../../editors/vim/ -V _DATADIR -.else -PLIST_SUB+= VIM_DATADIR="" -.endif - post-patch: @${REINPLACE_CMD} -e '/^INSTALL_PROG/ s|INSTALL_PROGRAM|INSTALL_SCRIPT|; s|\.conf|&.sample|' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|${SETENV} python|&2|' ${WRKSRC}/a2x.py ${WRKSRC}/asciidoc.py + @${REINPLACE_CMD} -e '1 s|${SETENV} python|&2|' ${WRKSRC}/a2x.py ${WRKSRC}/asciidoc.py .for conf_file in ${CONF_FILES} @cd ${WRKSRC}/ && ${MV} ${conf_file} ${conf_file}.sample .endfor @@ -56,9 +43,5 @@ post-install: ${CP} -p ${STAGEDIR}${ETCDIR}/${conf_file}.sample ${STAGEDIR}${ETCDIR}/${conf_file}; \ fi .endfor -.if ${PORT_OPTIONS:MVIM} - ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/${VIM_DATADIR}/syntax/ - ${INSTALL_DATA} ${WRKSRC}/vim/syntax/asciidoc.vim ${STAGEDIR}${PREFIX}/share/vim/${VIM_DATADIR}/syntax/ -.endif .include <bsd.port.mk> Modified: head/textproc/asciidoc/pkg-plist ============================================================================== --- head/textproc/asciidoc/pkg-plist Thu Dec 5 12:07:00 2013 (r335662) +++ head/textproc/asciidoc/pkg-plist Thu Dec 5 12:13:01 2013 (r335663) @@ -141,10 +141,6 @@ bin/asciidoc.py @exec if [ ! -f %D/%%ETCDIR%%/xhtml11-quirks.conf ]; then cp -p %D/%F %B/xhtml11-quirks.conf; fi man/man1/a2x.1.gz man/man1/asciidoc.1.gz -%%VIM%%share/vim/%%VIM_DATADIR%%/syntax/asciidoc.vim -%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%%/syntax -%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%% -%%VIM%%@dirrmtry share/vim @dirrm %%ETCDIR%%/themes/volnitsky @dirrm %%ETCDIR%%/themes/flask @dirrm %%ETCDIR%%/themes _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed textproc/asciidoc was updated. It does not install asciidoc.vim now. Thanks!