From scode@prometheus.scode.org  Sun Dec 27 19:09:13 2009
Return-Path: <scode@prometheus.scode.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B8114106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Dec 2009 19:09:13 +0000 (UTC)
	(envelope-from scode@prometheus.scode.org)
Received: from proxy3.bredband.net (proxy3.bredband.net [195.54.101.73])
	by mx1.freebsd.org (Postfix) with ESMTP id 735658FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Dec 2009 19:09:12 +0000 (UTC)
Received: from ipb2.telenor.se (195.54.127.165) by proxy3.bredband.net (7.3.140.3)
        id 4AD3E1BA01F2B84E for FreeBSD-gnats-submit@freebsd.org; Sun, 27 Dec 2009 19:48:10 +0100
Received: from c-129372d5.03-51-73746f3.cust.bredbandsbolaget.se (HELO prometheus.scode.org) ([213.114.147.18])
  by ipb2.telenor.se with ESMTP; 27 Dec 2009 19:48:10 +0100
Received: by prometheus.scode.org (Postfix, from userid 1001)
	id 1FDFE21B6C4; Sun, 27 Dec 2009 19:48:04 +0100 (CET)
Message-Id: <20091227184804.1FDFE21B6C4@prometheus.scode.org>
Date: Sun, 27 Dec 2009 19:48:04 +0100 (CET)
From: Peter Schuller <peter.schuller@infidyne.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] textproc/asciidoc: update to 8.5.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 27 19:10:01 UTC 2009
>Closed-Date:    Mon Dec 28 03:01:35 UTC 2009
>Last-Modified:  Mon Dec 28 03:10:03 UTC 2009
>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:
State-Changed-From-To: open->closed 
State-Changed-By: wen 
State-Changed-When: Mon Dec 28 03:01:34 UTC 2009 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142081 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142081: commit references a PR
Date: Mon, 28 Dec 2009 03:00:20 +0000 (UTC)

 wen         2009-12-28 03:00:05 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/asciidoc    Makefile distinfo pkg-plist 
   Removed files:
     textproc/asciidoc/files patch-a2x 
   Log:
   - Update to 8.5.2
   - Shell script was converted to python upstream -> patching of a2x no longer needed
   - Removed file files/patch-a2x
   
   PR:             ports/142081
   Submitted by:   Peter Schuller <peter.schuller@infidyne.com> (maintainer)
   
   Revision  Changes    Path
   1.19      +1 -10     ports/textproc/asciidoc/Makefile
   1.16      +3 -3      ports/textproc/asciidoc/distinfo
   1.2       +0 -61     ports/textproc/asciidoc/files/patch-a2x (dead)
   1.8       +5 -0      ports/textproc/asciidoc/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
