diff --git a/app-text/xmlto/patches/xmlto-0.0.28.patch b/app-text/xmlto/patches/xmlto-0.0.29.patchset similarity index 74% rename from app-text/xmlto/patches/xmlto-0.0.28.patch rename to app-text/xmlto/patches/xmlto-0.0.29.patchset index 6747e0d1f..24510f7f6 100644 --- a/app-text/xmlto/patches/xmlto-0.0.28.patch +++ b/app-text/xmlto/patches/xmlto-0.0.29.patchset @@ -1,18 +1,15 @@ -From c1c5b8d4e142a48abb28f2c9bb81f2e170e3f564 Mon Sep 17 00:00:00 2001 +From 5b12e648b8290c47a68d92e91a48647e7b6160b1 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 17:49:37 -0500 -Subject: [PATCH] Make xmlif compatible with POSIX. +Subject: Make xmlif compatible with POSIX. ---- - xmlif/xmlif.l | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xmlif/xmlif.l b/xmlif/xmlif.l -index 0a11cdf..a6efe97 100644 +index 560508e..3879753 100644 --- a/xmlif/xmlif.l +++ b/xmlif/xmlif.l -@@ -46,22 +46,22 @@ static int nselections; /* number of selections */ - static ifsense; /* sense of last `if' or unless seen */ +@@ -47,22 +47,22 @@ static int nselections; /* number of selections */ + static int ifsense; /* sense of last `if' or unless seen */ static char *attribute; /* last attribute scanned */ -struct stack_t { @@ -39,7 +36,7 @@ index 0a11cdf..a6efe97 100644 newelt->up = end; end = newelt; -@@ -72,7 +72,7 @@ static void push_level(void) +@@ -73,7 +73,7 @@ static void push_level(void) static void pop_level(void) /* delete activation record for the current level */ { @@ -48,7 +45,7 @@ index 0a11cdf..a6efe97 100644 #ifdef DEBUG fprintf(stderr, "{pop_level()}"); -@@ -96,7 +96,7 @@ static void stash_attribute(char *attr) +@@ -97,7 +97,7 @@ static void stash_attribute(char *attr) static void end_attribute(void) /* we've seen all the attributes of a conditional, process them now */ { @@ -58,5 +55,5 @@ index 0a11cdf..a6efe97 100644 if (attribute) free(attribute); -- -1.8.3.4 +2.48.1 diff --git a/app-text/xmlto/xmlto-0.0.28.recipe b/app-text/xmlto/xmlto-0.0.29.recipe similarity index 75% rename from app-text/xmlto/xmlto-0.0.28.recipe rename to app-text/xmlto/xmlto-0.0.29.recipe index 5d1db22c6..7131e8100 100644 --- a/app-text/xmlto/xmlto-0.0.28.recipe +++ b/app-text/xmlto/xmlto-0.0.29.recipe @@ -10,10 +10,10 @@ HOMEPAGE="https://pagure.io/xmlto/" COPYRIGHT="2009 Tim Waugh 2013 Ondrej Vasik" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://releases.pagure.org/xmlto/xmlto-$portVersion.tar.gz" -CHECKSUM_SHA256="2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" -PATCHES="xmlto-$portVersion.patch" +CHECKSUM_SHA256="40504db68718385a4eaa9154a28f59e51e59d006d1aa14f5bc9d6fded1d6017a" +PATCHES="xmlto-$portVersion.patchset" ARCHITECTURES="all" @@ -24,27 +24,37 @@ PROVIDES=" " REQUIRES=" haiku + docbook_xsl_stylesheets cmd:getopt cmd:xmllint cmd:xsltproc - docbook_xsl_stylesheets " BUILD_REQUIRES=" haiku_devel + docbook_xsl_stylesheets + cmd:getopt + cmd:xmllint + cmd:xsltproc + app:WebPositive " BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoreconf cmd:awk cmd:cmp cmd:flex cmd:gcc cmd:getopt + cmd:libtoolize cmd:make " BUILD() { - runConfigure --omit-dirs binDir ./configure --bindir=$prefix/bin + autoreconf -fi + runConfigure --omit-dirs binDir ./configure \ + --bindir=$prefix/bin make $jobArgs }