1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00

- Update to 8.6.9

- Use REINPLACE_CMD instead of patch files

Changes:	http://www.methods.co.nz/asciidoc/CHANGELOG.html
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2013-11-29 22:09:32 +00:00
parent 18553617d0
commit cc60f2572d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=335240
5 changed files with 24 additions and 114 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= asciidoc
PORTVERSION= 8.6.8
PORTREVISION= 1
PORTVERSION= 8.6.9
CATEGORIES= textproc
MASTER_SITES= SF
@ -18,48 +17,38 @@ RUN_DEPENDS= python2:${PORTSDIR}/lang/python2
OPTIONS_DEFINE= VIM
OPTIONS_DEFAULT=VIM
OPTIONS_SUB= yes
VIM_DESC= Install Vim ftdetect & syntax files
VIM_DESC= Install Vim syntax file
GNU_CONFIGURE= yes
USE_PYTHON= -2.7
USES= gmake
CONF_FILES= asciidoc.conf docbook45.conf \
filters/code/code-filter.conf \
CONF_FILES= asciidoc.conf docbook45.conf filters/code/code-filter.conf \
filters/graphviz/graphviz-filter.conf \
filters/latex/latex-filter.conf \
filters/music/music-filter.conf \
filters/source/source-highlight-filter.conf \
help.conf html4.conf html5.conf \
lang-de.conf lang-el.conf lang-en.conf lang-es.conf \
lang-fr.conf lang-hu.conf lang-it.conf lang-nl.conf \
lang-pt-BR.conf lang-ru.conf lang-uk.conf \
latex.conf slidy.conf text.conf wordpress.conf \
filters/source/source-highlight-filter.conf help.conf \
html4.conf html5.conf lang-cs.conf lang-de.conf lang-el.conf \
lang-en.conf lang-es.conf lang-fr.conf lang-hu.conf \
lang-it.conf lang-nl.conf lang-pt-BR.conf lang-ro.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}
MAKE_ENV+= vimdir=${PREFIX}/share/vim/${VIM_DATADIR}
PLIST_SUB+= VIM_DATADIR=${VIM_DATADIR}
VIM__DATADIR!= ${MAKE} -C ../../editors/vim/ -V _DATADIR
VIM_DATADIR!= ${MAKE} -C ../../editors/vim/ -V _DATADIR
.else
PLIST_SUB+= VIM_DATADIR=""
.endif
post-patch:
@${REINPLACE_CMD} -e 's|${SETENV} python|&2|' ${WRKSRC}/a2x.py
@${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
.for conf_file in ${CONF_FILES}
@cd ${WRKSRC}/ && ${MV} ${conf_file} ${conf_file}.sample
.endfor
.if ${PORT_OPTIONS:MVIM}
@${REINPLACE_CMD} -e '/^vimdir = /d' ${WRKSRC}/Makefile.in
.endif
pre-install:
.if ${PORT_OPTIONS:MVIM}
@${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/${VIM_DATADIR}/
.endif
post-install:
.for conf_file in ${CONF_FILES}
@ -67,5 +56,9 @@ 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>

View File

@ -1,2 +1,2 @@
SHA256 (asciidoc-8.6.8.tar.gz) = ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4
SIZE (asciidoc-8.6.8.tar.gz) = 900422
SHA256 (asciidoc-8.6.9.tar.gz) = 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0
SIZE (asciidoc-8.6.9.tar.gz) = 907253

View File

@ -1,76 +0,0 @@
--- Makefile.in.orig 2011-05-31 05:54:30.000000000 +0900
+++ Makefile.in 2012-08-18 21:30:48.000000000 +0900
@@ -5,7 +5,7 @@
.NOTPARALLEL:
INSTALL = @INSTALL@
-INSTALL_PROG = @INSTALL_PROGRAM@
+INSTALL_PROG = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
SED = @SED@
@@ -27,37 +27,37 @@
prog = asciidoc.py a2x.py
progdir = $(bindir)
-vimdir = @sysconfdir@/vim
+vimdir = @datadir@/vim/vimfiles
manp = $(patsubst %1.txt,%1,$(wildcard doc/*.1.txt))
manpdir = $(mandir)/man1
-conf = $(wildcard *.conf)
+conf = $(wildcard *.conf.sample)
confdir = $(ASCIIDOCCONF)
filtersdir = $(ASCIIDOCCONF)/filters
codefilter = filters/code/code-filter.py
codefilterdir = $(filtersdir)/code
-codefilterconf = filters/code/code-filter.conf
+codefilterconf = filters/code/code-filter.conf.sample
codefilterconfdir = $(filtersdir)/code
graphvizfilter = filters/graphviz/graphviz2png.py
graphvizfilterdir = $(filtersdir)/graphviz
-graphvizfilterconf = filters/graphviz/graphviz-filter.conf
+graphvizfilterconf = filters/graphviz/graphviz-filter.conf.sample
graphvizfilterconfdir = $(filtersdir)/graphviz
musicfilter = filters/music/music2png.py
musicfilterdir = $(filtersdir)/music
-musicfilterconf = filters/music/music-filter.conf
+musicfilterconf = filters/music/music-filter.conf.sample
musicfilterconfdir = $(filtersdir)/music
-sourcefilterconf = filters/source/source-highlight-filter.conf
+sourcefilterconf = filters/source/source-highlight-filter.conf.sample
sourcefilterconfdir = $(filtersdir)/source
latexfilter = filters/latex/latex2png.py
latexfilterdir = $(filtersdir)/latex
-latexfilterconf = filters/latex/latex-filter.conf
+latexfilterconf = filters/latex/latex-filter.conf.sample
latexfilterconfdir = $(filtersdir)/latex
themesdir = $(ASCIIDOCCONF)/themes
@@ -145,8 +145,7 @@
done
install-vim:
- @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
- if ! test -d $$d; then continue; fi ; \
+ @for d in $(DESTDIR)/$(vimdir); do \
echo "installing Vim files in $$d" ; \
$(INSTALL) -d $$d/syntax ; \
$(INSTALL_DATA) vim/syntax/asciidoc.vim $$d/syntax ; \
@@ -155,8 +154,7 @@
done
uninstall-vim:
- @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
- if ! test -d $$d; then continue; fi ; \
+ @for d in $(DESTDIR)/$(vimdir); do \
echo "uninstalling Vim files in $$d" ; \
rm -f $$d/syntax/asciidoc.vim ; \
rm -f $$d/ftdetect/asciidoc_filetype.vim ; \

View File

@ -1,8 +0,0 @@
--- ./asciidoc.py.orig 2013-05-20 13:25:45.362337047 +0200
+++ ./asciidoc.py 2013-05-20 13:25:55.524336439 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
"""
asciidoc - converts an AsciiDoc text file to HTML or DocBook

View File

@ -77,6 +77,9 @@ bin/asciidoc.py
%%ETCDIR%%/javascripts/asciidoc.js
%%ETCDIR%%/javascripts/slidy.js
%%ETCDIR%%/javascripts/toc.js
@unexec if cmp -s %D/%%ETCDIR%%/lang-cs.conf.sample %D/%%ETCDIR%%/lang-cs.conf; then rm -f %D/%%ETCDIR%%/lang-cs.conf; fi
%%ETCDIR%%/lang-cs.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/lang-cs.conf ]; then cp -p %D/%F %B/lang-cs.conf; fi
@unexec if cmp -s %D/%%ETCDIR%%/lang-de.conf.sample %D/%%ETCDIR%%/lang-de.conf; then rm -f %D/%%ETCDIR%%/lang-de.conf; fi
%%ETCDIR%%/lang-de.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/lang-de.conf ]; then cp -p %D/%F %B/lang-de.conf; fi
@ -104,6 +107,9 @@ bin/asciidoc.py
@unexec if cmp -s %D/%%ETCDIR%%/lang-pt-BR.conf.sample %D/%%ETCDIR%%/lang-pt-BR.conf; then rm -f %D/%%ETCDIR%%/lang-pt-BR.conf; fi
%%ETCDIR%%/lang-pt-BR.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/lang-pt-BR.conf ]; then cp -p %D/%F %B/lang-pt-BR.conf; fi
@unexec if cmp -s %D/%%ETCDIR%%/lang-ro.conf.sample %D/%%ETCDIR%%/lang-ro.conf; then rm -f %D/%%ETCDIR%%/lang-ro.conf; fi
%%ETCDIR%%/lang-ro.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/lang-ro.conf ]; then cp -p %D/%F %B/lang-ro.conf; fi
@unexec if cmp -s %D/%%ETCDIR%%/lang-ru.conf.sample %D/%%ETCDIR%%/lang-ru.conf; then rm -f %D/%%ETCDIR%%/lang-ru.conf; fi
%%ETCDIR%%/lang-ru.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/lang-ru.conf ]; then cp -p %D/%F %B/lang-ru.conf; fi
@ -127,9 +133,6 @@ bin/asciidoc.py
@exec if [ ! -f %D/%%ETCDIR%%/text.conf ]; then cp -p %D/%F %B/text.conf; fi
%%ETCDIR%%/themes/flask/flask.css
%%ETCDIR%%/themes/volnitsky/volnitsky.css
@unexec if cmp -s %D/%%ETCDIR%%/wordpress.conf.sample %D/%%ETCDIR%%/wordpress.conf; then rm -f %D/%%ETCDIR%%/wordpress.conf; fi
%%ETCDIR%%/wordpress.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/wordpress.conf ]; then cp -p %D/%F %B/wordpress.conf; fi
@unexec if cmp -s %D/%%ETCDIR%%/xhtml11.conf.sample %D/%%ETCDIR%%/xhtml11.conf; then rm -f %D/%%ETCDIR%%/xhtml11.conf; fi
%%ETCDIR%%/xhtml11.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/xhtml11.conf ]; then cp -p %D/%F %B/xhtml11.conf; fi
@ -138,10 +141,8 @@ 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%%%%VIM_DATADIR%%share/vim/ftdetect/asciidoc_filetype.vim
%%VIM%%%%VIM_DATADIR%%share/vim/syntax/asciidoc.vim
%%VIM%%share/vim/%%VIM_DATADIR%%/syntax/asciidoc.vim
%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%%/syntax
%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%%/ftdetect
%%VIM%%@dirrmtry share/vim/%%VIM_DATADIR%%
%%VIM%%@dirrmtry share/vim
@dirrm %%ETCDIR%%/themes/volnitsky