Hi,
this updates asciidoc to its latest version.
I need it to update x11/awesome to 3.4.5...
Since it can depend on big monsters like math/graphviz, textproc/dblatex,
textproc/source-highlight and print/lilypond, I choose to follow netbsd
approach of requiring only the bare minimum.
What do you think about?
cheers,
david
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/asciidoc/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 14 Mar 2009 14:47:28 -0000 1.5
+++ Makefile 3 Jun 2010 20:51:43 -0000
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2009/03/14 14:47:28 espie Exp $
-COMMENT= A text document format for writing documents and man pages
+COMMENT= ASCII to formatted documents converter
-DISTNAME= asciidoc-8.2.7
-PKGNAME = ${DISTNAME}p0
+DISTNAME= asciidoc-8.5.3
CATEGORIES= textproc
MAINTAINER= Robert Nagy <rob...@openbsd.org>
@@ -16,51 +15,33 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE} \
- ${MASTER_SITE_SOURCEFORGE:=asciidoc/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asciidoc/}
MODULES= lang/python
-RUN_DEPENDS= ::misc/gnugetopt \
- ::shells/bash \
- ::textproc/libxslt
+
+RUN_DEPENDS= ::textproc/libxml \
+ ::textproc/libxslt \
+ ::textproc/docbook \
+ ::textproc/docbook-xsl
NO_BUILD= Yes
NO_REGRESS= Yes
post-configure:
- @perl -pi -e 's,/usr/bin/env python,/usr/bin/env ${MODPY_BIN},g' \
- ${WRKSRC}/asciidoc.py ${WRKSRC}/filters/*.py
+ @perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g' \
+ ${WRKSRC}/a2x.py ${WRKSRC}/asciidoc*.py \
+ ${WRKSRC}/filters/*/*.py
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${PREFIX}/bin/asciidoc
- ${INSTALL_SCRIPT} ${WRKSRC}/a2x ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/a2x.py ${PREFIX}/bin/a2x
${INSTALL_MAN} ${WRKSRC}/doc/asciidoc.1 ${WRKSRC}/doc/a2x.1 \
- ${PREFIX}/man/man1
-
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/asciidoc \
- ${PREFIX}/share/examples/asciidoc/filters \
- ${PREFIX}/share/examples/asciidoc/docbook-xsl \
- ${PREFIX}/share/examples/asciidoc/stylesheets \
- ${PREFIX}/share/examples/asciidoc/javascripts \
-
${PREFIX}/share/examples/asciidoc/images/icons/callouts
-
- ${INSTALL_DATA} ${WRKSRC}/*.conf ${PREFIX}/share/examples/asciidoc
-
- ${INSTALL_SCRIPT} ${WRKSRC}/filters/code-filter.py \
- ${WRKSRC}/filters/music2png.py \
- ${PREFIX}/share/examples/asciidoc/filters
-
- ${INSTALL_DATA} ${WRKSRC}/filters/*.conf \
- ${PREFIX}/share/examples/asciidoc/filters
- ${INSTALL_DATA} ${WRKSRC}/docbook-xsl/*.xsl \
- ${PREFIX}/share/examples/asciidoc/docbook-xsl
- ${INSTALL_DATA} ${WRKSRC}/stylesheets/*.css \
- ${PREFIX}/share/examples/asciidoc/stylesheets
- ${INSTALL_DATA} ${WRKSRC}/javascripts/*.js \
- ${PREFIX}/share/examples/asciidoc/javascripts
- ${INSTALL_DATA} ${WRKSRC}/images/icons/*.png \
- ${PREFIX}/share/examples/asciidoc/images/icons
- ${INSTALL_DATA} ${WRKSRC}/images/icons/callouts/* \
- ${PREFIX}/share/examples/asciidoc/images/icons/callouts
+ ${PREFIX}/man/man1/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/asciidoc
+ cd ${WRKSRC} && umask 022 && pax -rw *.conf dblatex \
+ filters docbook-xsl/*.xsl stylesheets/*.css \
+ javascripts/*.js images/icons/callouts/* images/icons/*.png \
+ images/icons/README \
+ ${PREFIX}/share/examples/asciidoc/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/asciidoc/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 10 Nov 2008 11:58:34 -0000 1.4
+++ distinfo 3 Jun 2010 20:51:43 -0000
@@ -1,5 +1,5 @@
-MD5 (asciidoc-8.2.7.tar.gz) = 9jHBC89yFur2vIBMhOu44Q==
-RMD160 (asciidoc-8.2.7.tar.gz) = 2bGbW9kKfuJrPWO6i19s5ghB5iw=
-SHA1 (asciidoc-8.2.7.tar.gz) = 7HhGVPAfOqca9kU8iYWDkBB1n6s=
-SHA256 (asciidoc-8.2.7.tar.gz) = 2gIdjzLhvKz9EbW7Er2anNnslTKtGlS81T/tIR/nGvY=
-SIZE (asciidoc-8.2.7.tar.gz) = 843238
+MD5 (asciidoc-8.5.3.tar.gz) = c3eHInXCpXUVFlWxmsbdPg==
+RMD160 (asciidoc-8.5.3.tar.gz) = w0qivnvDD4rA270WL5/uy7NFz5g=
+SHA1 (asciidoc-8.5.3.tar.gz) = eP11bhfJuDq/60OAbf+V2xC/+Lw=
+SHA256 (asciidoc-8.5.3.tar.gz) = np9p3RC1l1Q21I2HwgIIKhKDKWlhkeqNvG0vdyL9QbU=
+SIZE (asciidoc-8.5.3.tar.gz) = 1254979
Index: patches/patch-a2x
===================================================================
RCS file: patches/patch-a2x
diff -N patches/patch-a2x
--- patches/patch-a2x 10 Nov 2008 11:58:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-a2x,v 1.2 2008/11/10 11:58:34 pea Exp $
---- a2x.orig Wed Jul 2 03:12:42 2008
-+++ a2x Mon Nov 10 09:43:01 2008
-@@ -236,14 +236,14 @@ function parse_options()
- if [ -z "$*" ]; then
- help; exit 0
- fi
-- require "getopt"
-- getopt -T >/dev/null
-+ require "gnugetopt"
-+ gnugetopt -T >/dev/null
- if [ $? -ne 4 ]; then
- quit "enhanced getopt(1) required"
- fi
- short_opts="a:d:D:f:hnsv"
-
long_opts="attribute:,asciidoc-opts:,destination-dir:,doctype:,help,icons-dir:,dry-run,format:,copy,icons,skip-asciidoc,stylesheet:,version,verbose,xsltproc-opts:,dblatex-opts:,fop-opts:"
-- args=$(getopt -o $short_opts -l $long_opts -n $BASENAME -- "$@"
2>/dev/null)
-+ args=$(gnugetopt -o $short_opts -l $long_opts -n $BASENAME -- "$@"
2>/dev/null)
- if [ $? -ne 0 ]; then
- quit "invalid command options, run: a2x --help"
- fi
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/asciidoc/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 10 Nov 2008 11:58:34 -0000 1.4
+++ pkg/PLIST 3 Jun 2010 20:51:43 -0000
@@ -7,34 +7,68 @@ share/examples/asciidoc/
@sample ${SYSCONFDIR}/asciidoc/
share/examples/asciidoc/asciidoc.conf
@sample ${SYSCONFDIR}/asciidoc/asciidoc.conf
+share/examples/asciidoc/dblatex/
+...@sample ${SYSCONFDIR}/asciidoc/dblatex/
+share/examples/asciidoc/dblatex/asciidoc-dblatex.sty
+...@sample ${SYSCONFDIR}/asciidoc/dblatex/asciidoc-dblatex.sty
+share/examples/asciidoc/dblatex/asciidoc-dblatex.xsl
+...@sample ${SYSCONFDIR}/asciidoc/dblatex/asciidoc-dblatex.xsl
+share/examples/asciidoc/dblatex/dblatex-readme.txt
+...@sample ${SYSCONFDIR}/asciidoc/dblatex/dblatex-readme.txt
share/examples/asciidoc/docbook-xsl/
@sample ${SYSCONFDIR}/asciidoc/docbook-xsl/
share/examples/asciidoc/docbook-xsl/chunked.xsl
@sample ${SYSCONFDIR}/asciidoc/docbook-xsl/chunked.xsl
share/examples/asciidoc/docbook-xsl/common.xsl
@sample ${SYSCONFDIR}/asciidoc/docbook-xsl/common.xsl
+share/examples/asciidoc/docbook-xsl/epub.xsl
+...@sample ${SYSCONFDIR}/asciidoc/docbook-xsl/epub.xsl
share/examples/asciidoc/docbook-xsl/fo.xsl
@sample ${SYSCONFDIR}/asciidoc/docbook-xsl/fo.xsl
share/examples/asciidoc/docbook-xsl/htmlhelp.xsl
@sample ${SYSCONFDIR}/asciidoc/docbook-xsl/htmlhelp.xsl
share/examples/asciidoc/docbook-xsl/manpage.xsl
@sample ${SYSCONFDIR}/asciidoc/docbook-xsl/manpage.xsl
+share/examples/asciidoc/docbook-xsl/text.xsl
+...@sample ${SYSCONFDIR}/asciidoc/docbook-xsl/text.xsl
share/examples/asciidoc/docbook-xsl/xhtml.xsl
@sample ${SYSCONFDIR}/asciidoc/docbook-xsl/xhtml.xsl
share/examples/asciidoc/docbook.conf
@sample ${SYSCONFDIR}/asciidoc/docbook.conf
share/examples/asciidoc/filters/
@sample ${SYSCONFDIR}/asciidoc/filters/
-share/examples/asciidoc/filters/code-filter.conf
-...@sample ${SYSCONFDIR}/asciidoc/filters/code-filter.conf
-share/examples/asciidoc/filters/code-filter.py
-...@sample ${SYSCONFDIR}/asciidoc/filters/code-filter.py
-share/examples/asciidoc/filters/music-filter.conf
-...@sample ${SYSCONFDIR}/asciidoc/filters/music-filter.conf
-share/examples/asciidoc/filters/music2png.py
-...@sample ${SYSCONFDIR}/asciidoc/filters/music2png.py
-share/examples/asciidoc/filters/source-highlight-filter.conf
-...@sample ${SYSCONFDIR}/asciidoc/filters/source-highlight-filter.conf
+share/examples/asciidoc/filters/code/
+...@sample ${SYSCONFDIR}/asciidoc/filters/code/
+share/examples/asciidoc/filters/code/code-filter-readme.txt
+...@sample ${SYSCONFDIR}/asciidoc/filters/code/code-filter-readme.txt
+share/examples/asciidoc/filters/code/code-filter-test.txt
+...@sample ${SYSCONFDIR}/asciidoc/filters/code/code-filter-test.txt
+share/examples/asciidoc/filters/code/code-filter.conf
+...@sample ${SYSCONFDIR}/asciidoc/filters/code/code-filter.conf
+share/examples/asciidoc/filters/code/code-filter.py
+...@sample ${SYSCONFDIR}/asciidoc/filters/code/code-filter.py
+share/examples/asciidoc/filters/graphviz/
+...@sample ${SYSCONFDIR}/asciidoc/filters/graphviz/
+share/examples/asciidoc/filters/graphviz/asciidoc-graphviz-sample.txt
+...@sample ${SYSCONFDIR}/asciidoc/filters/graphviz/asciidoc-graphviz-sample.txt
+share/examples/asciidoc/filters/graphviz/graphviz-filter.conf
+...@sample ${SYSCONFDIR}/asciidoc/filters/graphviz/graphviz-filter.conf
+share/examples/asciidoc/filters/graphviz/graphviz2png.py
+...@sample ${SYSCONFDIR}/asciidoc/filters/graphviz/graphviz2png.py
+share/examples/asciidoc/filters/music/
+...@sample ${SYSCONFDIR}/asciidoc/filters/music/
+share/examples/asciidoc/filters/music/music-filter-test.txt
+...@sample ${SYSCONFDIR}/asciidoc/filters/music/music-filter-test.txt
+share/examples/asciidoc/filters/music/music-filter.conf
+...@sample ${SYSCONFDIR}/asciidoc/filters/music/music-filter.conf
+share/examples/asciidoc/filters/music/music2png.py
+...@sample ${SYSCONFDIR}/asciidoc/filters/music/music2png.py
+share/examples/asciidoc/filters/source/
+...@sample ${SYSCONFDIR}/asciidoc/filters/source/
+share/examples/asciidoc/filters/source/source-highlight-filter-test.txt
+...@sample
${SYSCONFDIR}/asciidoc/filters/source/source-highlight-filter-test.txt
+share/examples/asciidoc/filters/source/source-highlight-filter.conf
+...@sample ${SYSCONFDIR}/asciidoc/filters/source/source-highlight-filter.conf
share/examples/asciidoc/help.conf
@sample ${SYSCONFDIR}/asciidoc/help.conf
share/examples/asciidoc/html4.conf
@@ -43,6 +77,8 @@ share/examples/asciidoc/images/
@sample ${SYSCONFDIR}/asciidoc/images/
share/examples/asciidoc/images/icons/
@sample ${SYSCONFDIR}/asciidoc/images/icons/
+share/examples/asciidoc/images/icons/README
+...@sample ${SYSCONFDIR}/asciidoc/images/icons/README
share/examples/asciidoc/images/icons/callouts/
@sample ${SYSCONFDIR}/asciidoc/images/icons/callouts/
share/examples/asciidoc/images/icons/callouts/1.png
@@ -101,37 +137,42 @@ share/examples/asciidoc/javascripts/ASCI
@sample ${SYSCONFDIR}/asciidoc/javascripts/ASCIIMathML.js
share/examples/asciidoc/javascripts/LaTeXMathML.js
@sample ${SYSCONFDIR}/asciidoc/javascripts/LaTeXMathML.js
+share/examples/asciidoc/javascripts/asciidoc-xhtml11.js
+...@sample ${SYSCONFDIR}/asciidoc/javascripts/asciidoc-xhtml11.js
share/examples/asciidoc/javascripts/toc.js
@sample ${SYSCONFDIR}/asciidoc/javascripts/toc.js
+share/examples/asciidoc/lang-de.conf
+...@sample ${SYSCONFDIR}/asciidoc/lang-de.conf
+share/examples/asciidoc/lang-en.conf
+...@sample ${SYSCONFDIR}/asciidoc/lang-en.conf
share/examples/asciidoc/lang-es.conf
+...@sample ${SYSCONFDIR}/asciidoc/lang-es.conf
+share/examples/asciidoc/lang-fr.conf
+...@sample ${SYSCONFDIR}/asciidoc/lang-fr.conf
+share/examples/asciidoc/lang-hu.conf
+...@sample ${SYSCONFDIR}/asciidoc/lang-hu.conf
+share/examples/asciidoc/lang-it.conf
+...@sample ${SYSCONFDIR}/asciidoc/lang-it.conf
+share/examples/asciidoc/lang-pt-BR.conf
+...@sample ${SYSCONFDIR}/asciidoc/lang-pt-BR.conf
+share/examples/asciidoc/lang-ru.conf
+...@sample ${SYSCONFDIR}/asciidoc/lang-ru.conf
share/examples/asciidoc/latex.conf
@sample ${SYSCONFDIR}/asciidoc/latex.conf
-share/examples/asciidoc/linuxdoc.conf
-...@sample ${SYSCONFDIR}/asciidoc/linuxdoc.conf
-share/examples/asciidoc/math.conf
-...@sample ${SYSCONFDIR}/asciidoc/math.conf
share/examples/asciidoc/stylesheets/
@sample ${SYSCONFDIR}/asciidoc/stylesheets/
share/examples/asciidoc/stylesheets/docbook-xsl.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/docbook-xsl.css
-share/examples/asciidoc/stylesheets/xhtml-deprecated-manpage.css
-...@sample ${SYSCONFDIR}/asciidoc/stylesheets/xhtml-deprecated-manpage.css
-share/examples/asciidoc/stylesheets/xhtml-deprecated.css
-...@sample ${SYSCONFDIR}/asciidoc/stylesheets/xhtml-deprecated.css
share/examples/asciidoc/stylesheets/xhtml11-manpage.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/xhtml11-manpage.css
share/examples/asciidoc/stylesheets/xhtml11-quirks.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/xhtml11-quirks.css
share/examples/asciidoc/stylesheets/xhtml11.css
@sample ${SYSCONFDIR}/asciidoc/stylesheets/xhtml11.css
-share/examples/asciidoc/t.conf
-...@sample ${SYSCONFDIR}/asciidoc/t.conf
share/examples/asciidoc/text.conf
@sample ${SYSCONFDIR}/asciidoc/text.conf
-share/examples/asciidoc/xhtml-deprecated-css.conf
-...@sample ${SYSCONFDIR}/asciidoc/xhtml-deprecated-css.conf
-share/examples/asciidoc/xhtml-deprecated.conf
-...@sample ${SYSCONFDIR}/asciidoc/xhtml-deprecated.conf
+share/examples/asciidoc/wordpress.conf
+...@sample ${SYSCONFDIR}/asciidoc/wordpress.conf
share/examples/asciidoc/xhtml11-quirks.conf
@sample ${SYSCONFDIR}/asciidoc/xhtml11-quirks.conf
share/examples/asciidoc/xhtml11.conf
