[Midnightbsd-cvs] mports [17753] trunk/textproc/asciidoc: asciidoc 8.6.9

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Oct 14 21:08:54 EDT 2014


Revision: 17753
          http://svnweb.midnightbsd.org/mports/?rev=17753
Author:   laffer1
Date:     2014-10-14 21:08:53 -0400 (Tue, 14 Oct 2014)
Log Message:
-----------
asciidoc 8.6.9

Modified Paths:
--------------
    trunk/textproc/asciidoc/Makefile
    trunk/textproc/asciidoc/distinfo
    trunk/textproc/asciidoc/pkg-plist

Removed Paths:
-------------
    trunk/textproc/asciidoc/files/

Modified: trunk/textproc/asciidoc/Makefile
===================================================================
--- trunk/textproc/asciidoc/Makefile	2014-10-15 01:04:39 UTC (rev 17752)
+++ trunk/textproc/asciidoc/Makefile	2014-10-15 01:08:53 UTC (rev 17753)
@@ -1,45 +1,52 @@
 # $MidnightBSD$
 
 PORTNAME=	asciidoc
-PORTVERSION=	8.6.8
+PORTVERSION=	8.6.9
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A text document format for writing short documents and man pages
-LICENSE=	gpl2
+COMMENT=	Text document format for writing short documents and man pages
 
-MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}"
+LICENSE=	gpl2 mit
+LICENSE_COMB=	multi
 
-USE_PYTHON=	2.5+
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USES=		gmake python:2 shebangfix
 
-MAN1=		a2x.1 asciidoc.1
-
-CONFFILES=	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
 
+SHEBANG_FILES=	a2x.py \
+		asciidoc.py \
+		asciidocapi.py \
+		filters/latex/latex2png.py \
+		filters/graphviz/graphviz2png.py \
+		filters/music/music2png.py \
+		filters/code/code-filter.py
+python_OLD_CMD=	${SETENV} python
+python_CMD=	${PYTHON_CMD}
+
 post-patch:
-.for f in ${CONFFILES}
-	@cd ${WRKSRC} && ${MV} ${f} ${f}.sample
+	@${REINPLACE_CMD} -e '/^INSTALL_PROG/ s|INSTALL_PROGRAM|INSTALL_SCRIPT|; s|\.conf|&.sample|' ${WRKSRC}/Makefile.in
+.for conf_file in ${CONF_FILES}
+	@cd ${WRKSRC}/ && ${MV} ${conf_file} ${conf_file}.sample
 .endfor
 
 post-install:
-.for f in ${CONFFILES}
-	@if [ ! -f ${ETCDIR}/${f} ]; then \
-		${CP} -p ${ETCDIR}/${f}.sample ${ETCDIR}/${f} ; \
+	${MKDIR} ${FAKE_DESTDIR}${PYTHON_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/asciidocapi.py ${FAKE_DESTDIR}${PYTHON_SITELIBDIR}/
+.for conf_file in ${CONF_FILES}
+	@if [ ! -f ${ETCDIR}/${conf_file} ]; then \
+		${CP} -p ${STAGEDIR}${ETCDIR}/${conf_file}.sample ${ETCDIR}/${conf_file}; \
 	fi
 .endfor
 

Modified: trunk/textproc/asciidoc/distinfo
===================================================================
--- trunk/textproc/asciidoc/distinfo	2014-10-15 01:04:39 UTC (rev 17752)
+++ trunk/textproc/asciidoc/distinfo	2014-10-15 01:08:53 UTC (rev 17753)
@@ -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: trunk/textproc/asciidoc/pkg-plist
===================================================================
--- trunk/textproc/asciidoc/pkg-plist	2014-10-15 01:04:39 UTC (rev 17752)
+++ trunk/textproc/asciidoc/pkg-plist	2014-10-15 01:08:53 UTC (rev 17753)
@@ -2,9 +2,7 @@
 bin/a2x.py
 bin/asciidoc
 bin/asciidoc.py
- at unexec if cmp -s %D/%%ETCDIR%%/asciidoc.conf.sample %D/%%ETCDIR%%/asciidoc.conf; then rm -f %D/%%ETCDIR%%/asciidoc.conf; fi
-%%ETCDIR%%/asciidoc.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/asciidoc.conf ] ; then cp -p %D/%F %B/asciidoc.conf; fi
+ at sample %%ETCDIR%%/asciidoc.conf.sample
 %%ETCDIR%%/dblatex/asciidoc-dblatex.sty
 %%ETCDIR%%/dblatex/asciidoc-dblatex.xsl
 %%ETCDIR%%/docbook-xsl/chunked.xsl
@@ -15,37 +13,19 @@
 %%ETCDIR%%/docbook-xsl/manpage.xsl
 %%ETCDIR%%/docbook-xsl/text.xsl
 %%ETCDIR%%/docbook-xsl/xhtml.xsl
