diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2013-12-05 12:13:01 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2013-12-05 12:13:01 +0000 |
| commit | e401659024c58a1ac13418820e84cb27af6b681b (patch) | |
| tree | 887c2743cd10d7ac2b707a1f886e8f2436b1fb48 /textproc/asciidoc | |
| parent | 9d6e59c38508a1ad80f5c42912127906f5b14500 (diff) | |
| download | ports-e401659024c58a1ac13418820e84cb27af6b681b.tar.gz ports-e401659024c58a1ac13418820e84cb27af6b681b.zip | |
- Remove VIM option: editors/vim installs identical syntax/asciidoc.vim now
- Bump PORTREVISION for package change
PR: ports/184511
Submitted by: mandree
Notes
Notes:
svn path=/head/; revision=335663
Diffstat (limited to 'textproc/asciidoc')
| -rw-r--r-- | textproc/asciidoc/Makefile | 21 | ||||
| -rw-r--r-- | textproc/asciidoc/pkg-plist | 4 |
2 files changed, 2 insertions, 23 deletions
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile index b0f2761973fe..8a5343f5b2be 100644 --- a/textproc/asciidoc/Makefile +++ b/textproc/asciidoc/Makefile @@ -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 filters/code/code-filter.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> diff --git a/textproc/asciidoc/pkg-plist b/textproc/asciidoc/pkg-plist index a2375f885e88..a89d913e6dbe 100644 --- a/textproc/asciidoc/pkg-plist +++ b/textproc/asciidoc/pkg-plist @@ -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 |