4 files changed, 9 insertions, 74 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index a228ff01626f..c3dedc38ae1f 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asciidoc
-PORTVERSION=	8.4.5
-PORTREVISION=	1
+PORTVERSION=	8.5.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.methods.co.nz/asciidoc/ \
 		SF
@@ -30,12 +29,4 @@ MAN1=		a2x.1 asciidoc.1
 # highlighing mode which is currently disabled by being patched away in
 # Makefile.in
 
-pre-patch:
-	@${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|g" \
-		${WRKSRC}/a2x ${WRKSRC}/asciidoc.py
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${LOCALBASE}|g" \
-		${WRKSRC}/a2x
-
 .include <bsd.port.mk>
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index 197b1c1802fa..7a161d396321 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,3 +1,3 @@
-MD5 (asciidoc-8.4.5.tar.gz) = 9f21d6e352b3ab668f9def3eb7497da2
-SHA256 (asciidoc-8.4.5.tar.gz) = e7e4df8fd984520ee692bb639679d51f5be279ef96dc23efd229e2bc100152db
-SIZE (asciidoc-8.4.5.tar.gz) = 1189280
+MD5 (asciidoc-8.5.2.tar.gz) = 3ed69184645b233b83a52f8a722d1461
+SHA256 (asciidoc-8.5.2.tar.gz) = 357bb224f18c65d9755f2359318c5b6aeda07a93764e3f35cad2478d597769f3
+SIZE (asciidoc-8.5.2.tar.gz) = 1256406
diff --git a/textproc/asciidoc/files/patch-a2x b/textproc/asciidoc/files/patch-a2x
deleted file mode 100644
index 6de1aeb321d1..000000000000
--- a/textproc/asciidoc/files/patch-a2x
+++ /dev/null
@@ -1,61 +0,0 @@
---- a2x.orig	2009-07-23 18:51:01.485493322 +0200
-+++ a2x	2009-07-23 18:52:01.107211768 +0200
-@@ -9,11 +9,12 @@
- 
- VERSION=1.0.0
- BASENAME=$(basename "$0")
-+GETOPT=%%PREFIX%%/bin/getopt
- REALNAME="$0"
- if [ ! -e "$REALNAME" ]; then
-     REALNAME=$(which "$REALNAME")
- fi
--REALNAME="$(readlink -f "$REALNAME")"
-+REALNAME="$(/bin/realpath "$REALNAME")"
- CONF_DIR=/etc/asciidoc
- # FOP executable is named fop on some systems.
- FOP_COMMAND="fop.sh"
-@@ -244,14 +245,14 @@
-     if [ -z "$*" ]; then
-         help; exit 0
-     fi
--    require "getopt"
--    getopt -T >/dev/null
-+    require "$GETOPT"
-+    $GETOPT -T >/dev/null
-     if [ $? -ne 4 ]; then
-         quit "enhanced getopt(1) required"
-     fi
-     short_opts="a:d:D:f:hLnsv"
-     long_opts="attribute:,asciidoc-opts:,destination-dir:,doctype:,help,icons-dir:,dry-run,format:,copy,icons,skip-asciidoc,stylesheet:,unsafe,version,verbose,xsltproc-opts:,dblatex-opts:,fop,fop-opts:,no-xmllint"
--    args=$(getopt -o $short_opts -l $long_opts -n $BASENAME -- "$@" 2>/dev/null)
-+    args=$($GETOPT -o $short_opts -l $long_opts -n $BASENAME -- "$@" 2>/dev/null)
-     if [ $? -ne 0 ]; then
-         quit "invalid command options, run: a2x --help"
-     fi
-@@ -494,7 +495,7 @@
-         quit "file not found: $xsl"
-     fi
-     to_docbook
--    xml=$(readlink -f "$SRC_DIR/$SRC_NAME.xml")
-+    xml=$(/bin/realpath "$SRC_DIR/$SRC_NAME.xml")
-     html="$SRC_NAME.html"
-     copy_stylesheet_and_icons "$DESTINATION_DIR"
-     execute_command_2 "cd \"$DESTINATION_DIR\""
-@@ -527,7 +528,7 @@
-         quit "file not found: $xsl"
-     fi
-     to_docbook
--    xml=$(readlink -f "$SRC_DIR/$SRC_NAME.xml")
-+    xml=$(/bin/realpath "$SRC_DIR/$SRC_NAME.xml")
-     if [ ! -d "$chunkdir" ]; then
-         execute_command_2 "mkdir \"$chunkdir\""
-     fi
-@@ -549,7 +550,7 @@
-         quit "file not found: $xsl"
-     fi
-     to_docbook "-d manpage"
--    xml=$(readlink -f "$SRC_DIR/$SRC_NAME.xml")
-+    xml=$(/bin/realpath "$SRC_DIR/$SRC_NAME.xml")
-     execute_command_2 "cd \"$DESTINATION_DIR\""
-     execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet \
-         \"$xsl\" \"$xml\""
diff --git a/textproc/asciidoc/pkg-plist b/textproc/asciidoc/pkg-plist
index 40e83bc8c65f..cc3d88720dc8 100644
--- a/textproc/asciidoc/pkg-plist
+++ b/textproc/asciidoc/pkg-plist
@@ -1,4 +1,5 @@
 bin/a2x
+bin/a2x.py
 bin/asciidoc
 bin/asciidoc.py
 etc/asciidoc/asciidoc.conf
@@ -6,6 +7,7 @@ etc/asciidoc/dblatex/asciidoc-dblatex.sty
 etc/asciidoc/dblatex/asciidoc-dblatex.xsl
 etc/asciidoc/docbook-xsl/chunked.xsl
 etc/asciidoc/docbook-xsl/common.xsl
+etc/asciidoc/docbook-xsl/epub.xsl
 etc/asciidoc/docbook-xsl/fo.xsl
 etc/asciidoc/docbook-xsl/htmlhelp.xsl
 etc/asciidoc/docbook-xsl/manpage.xsl
@@ -49,12 +51,15 @@ etc/asciidoc/images/icons/up.png
 etc/asciidoc/images/icons/warning.png
 etc/asciidoc/javascripts/ASCIIMathML.js
 etc/asciidoc/javascripts/LaTeXMathML.js
+etc/asciidoc/javascripts/asciidoc-xhtml11.js
 etc/asciidoc/javascripts/toc.js
 etc/asciidoc/lang-de.conf
 etc/asciidoc/lang-en.conf
 etc/asciidoc/lang-es.conf
 etc/asciidoc/lang-fr.conf
 etc/asciidoc/lang-hu.conf
+etc/asciidoc/lang-it.conf
+etc/asciidoc/lang-pt-BR.conf
 etc/asciidoc/lang-ru.conf
 etc/asciidoc/latex.conf
 etc/asciidoc/stylesheets/docbook-xsl.css