svn commit: r335240 - in head/textproc/asciidoc: . files

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Fri Nov 29 22:09:34 UTC 2013 

Author: sunpoet
Date: Fri Nov 29 22:09:32 2013
New Revision: 335240
URL: http://svnweb.freebsd.org/changeset/ports/335240

Log:
  - Update to 8.6.9
  - Use REINPLACE_CMD instead of patch files
  
  Changes:	http://www.methods.co.nz/asciidoc/CHANGELOG.html

Deleted:
  head/textproc/asciidoc/files/
Modified:
  head/textproc/asciidoc/Makefile
  head/textproc/asciidoc/distinfo   (contents, props changed)
  head/textproc/asciidoc/pkg-plist

Modified: head/textproc/asciidoc/Makefile
==============================================================================
--- head/textproc/asciidoc/Makefile	Fri Nov 29 22:03:07 2013	(r335239)
+++ head/textproc/asciidoc/Makefile	Fri Nov 29 22:09:32 2013	(r335240)
@@ -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/py
 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>

Modified: head/textproc/asciidoc/distinfo
==============================================================================
--- head/textproc/asciidoc/distinfo	Fri Nov 29 22:03:07 2013	(r335239)
+++ head/textproc/asciidoc/distinfo	Fri Nov 29 22:09:32 2013	(r335240)
@@ -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

Modified: head/textproc/asciidoc/pkg-plist
==============================================================================
--- head/textproc/asciidoc/pkg-plist	Fri Nov 29 22:03:07 2013	(r335239)
+++ head/textproc/asciidoc/pkg-plist	Fri Nov 29 22:09:32 2013	(r335240)
@@ -77,6 +77,9 @@ bin/asciidoc.py
 %%ETCDIR%%/javascripts/asciidoc.js
 %%ETCDIR%%/javascripts/slidy.js
 %%ETCDIR%%/javascripts/toc.js
+ at 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
+ at 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
+ at 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
+ at 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
- at 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
- at 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

More information about the svn-ports-head mailing list