From 17eaaa6538e2f65d96e0cbcd457d3b4e22ee5948 Mon Sep 17 00:00:00 2001
From: mandree <mandree@FreeBSD.org>
Date: Mon, 7 Apr 2014 20:38:12 +0000
Subject: [PATCH] Upgrade to new upstream release 0.0.26. Upstream changes:

- fix build with automake 1.13+
- handle used css lists in epub format
- fix broken noextensions option recognition (dropped from our patch)
- searchpath option no longer produces a warning about bad shell syntax
---
 textproc/xmlto/Makefile             |  5 ++---
 textproc/xmlto/distinfo             |  4 ++--
 textproc/xmlto/files/patch-xmlto.in | 14 +-------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index e0062ddc13d8..b557fa9036d4 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmlto
-PORTVERSION=	0.0.25
-PORTREVISION=	2
+PORTVERSION=	0.0.26
 CATEGORIES=	textproc
 MASTER_SITES=	https://fedorahosted.org/releases/x/m/xmlto/:xmlto \
 		LOCAL/mandree/:xmlto \
@@ -38,7 +37,7 @@ DBLATEX_DESC=		Add dependency on DBlatex (DB for DocBook)
 FOP_DESC=		Add dependency on FOP (requires Java)
 PASSIVETEX_DESC=	Add dependency on XMLTeX/PassiveTeX
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	BASH=${BASH_CMD} GETOPT=${GETOPT_CMD} PDFXMLTEX=${PDFXMLTEX_CMD}
 MAKE_ENV+=	HOME=/dev/null
diff --git a/textproc/xmlto/distinfo b/textproc/xmlto/distinfo
index 8aa85f0a04f8..c73037019d71 100644
--- a/textproc/xmlto/distinfo
+++ b/textproc/xmlto/distinfo
@@ -1,4 +1,4 @@
-SHA256 (xmlto/xmlto-0.0.25.tar.bz2) = 361cb70d5d0b4b753db00b67ed8bc1d53d0bc96c407d0310aefe854470b7e536
-SIZE (xmlto/xmlto-0.0.25.tar.bz2) = 116496
+SHA256 (xmlto/xmlto-0.0.26.tar.bz2) = efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec
+SIZE (xmlto/xmlto-0.0.26.tar.bz2) = 119819
 SHA256 (xmlto/xhtml2fo.xsl) = 51984c86eda98fc70c2c0fa887626f44311634c5e3d1053cd2ada8cd2543ebd6
 SIZE (xmlto/xhtml2fo.xsl) = 63786
diff --git a/textproc/xmlto/files/patch-xmlto.in b/textproc/xmlto/files/patch-xmlto.in
index 483380beaa01..b4e24f1233c8 100644
--- a/textproc/xmlto/files/patch-xmlto.in
+++ b/textproc/xmlto/files/patch-xmlto.in
@@ -1,19 +1,7 @@
-This patch serves two purposes:
-
-#1 fix "noextensions" long option (accepted by upstream)
-#2 avoid that w3m or others pollute $HOME/
+This patch makes sure that w3m or others will not pollute $HOME/
 
 --- ./xmlto.in.orig	2011-11-29 12:49:57.000000000 +0100
 +++ ./xmlto.in	2013-10-07 23:52:57.000000000 +0200
-@@ -262,7 +262,7 @@
- 
- # Process any options
- ARGS=$(${GETOPT} \
--	--longoptions=help,version,extensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex \
-+	--longoptions=help,version,extensions,noextensions,searchpath:,skip-validation,stringparam:,noclean,noautosize,with-fop,with-dblatex \
- 	-n xmlto -- x:m:o:p:v "$@")
- [ $? != 0 ] && { usage; exit 1; }
- eval set -- "$ARGS"
 @@ -611,4 +611,6 @@
    # Extremely verbose
    BASH="${BASH} -x"