aboutsummaryrefslogtreecommitdiff
path: root/graphics/cptutils
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2021-01-13 22:37:30 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2021-01-13 22:37:30 +0000
commitbf85ccd50d6fae4568fb9b7b24ef56db81595e0a (patch)
treec8d916f5cad8fb458a55e6c138645046e09b159e /graphics/cptutils
parent9c8cdeacdce1c42efcbb28a840fea79f96d0520d (diff)
downloadports-bf85ccd50d6fae4568fb9b7b24ef56db81595e0a.tar.gz
ports-bf85ccd50d6fae4568fb9b7b24ef56db81595e0a.zip
- Update to 1.73
Notes
Notes: svn path=/head/; revision=561518
Diffstat (limited to 'graphics/cptutils')
-rw-r--r--graphics/cptutils/Makefile5
-rw-r--r--graphics/cptutils/distinfo6
-rw-r--r--graphics/cptutils/files/patch-configure.ac14
-rw-r--r--graphics/cptutils/files/patch-src_test_equal-qgs11
-rw-r--r--graphics/cptutils/files/patch-src_test_equal-svg11
5 files changed, 41 insertions, 6 deletions
diff --git a/graphics/cptutils/Makefile b/graphics/cptutils/Makefile
index 5604e35c1eff..266f53bccf1a 100644
--- a/graphics/cptutils/Makefile
+++ b/graphics/cptutils/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cptutils
-PORTVERSION= 1.72
+PORTVERSION= 1.73
CATEGORIES= graphics
MASTER_SITES= http://soliton.vm.bytemark.co.uk/pub/jjg/src/
@@ -18,7 +18,7 @@ BUILD_DEPENDS= gengetopt:devel/gengetopt \
LIB_DEPENDS= libjansson.so:devel/jansson \
libpng.so:graphics/png
-USES= autoreconf bison gmake gnome iconv localbase python shebangfix
+USES= autoreconf bison gmake gnome iconv localbase python:3.7+ shebangfix
SHEBANG_FILES= src/gradient-convert/gradient-convert.py
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG}
@@ -33,7 +33,6 @@ TEST_BUILD_DEPENDS= bash:shells/bash \
xml:textproc/xmlstarlet
TEST_LIB_DEPENDS= libcunit.so:devel/cunit
TEST_TEST_TARGET= test unit
-TEST_BROKEN= depends on expired xml2
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/cptutils/distinfo b/graphics/cptutils/distinfo
index 2b8c56b99dba..dc0ec6612361 100644
--- a/graphics/cptutils/distinfo
+++ b/graphics/cptutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566241485
-SHA256 (cptutils-1.72.tar.gz) = 6fdacf344dafc3999ab183f369e91e62ae2d7cfc2dff8e20db258d6ba1a593ad
-SIZE (cptutils-1.72.tar.gz) = 629672
+TIMESTAMP = 1594664109
+SHA256 (cptutils-1.73.tar.gz) = 8a6463971c40a18967defb62852177ed9c72ad2d8aabd7653e89aa1e40fca4e6
+SIZE (cptutils-1.73.tar.gz) = 628207
diff --git a/graphics/cptutils/files/patch-configure.ac b/graphics/cptutils/files/patch-configure.ac
new file mode 100644
index 000000000000..0c54d10a315b
--- /dev/null
+++ b/graphics/cptutils/files/patch-configure.ac
@@ -0,0 +1,14 @@
+--- configure.ac.orig 2020-07-08 21:29:57 UTC
++++ configure.ac
+@@ -117,11 +117,6 @@ if test $opt_enable_tests = yes; then
+ AC_SUBST(WITH_ACCEPT, 1)
+ fi
+
+- AC_PATH_PROG(XML2, xml2, no)
+- if test "$XML2" = no ; then
+- AC_MSG_ERROR(need xml2 program)
+- fi
+-
+ dnl The name "xmlstarlet" is used by Debian and derivatives since
+ dnl presumably, the upstream name of "xml" is already taken or is
+ dnl too generic -- we check for the formar first
diff --git a/graphics/cptutils/files/patch-src_test_equal-qgs b/graphics/cptutils/files/patch-src_test_equal-qgs
new file mode 100644
index 000000000000..36e07c368809
--- /dev/null
+++ b/graphics/cptutils/files/patch-src_test_equal-qgs
@@ -0,0 +1,11 @@
+--- src/test/equal-qgs.orig 2017-03-03 19:51:28 UTC
++++ src/test/equal-qgs
+@@ -16,7 +16,7 @@ CSV2='/tmp/equal-svg-2.csv'
+
+ create_filtered_csv()
+ {
+- $XML2 < $1 | \
++ cat < $1 | \
+ grep -v created | \
+ grep -v creator | \
+ grep -v '\@id' | \
diff --git a/graphics/cptutils/files/patch-src_test_equal-svg b/graphics/cptutils/files/patch-src_test_equal-svg
new file mode 100644
index 000000000000..f2b423b02364
--- /dev/null
+++ b/graphics/cptutils/files/patch-src_test_equal-svg
@@ -0,0 +1,11 @@
+--- src/test/equal-svg.orig 2017-03-03 19:51:28 UTC
++++ src/test/equal-svg
+@@ -14,7 +14,7 @@ CSV2='/tmp/equal-svg-2.csv'
+
+ create_filtered_csv()
+ {
+- $XML2 < $1 | \
++ cat < $1 | \
+ grep -v created | \
+ grep -v creator | \
+ grep -v '\@id' | \