- at unexec if cmp -s %D/%%ETCDIR%%/docbook45.conf.sample %D/%%ETCDIR%%/docbook45.conf; then rm -f %D/%%ETCDIR%%/docbook45.conf; fi
-%%ETCDIR%%/docbook45.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/docbook45.conf ] ; then cp -p %D/%F %B/docbook45.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/filters/code/code-filter.conf.sample %D/%%ETCDIR%%/filters/code/code-filter.conf; then rm -f %D/%%ETCDIR%%/filters/code/code-filter.conf; fi
-%%ETCDIR%%/filters/code/code-filter.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/filters/code/code-filter.conf ] ; then cp -p %D/%F %B/code-filter.conf; fi
+ at sample %%ETCDIR%%/docbook45.conf.sample
+ at sample %%ETCDIR%%/filters/code/code-filter.conf.sample
 %%ETCDIR%%/filters/code/code-filter.py
- at unexec if cmp -s %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf; then rm -f %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf; fi
-%%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf ] ; then cp -p %D/%F %B/graphviz-filter.conf; fi
+ at sample %%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample
 %%ETCDIR%%/filters/graphviz/graphviz2png.py
- at unexec if cmp -s %D/%%ETCDIR%%/filters/latex/latex-filter.conf.sample %D/%%ETCDIR%%/filters/latex/latex-filter.conf; then rm -f %D/%%ETCDIR%%/filters/latex/latex-filter.conf; fi
-%%ETCDIR%%/filters/latex/latex-filter.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/filters/latex/latex-filter.conf ] ; then cp -p %D/%F %B/latex-filter.conf; fi
+ at sample %%ETCDIR%%/filters/latex/latex-filter.conf.sample
 %%ETCDIR%%/filters/latex/latex2png.py
- at unexec if cmp -s %D/%%ETCDIR%%/filters/music/music-filter.conf.sample %D/%%ETCDIR%%/filters/music/music-filter.conf; then rm -f %D/%%ETCDIR%%/filters/music/music-filter.conf; fi
-%%ETCDIR%%/filters/music/music-filter.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/filters/music/music-filter.conf ] ; then cp -p %D/%F %B/music-filter.conf; fi
+ at sample %%ETCDIR%%/filters/music/music-filter.conf.sample
 %%ETCDIR%%/filters/music/music2png.py
- at unexec if cmp -s %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf.sample %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf; then rm -f %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf; fi
-%%ETCDIR%%/filters/source/source-highlight-filter.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf ] ; then cp -p %D/%F %B/source-highlight-filter.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/help.conf.sample %D/%%ETCDIR%%/help.conf; then rm -f %D/%%ETCDIR%%/help.conf; fi
-%%ETCDIR%%/help.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/help.conf ] ; then cp -p %D/%F %B/help.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/html4.conf.sample %D/%%ETCDIR%%/html4.conf; then rm -f %D/%%ETCDIR%%/html4.conf; fi
-%%ETCDIR%%/html4.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/html4.conf ] ; then cp -p %D/%F %B/html4.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/html5.conf.sample %D/%%ETCDIR%%/html5.conf; then rm -f %D/%%ETCDIR%%/html5.conf; fi
-%%ETCDIR%%/html5.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/html5.conf ] ; then cp -p %D/%F %B/html5.conf; fi
+ at sample %%ETCDIR%%/filters/source/source-highlight-filter.conf.sample
+ at sample %%ETCDIR%%/help.conf.sample
+ at sample %%ETCDIR%%/html4.conf.sample
+ at sample %%ETCDIR%%/html5.conf.sample
 %%ETCDIR%%/images/icons/README
 %%ETCDIR%%/images/icons/callouts/1.png
 %%ETCDIR%%/images/icons/callouts/10.png
@@ -77,45 +57,21 @@
 %%ETCDIR%%/javascripts/asciidoc.js
 %%ETCDIR%%/javascripts/slidy.js
 %%ETCDIR%%/javascripts/toc.js
