svn commit: r561518 - in head/graphics/cptutils: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Jan 13 22:37:30 2021
New Revision: 561518
URL: https://svnweb.freebsd.org/changeset/ports/561518

Log:
  - Update to 1.73

Added:
  head/graphics/cptutils/files/
  head/graphics/cptutils/files/patch-configure.ac   (contents, props changed)
  head/graphics/cptutils/files/patch-src_test_equal-qgs   (contents, props changed)
  head/graphics/cptutils/files/patch-src_test_equal-svg   (contents, props changed)
Modified:
  head/graphics/cptutils/Makefile
  head/graphics/cptutils/distinfo

Modified: head/graphics/cptutils/Makefile
==============================================================================
--- head/graphics/cptutils/Makefile	Wed Jan 13 22:23:21 2021	(r561517)
+++ head/graphics/cptutils/Makefile	Wed Jan 13 22:37:30 2021	(r561518)
@@ -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}

Modified: head/graphics/cptutils/distinfo
==============================================================================
--- head/graphics/cptutils/distinfo	Wed Jan 13 22:23:21 2021	(r561517)
+++ head/graphics/cptutils/distinfo	Wed Jan 13 22:37:30 2021	(r561518)
@@ -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

Added: head/graphics/cptutils/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/cptutils/files/patch-configure.ac	Wed Jan 13 22:37:30 2021	(r561518)
@@ -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

Added: head/graphics/cptutils/files/patch-src_test_equal-qgs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/cptutils/files/patch-src_test_equal-qgs	Wed Jan 13 22:37:30 2021	(r561518)
@@ -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' | \

Added: head/graphics/cptutils/files/patch-src_test_equal-svg
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/cptutils/files/patch-src_test_equal-svg	Wed Jan 13 22:37:30 2021	(r561518)
@@ -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' | \