Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Jul 2008 16:16:28 +0800 (CST)
From:      Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        anholt@FreeBSD.org
Subject:   ports/125468: [PATCH] textproc/asciidoc: update to 8.2.7
Message-ID:  <200807100816.m6A8GSaC003448@stucgi.cs.nctu.edu.tw>
Resent-Message-ID: <200807100830.m6A8U2MV067554@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         125468
>Category:       ports
>Synopsis:       [PATCH] textproc/asciidoc: update to 8.2.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 10 08:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Yi-Jheng Lin
>Release:        FreeBSD 7.0-RELEASE-p1 amd64
>Organization:
NCTU CS
>Environment:
System: FreeBSD stucgi 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Thu Apr 17 15:56:39 CST 2008
>Description:
- Update to 8.2.7

Port maintainer (anholt@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- asciidoc-8.2.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/asciidoc/Makefile /amd/account/gcs/96/9655630/dev/ports/textproc/asciidoc/Makefile
--- /usr/ports/textproc/asciidoc/Makefile	2007-05-26 03:04:44.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/textproc/asciidoc/Makefile	2008-07-10 16:17:29.000000000 +0800
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asciidoc
-PORTVERSION= 	8.1.0
+PORTVERSION=	8.2.7
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.methods.co.nz/asciidoc/ \
 		SF
@@ -14,43 +14,63 @@
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	A text document format for writing short documents and man pages
 
-USE_PYTHON=	yes
+USE_PYTHON=	2.4+
 
 NO_BUILD=	yes
 
 MAN1=		a2x.1 asciidoc.1
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	BUGS CHANGELOG INSTALL README
+.endif
+
 pre-patch:
 	${REINPLACE_CMD} \
-		-e "s|/bin/bash|/usr/bin/env bash|g" \
-		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
-		${WRKSRC}/a2x
-	${REINPLACE_CMD} \
 		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
-		${WRKSRC}/asciidoc.py
+		${WRKSRC}/a2x ${WRKSRC}/asciidoc.py
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${PREFIX}/bin/asciidoc
 	${INSTALL_SCRIPT} ${WRKSRC}/a2x ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/asciidoc
-	${INSTALL_DATA} ${WRKSRC}/*.conf ${PREFIX}/etc/asciidoc
-	${MKDIR} ${PREFIX}/etc/asciidoc/filters
-	${INSTALL_DATA} ${WRKSRC}/filters/code-filter.conf \
-		${PREFIX}/etc/asciidoc/filters
-	${INSTALL_SCRIPT} ${WRKSRC}/filters/code-filter.py \
-		${PREFIX}/etc/asciidoc/filters
-	${MKDIR} ${PREFIX}/etc/asciidoc/docbook-xsl
+	${MKDIR} ${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.conf ${ETCDIR}
+	${MKDIR} ${ETCDIR}/filters
+	${INSTALL_SCRIPT} ${WRKSRC}/filters/*.py \
+		${ETCDIR}/filters
+	${INSTALL_DATA} ${WRKSRC}/filters/*.conf \
+		${ETCDIR}/filters
+	${MKDIR} ${ETCDIR}/docbook-xsl
 	${INSTALL_DATA} ${WRKSRC}/docbook-xsl/*.xsl \
-		${PREFIX}/etc/asciidoc/docbook-xsl
-	${MKDIR} ${PREFIX}/etc/asciidoc/stylesheets
+		${ETCDIR}/docbook-xsl
+	${MKDIR} ${ETCDIR}/dblatex
+	${INSTALL_DATA} ${WRKSRC}/dblatex/*.xsl \
+		${ETCDIR}/dblatex
+	${INSTALL_DATA} ${WRKSRC}/dblatex/*.sty \
+		${ETCDIR}/dblatex
+	${MKDIR} ${ETCDIR}/stylesheets
 	${INSTALL_DATA} ${WRKSRC}/stylesheets/*.css \
-		${PREFIX}/etc/asciidoc/stylesheets
-	${MKDIR} ${PREFIX}/etc/asciidoc/images/icons/callouts
-	${INSTALL_DATA} ${WRKSRC}/images/icons/*.png \
-		${PREFIX}/etc/asciidoc/images/icons
-	${INSTALL_DATA} ${WRKSRC}/images/icons/callouts/* \
-		${PREFIX}/etc/asciidoc/images/icons/callouts
-	${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${WRKSRC}/doc/asciidoc.1 \
-		${PREFIX}/man/man1
+		${ETCDIR}/stylesheets
+	${MKDIR} ${ETCDIR}/javascripts
+	${INSTALL_DATA} ${WRKSRC}/javascripts/*.js \
+		${ETCDIR}/javascripts
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} images ${ETCDIR})
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} vim ${DATADIR})
+	${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${SH} -c '(${FIND} -L -d $$0 $$2 | \
+		${CPIO} -L -dumpl $$1 >/dev/null 2>&1) && \
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \
+		${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \
+		${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- \
+		* ${EXAMPLESDIR})
+.for i in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/doc/$i ${PREFIX}/man/man1
+.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/textproc/asciidoc/distinfo /amd/account/gcs/96/9655630/dev/ports/textproc/asciidoc/distinfo
--- /usr/ports/textproc/asciidoc/distinfo	2007-05-26 03:04:44.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/textproc/asciidoc/distinfo	2008-07-10 10:17:09.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (asciidoc-8.1.0.tar.gz) = 6d3e050b72a8b6df112c2f9aad7a4016
-SHA256 (asciidoc-8.1.0.tar.gz) = 900e41bd2f8858e4cfc7e3a22ce6e46daaf6373572361b3b62443e65daf5b297
-SIZE (asciidoc-8.1.0.tar.gz) = 761244
+MD5 (asciidoc-8.2.7.tar.gz) = f631c10bcf7216eaf6bc804c84ebb8e1
+SHA256 (asciidoc-8.2.7.tar.gz) = da021d8f32e1bcacfd11b5bb12bd9a9cd9ec9532ad1a54bcd53fed211fe71af6
+SIZE (asciidoc-8.2.7.tar.gz) = 843238
diff -ruN --exclude=CVS /usr/ports/textproc/asciidoc/pkg-plist /amd/account/gcs/96/9655630/dev/ports/textproc/asciidoc/pkg-plist
--- /usr/ports/textproc/asciidoc/pkg-plist	2006-11-16 12:41:56.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/textproc/asciidoc/pkg-plist	2008-07-10 16:10:23.000000000 +0800
@@ -1,59 +1,168 @@
 bin/a2x
 bin/asciidoc
-etc/asciidoc/asciidoc.conf
-etc/asciidoc/docbook-xsl/chunked.xsl
-etc/asciidoc/docbook-xsl/common.xsl
-etc/asciidoc/docbook-xsl/fo.xsl
-etc/asciidoc/docbook-xsl/htmlhelp.xsl
-etc/asciidoc/docbook-xsl/manpage.xsl
-etc/asciidoc/docbook-xsl/xhtml.xsl
-etc/asciidoc/docbook.conf
-etc/asciidoc/filters/code-filter.conf
-etc/asciidoc/filters/code-filter.py
-etc/asciidoc/help.conf
-etc/asciidoc/html4.conf
-etc/asciidoc/images/icons/callouts/1.png
-etc/asciidoc/images/icons/callouts/10.png
-etc/asciidoc/images/icons/callouts/11.png
-etc/asciidoc/images/icons/callouts/12.png
-etc/asciidoc/images/icons/callouts/13.png
-etc/asciidoc/images/icons/callouts/14.png
-etc/asciidoc/images/icons/callouts/15.png
-etc/asciidoc/images/icons/callouts/2.png
-etc/asciidoc/images/icons/callouts/3.png
-etc/asciidoc/images/icons/callouts/4.png
-etc/asciidoc/images/icons/callouts/5.png
-etc/asciidoc/images/icons/callouts/6.png
-etc/asciidoc/images/icons/callouts/7.png
-etc/asciidoc/images/icons/callouts/8.png
-etc/asciidoc/images/icons/callouts/9.png
-etc/asciidoc/images/icons/caution.png
-etc/asciidoc/images/icons/example.png
-etc/asciidoc/images/icons/home.png
-etc/asciidoc/images/icons/important.png
-etc/asciidoc/images/icons/next.png
-etc/asciidoc/images/icons/note.png
-etc/asciidoc/images/icons/prev.png
-etc/asciidoc/images/icons/tip.png
-etc/asciidoc/images/icons/up.png
-etc/asciidoc/images/icons/warning.png
-etc/asciidoc/latex.conf
-etc/asciidoc/linuxdoc.conf
-etc/asciidoc/stylesheets/docbook-xsl.css
-etc/asciidoc/stylesheets/xhtml-deprecated-manpage.css
-etc/asciidoc/stylesheets/xhtml-deprecated.css
-etc/asciidoc/stylesheets/xhtml11-manpage.css
-etc/asciidoc/stylesheets/xhtml11-quirks.css
-etc/asciidoc/stylesheets/xhtml11.css
-etc/asciidoc/text.conf
-etc/asciidoc/xhtml-deprecated-css.conf
-etc/asciidoc/xhtml-deprecated.conf
-etc/asciidoc/xhtml11-quirks.conf
-etc/asciidoc/xhtml11.conf
-@dirrm etc/asciidoc/docbook-xsl
-@dirrm etc/asciidoc/filters
-@dirrm etc/asciidoc/images/icons/callouts
-@dirrm etc/asciidoc/images/icons
-@dirrm etc/asciidoc/images
-@dirrm etc/asciidoc/stylesheets
-@dirrm etc/asciidoc
+%%DATADIR%%/vim/ftdetect/asciidoc_filetype.vim
+%%DATADIR%%/vim/syntax/asciidoc.vim
+%%ETCDIR%%/asciidoc.conf
+%%ETCDIR%%/dblatex/asciidoc-dblatex.sty
+%%ETCDIR%%/dblatex/asciidoc-dblatex.xsl
+%%ETCDIR%%/docbook-xsl/chunked.xsl
+%%ETCDIR%%/docbook-xsl/common.xsl
+%%ETCDIR%%/docbook-xsl/fo.xsl
+%%ETCDIR%%/docbook-xsl/htmlhelp.xsl
+%%ETCDIR%%/docbook-xsl/manpage.xsl
+%%ETCDIR%%/docbook-xsl/xhtml.xsl
+%%ETCDIR%%/docbook.conf
+%%ETCDIR%%/filters/code-filter.conf
+%%ETCDIR%%/filters/code-filter.py
+%%ETCDIR%%/filters/music-filter.conf
+%%ETCDIR%%/filters/music2png.py
+%%ETCDIR%%/filters/source-highlight-filter.conf
+%%ETCDIR%%/help.conf
+%%ETCDIR%%/html4.conf
+%%ETCDIR%%/images/highlighter.png
+%%ETCDIR%%/images/icons/README
+%%ETCDIR%%/images/icons/callouts/1.png
+%%ETCDIR%%/images/icons/callouts/10.png
+%%ETCDIR%%/images/icons/callouts/11.png
+%%ETCDIR%%/images/icons/callouts/12.png
+%%ETCDIR%%/images/icons/callouts/13.png
+%%ETCDIR%%/images/icons/callouts/14.png
+%%ETCDIR%%/images/icons/callouts/15.png
+%%ETCDIR%%/images/icons/callouts/2.png
+%%ETCDIR%%/images/icons/callouts/3.png
+%%ETCDIR%%/images/icons/callouts/4.png
+%%ETCDIR%%/images/icons/callouts/5.png
+%%ETCDIR%%/images/icons/callouts/6.png
+%%ETCDIR%%/images/icons/callouts/7.png
+%%ETCDIR%%/images/icons/callouts/8.png
+%%ETCDIR%%/images/icons/callouts/9.png
+%%ETCDIR%%/images/icons/caution.png
+%%ETCDIR%%/images/icons/example.png
+%%ETCDIR%%/images/icons/home.png
+%%ETCDIR%%/images/icons/important.png
+%%ETCDIR%%/images/icons/next.png
+%%ETCDIR%%/images/icons/note.png
+%%ETCDIR%%/images/icons/prev.png
+%%ETCDIR%%/images/icons/tip.png
+%%ETCDIR%%/images/icons/up.png
+%%ETCDIR%%/images/icons/warning.png
+%%ETCDIR%%/images/smallnew.png
+%%ETCDIR%%/images/tiger.png
+%%ETCDIR%%/javascripts/ASCIIMathML.js
+%%ETCDIR%%/javascripts/LaTeXMathML.js
+%%ETCDIR%%/javascripts/toc.js
+%%ETCDIR%%/lang-es.conf
+%%ETCDIR%%/latex.conf
+%%ETCDIR%%/linuxdoc.conf
+%%ETCDIR%%/math.conf
+%%ETCDIR%%/stylesheets/docbook-xsl.css
+%%ETCDIR%%/stylesheets/xhtml-deprecated-manpage.css
+%%ETCDIR%%/stylesheets/xhtml-deprecated.css
+%%ETCDIR%%/stylesheets/xhtml11-manpage.css
+%%ETCDIR%%/stylesheets/xhtml11-quirks.css
+%%ETCDIR%%/stylesheets/xhtml11.css
+%%ETCDIR%%/t.conf
+%%ETCDIR%%/text.conf
+%%ETCDIR%%/xhtml-deprecated-css.conf
+%%ETCDIR%%/xhtml-deprecated.conf
+%%ETCDIR%%/xhtml11-quirks.conf
+%%ETCDIR%%/xhtml11.conf
+%%EXAMPLESDIR%%/website/ASCIIMathML.js
+%%EXAMPLESDIR%%/website/CHANGELOG.html
+%%EXAMPLESDIR%%/website/CHANGELOG.txt
+%%EXAMPLESDIR%%/website/INSTALL.html
+%%EXAMPLESDIR%%/website/INSTALL.txt
+%%EXAMPLESDIR%%/website/LaTeXMathML.js
+%%EXAMPLESDIR%%/website/README-website.html
+%%EXAMPLESDIR%%/website/README-website.txt
+%%EXAMPLESDIR%%/website/README.html
+%%EXAMPLESDIR%%/website/README.txt
+%%EXAMPLESDIR%%/website/a2x.1.html
+%%EXAMPLESDIR%%/website/a2x.1.txt
+%%EXAMPLESDIR%%/website/asciidoc-docbook-xsl.html
+%%EXAMPLESDIR%%/website/asciidoc-docbook-xsl.txt
+%%EXAMPLESDIR%%/website/asciimath.html
+%%EXAMPLESDIR%%/website/asciimath.txt
+%%EXAMPLESDIR%%/website/build-website.sh
+%%EXAMPLESDIR%%/website/customers.csv
+%%EXAMPLESDIR%%/website/downloads.html
+%%EXAMPLESDIR%%/website/downloads.txt
+%%EXAMPLESDIR%%/website/faq.html
+%%EXAMPLESDIR%%/website/faq.txt
+%%EXAMPLESDIR%%/website/index.html
+%%EXAMPLESDIR%%/website/index.txt
+%%EXAMPLESDIR%%/website/images/highlighter.png
+%%EXAMPLESDIR%%/website/images/icons/README
+%%EXAMPLESDIR%%/website/images/icons/callouts/1.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/10.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/11.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/12.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/13.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/14.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/15.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/2.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/3.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/4.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/5.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/6.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/7.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/8.png
+%%EXAMPLESDIR%%/website/images/icons/callouts/9.png
+%%EXAMPLESDIR%%/website/images/icons/caution.png
+%%EXAMPLESDIR%%/website/images/icons/example.png
+%%EXAMPLESDIR%%/website/images/icons/home.png
+%%EXAMPLESDIR%%/website/images/icons/important.png
+%%EXAMPLESDIR%%/website/images/icons/next.png
+%%EXAMPLESDIR%%/website/images/icons/note.png
+%%EXAMPLESDIR%%/website/images/icons/prev.png
+%%EXAMPLESDIR%%/website/images/icons/tip.png
+%%EXAMPLESDIR%%/website/images/icons/up.png
+%%EXAMPLESDIR%%/website/images/icons/warning.png
+%%EXAMPLESDIR%%/website/images/smallnew.png
+%%EXAMPLESDIR%%/website/images/tiger.png
+%%EXAMPLESDIR%%/website/latex-backend.html
+%%EXAMPLESDIR%%/website/latex-backend.txt
+%%EXAMPLESDIR%%/website/latexmath.html
+%%EXAMPLESDIR%%/website/latexmath.txt
+%%EXAMPLESDIR%%/website/layout1.conf
+%%EXAMPLESDIR%%/website/layout1.css
+%%EXAMPLESDIR%%/website/layout2.conf
+%%EXAMPLESDIR%%/website/layout2.css
+%%EXAMPLESDIR%%/website/manpage.html
+%%EXAMPLESDIR%%/website/manpage.txt
+%%EXAMPLESDIR%%/website/music-filter.html
+%%EXAMPLESDIR%%/website/music-filter.txt
+%%EXAMPLESDIR%%/website/music1.abc
+%%EXAMPLESDIR%%/website/music1.png
+%%EXAMPLESDIR%%/website/music2.ly
+%%EXAMPLESDIR%%/website/music2.png
+%%EXAMPLESDIR%%/website/source-highlight-filter.html
+%%EXAMPLESDIR%%/website/source-highlight-filter.txt
+%%EXAMPLESDIR%%/website/support.html
+%%EXAMPLESDIR%%/website/support.txt
+%%EXAMPLESDIR%%/website/toc.js
+%%EXAMPLESDIR%%/website/userguide.html
+%%EXAMPLESDIR%%/website/userguide.txt
+%%EXAMPLESDIR%%/website/version9.html
+%%EXAMPLESDIR%%/website/version9.txt
+%%EXAMPLESDIR%%/website/xhtml11-manpage.css
+%%EXAMPLESDIR%%/website/xhtml11-quirks.css
+%%EXAMPLESDIR%%/website/xhtml11.css
+@dirrm %%DATADIR%%/vim/syntax
+@dirrm %%DATADIR%%/vim/ftdetect
+@dirrm %%DATADIR%%/vim
+@dirrm %%DATADIR%%
+@dirrm %%ETCDIR%%/stylesheets
+@dirrm %%ETCDIR%%/javascripts
+@dirrm %%ETCDIR%%/images/icons/callouts
+@dirrm %%ETCDIR%%/images/icons
+@dirrm %%ETCDIR%%/images
+@dirrm %%ETCDIR%%/filters
+@dirrm %%ETCDIR%%/docbook-xsl
+@dirrm %%ETCDIR%%/dblatex
+@dirrm %%ETCDIR%%
+@dirrm %%EXAMPLESDIR%%/website/images/icons/callouts
+@dirrm %%EXAMPLESDIR%%/website/images/icons
+@dirrm %%EXAMPLESDIR%%/website/images
+@dirrm %%EXAMPLESDIR%%/website
+@dirrm %%EXAMPLESDIR%%
--- asciidoc-8.2.7.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807100816.m6A8GSaC003448>