Date: Sun, 27 Dec 2009 19:48:04 +0100 (CET) From: Peter Schuller <peter.schuller@infidyne.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/142081: [MAINTAINER] textproc/asciidoc: update to 8.5.2 Message-ID: <20091227184804.1FDFE21B6C4@prometheus.scode.org> Resent-Message-ID: <200912271910.nBRJA2CT067929@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142081 >Category: ports >Synopsis: [MAINTAINER] textproc/asciidoc: update to 8.5.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Dec 27 19:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: peter.schuller@infidyne.com >Release: FreeBSD 8.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD prometheus.scode.org 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Sat Nov 21 15:02:08 UTC 2009 >Description: - Update to 8.5.2 - Shell script was converted to python upstream -> patching of a2x no longer needed Removed file(s): - files/patch-a2x Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- asciidoc-8.5.2_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/textproc/asciidoc.orig/Makefile /usr/ports/textproc/asciidoc/Makefile --- /usr/ports/textproc/asciidoc.orig/Makefile 2009-08-27 17:04:16.000000000 +0200 +++ /usr/ports/textproc/asciidoc/Makefile 2009-12-27 19:41:05.808036124 +0100 @@ -6,7 +6,7 @@ # PORTNAME= asciidoc -PORTVERSION= 8.4.5 +PORTVERSION= 8.5.2 PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.methods.co.nz/asciidoc/ \ @@ -30,12 +30,4 @@ # 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 -ruN --exclude=CVS /usr/ports/textproc/asciidoc.orig/distinfo /usr/ports/textproc/asciidoc/distinfo --- /usr/ports/textproc/asciidoc.orig/distinfo 2009-07-06 00:24:18.000000000 +0200 +++ /usr/ports/textproc/asciidoc/distinfo 2009-12-27 19:35:50.340745844 +0100 @@ -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 -ruN --exclude=CVS /usr/ports/textproc/asciidoc.orig/files/patch-a2x /usr/ports/textproc/asciidoc/files/patch-a2x --- /usr/ports/textproc/asciidoc.orig/files/patch-a2x 2009-07-28 16:50:25.000000000 +0200 +++ /usr/ports/textproc/asciidoc/files/patch-a2x 1970-01-01 01:00:00.000000000 +0100 @@ -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 -ruN --exclude=CVS /usr/ports/textproc/asciidoc.orig/pkg-plist /usr/ports/textproc/asciidoc/pkg-plist --- /usr/ports/textproc/asciidoc.orig/pkg-plist 2009-07-06 00:24:18.000000000 +0200 +++ /usr/ports/textproc/asciidoc/pkg-plist 2009-12-27 19:43:56.715812608 +0100 @@ -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.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/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 --- asciidoc-8.5.2_1.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?20091227184804.1FDFE21B6C4>