From 2d7d175ebdfe6a23e48a1baa73ab97348fd164e1 Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 6 Jul 2020 14:35:34 +0000
Subject: [PATCH] - Update to version 0.7 (fixes issue with Python 3.x) -
 Simplify installation of the documentation files

PR:		239106
Submitted by:	Gerasimos Melissaratos
---
 textproc/unoconv/Makefile | 22 +++++++---------------
 textproc/unoconv/distinfo |  5 +++--
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/textproc/unoconv/Makefile b/textproc/unoconv/Makefile
index 90da93df24b5..6eb8fcef0d6f 100644
--- a/textproc/unoconv/Makefile
+++ b/textproc/unoconv/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	unoconv
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.7
 CATEGORIES=	textproc python
 MASTER_SITES=	http://dag.wieers.com/home-made/${PORTNAME}/ \
 		SF/nemysisfreebsdp/textproc/:icons
@@ -24,13 +23,9 @@ NO_BUILD=	yes
 
 PORTDOCS=	*
 
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	AUTHORS ChangeLog README.asciidoc WISHLIST
-
-DOCSRCDIR2=	${WRKSRC}/doc
-DOCSDIR2=	${DOCSDIR}/doc
-DOC_FILES2=	errcode.txt filters.txt formats.txt office-installations.txt \
-		selinux.txt unoconv.1.txt
+DOC_FILES=	AUTHORS ChangeLog README.adoc
+DOC_FILES2=	errcode.adoc filters.adoc formats.adoc \
+		office-installations.adoc selinux.adoc unoconv.1.adoc
 
 OPTIONS_DEFINE=	DOCS
 
@@ -42,22 +37,19 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tests/
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
-
 .for f in *.odt *.csv
 	@(cd ${WRKSRC}/tests && ${INSTALL_DATA} ${f} ${STAGEDIR}${DATADIR}/tests)
 .endfor
-
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/unoconv/distinfo b/textproc/unoconv/distinfo
index 8b98fbf4e393..1876a12a5362 100644
--- a/textproc/unoconv/distinfo
+++ b/textproc/unoconv/distinfo
@@ -1,4 +1,5 @@
-SHA256 (python/unoconv-0.6.tar.gz) = 790e614b8615217ef4588b187f0018b526ec2bb480c6b9b2ffb9b82f48da73d4
-SIZE (python/unoconv-0.6.tar.gz) = 91578
+TIMESTAMP = 1436398005
+SHA256 (python/unoconv-0.7.tar.gz) = 56abbec55632b19dcaff7d506ad6e2fd86f53afff412e622cc1e162afb1263fa
+SIZE (python/unoconv-0.7.tar.gz) = 95732
 SHA256 (python/unoconv.png) = 459f7dbc60e34ccce5c9d46a7317be02dd3c8275e7f7588b7b3885c67b6738eb
 SIZE (python/unoconv.png) = 744