- at 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
- at exec if [ ! -f %D/%%ETCDIR%%/lang-de.conf ] ; then cp -p %D/%F %B/lang-de.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/lang-el.conf.sample %D/%%ETCDIR%%/lang-el.conf; then rm -f %D/%%ETCDIR%%/lang-el.conf; fi
-%%ETCDIR%%/lang-el.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lang-el.conf ] ; then cp -p %D/%F %B/lang-el.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/lang-en.conf.sample %D/%%ETCDIR%%/lang-en.conf; then rm -f %D/%%ETCDIR%%/lang-en.conf; fi
-%%ETCDIR%%/lang-en.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lang-en.conf ] ; then cp -p %D/%F %B/lang-en.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/lang-es.conf.sample %D/%%ETCDIR%%/lang-es.conf; then rm -f %D/%%ETCDIR%%/lang-es.conf; fi
-%%ETCDIR%%/lang-es.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lang-es.conf ] ; then cp -p %D/%F %B/lang-es.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/lang-fr.conf.sample %D/%%ETCDIR%%/lang-fr.conf; then rm -f %D/%%ETCDIR%%/lang-fr.conf; fi
-%%ETCDIR%%/lang-fr.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lang-fr.conf ] ; then cp -p %D/%F %B/lang-fr.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/lang-hu.conf.sample %D/%%ETCDIR%%/lang-hu.conf; then rm -f %D/%%ETCDIR%%/lang-hu.conf; fi
-%%ETCDIR%%/lang-hu.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lang-hu.conf ] ; then cp -p %D/%F %B/lang-hu.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/lang-it.conf.sample %D/%%ETCDIR%%/lang-it.conf; then rm -f %D/%%ETCDIR%%/lang-it.conf; fi
-%%ETCDIR%%/lang-it.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lang-it.conf ] ; then cp -p %D/%F %B/lang-it.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/lang-nl.conf.sample %D/%%ETCDIR%%/lang-nl.conf; then rm -f %D/%%ETCDIR%%/lang-nl.conf; fi
-%%ETCDIR%%/lang-nl.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lang-nl.conf ] ; then cp -p %D/%F %B/lang-nl.conf; fi
- at 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
- at 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-ru.conf.sample %D/%%ETCDIR%%/lang-ru.conf; then rm -f %D/%%ETCDIR%%/lang-ru.conf; fi
-%%ETCDIR%%/lang-ru.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lang-ru.conf ] ; then cp -p %D/%F %B/lang-ru.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/lang-uk.conf.sample %D/%%ETCDIR%%/lang-uk.conf; then rm -f %D/%%ETCDIR%%/lang-uk.conf; fi
-%%ETCDIR%%/lang-uk.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/lang-uk.conf ] ; then cp -p %D/%F %B/lang-uk.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/latex.conf.sample %D/%%ETCDIR%%/latex.conf; then rm -f %D/%%ETCDIR%%/latex.conf; fi
-%%ETCDIR%%/latex.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/latex.conf ] ; then cp -p %D/%F %B/latex.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/slidy.conf.sample %D/%%ETCDIR%%/slidy.conf; then rm -f %D/%%ETCDIR%%/slidy.conf; fi
-%%ETCDIR%%/slidy.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/slidy.conf ] ; then cp -p %D/%F %B/slidy.conf; fi
+ at sample %%ETCDIR%%/lang-cs.conf.sample
+ at sample %%ETCDIR%%/lang-de.conf.sample
+ at sample %%ETCDIR%%/lang-el.conf.sample
+ at sample %%ETCDIR%%/lang-en.conf.sample
+ at sample %%ETCDIR%%/lang-es.conf.sample
+ at sample %%ETCDIR%%/lang-fr.conf.sample
+ at sample %%ETCDIR%%/lang-hu.conf.sample
+ at sample %%ETCDIR%%/lang-it.conf.sample
+ at sample %%ETCDIR%%/lang-nl.conf.sample
+ at sample %%ETCDIR%%/lang-pt-BR.conf.sample
+ at sample %%ETCDIR%%/lang-ro.conf.sample
+ at sample %%ETCDIR%%/lang-ru.conf.sample
+ at sample %%ETCDIR%%/lang-uk.conf.sample
+ at sample %%ETCDIR%%/latex.conf.sample
+ at sample %%ETCDIR%%/slidy.conf.sample
 %%ETCDIR%%/stylesheets/asciidoc.css
 %%ETCDIR%%/stylesheets/docbook-xsl.css
 %%ETCDIR%%/stylesheets/pygments.css
@@ -122,26 +78,14 @@
 %%ETCDIR%%/stylesheets/slidy.css
 %%ETCDIR%%/stylesheets/toc2.css
 %%ETCDIR%%/stylesheets/xhtml11-quirks.css
- at unexec if cmp -s %D/%%ETCDIR%%/text.conf.sample %D/%%ETCDIR%%/text.conf; then rm -f %D/%%ETCDIR%%/text.conf; fi
-%%ETCDIR%%/text.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/text.conf ] ; then cp -p %D/%F %B/text.conf; fi
+ at sample %%ETCDIR%%/text.conf.sample
 %%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
- at 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
- at exec if [ ! -f %D/%%ETCDIR%%/xhtml11.conf ] ; then cp -p %D/%F %B/xhtml11.conf; fi
- at unexec if cmp -s %D/%%ETCDIR%%/xhtml11-quirks.conf.sample %D/%%ETCDIR%%/xhtml11-quirks.conf; then rm -f %D/%%ETCDIR%%/xhtml11-quirks.conf; fi
-%%ETCDIR%%/xhtml11-quirks.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/xhtml11-quirks.conf ] ; then cp -p %D/%F %B/xhtml11-quirks.conf; fi
-share/vim/vimfiles/ftdetect/asciidoc_filetype.vim
-share/vim/vimfiles/syntax/asciidoc.vim
- at dirrmtry share/vim/vimfiles/syntax
- at dirrmtry share/vim/vimfiles/ftdetect
- at dirrmtry share/vim/vimfiles
- at dirrmtry share/vim
+ at sample %%ETCDIR%%/xhtml11.conf.sample
+ at sample %%ETCDIR%%/xhtml11-quirks.conf.sample
+%%PYTHON_SITELIBDIR%%/asciidocapi.py
+man/man1/a2x.1.gz
+man/man1/asciidoc.1.gz
 @dirrm %%ETCDIR%%/themes/volnitsky
 @dirrm %%ETCDIR%%/themes/flask
 @dirrm %%ETCDIR%%/themes



More information about the Midnightbsd-cvs mailing list