git: f99d2974a5a3 - main - misc/jojodiff: belatedly update the port to version 0.8.5

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f99d2974a5a3f121b240ecde66d5e6cb3b6c75ff

commit f99d2974a5a3f121b240ecde66d5e6cb3b6c75ff
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-06-11 18:00:00 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-06-11 18:00:00 +0000

    misc/jojodiff: belatedly update the port to version 0.8.5
    
    - Drop no longer needed `post-patch' target, the source
      code had been fixed upstream
    - All functionality had been merged into one executable
      which now deduces its operation mode via argv[0] or
      the program arguments; install corresponding symlinks
---
 misc/jojodiff/Makefile | 27 +++++++++++----------------
 misc/jojodiff/distinfo |  6 +++---
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/misc/jojodiff/Makefile b/misc/jojodiff/Makefile
index c1ce17e40509..abba9b169de1 100644
--- a/misc/jojodiff/Makefile
+++ b/misc/jojodiff/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	jojodiff
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.5
 CATEGORIES=	misc devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}08
 DISTNAME=	jdiff${PORTVERSION:S/.//g}
@@ -13,32 +13,27 @@ LICENSE=	GPLv3+
 
 USES=		gmake tar:tgz
 MAKE_ARGS=	CC="${CC}" CPP="${CXX}" CFLAGS="${CFLAGS}"
+ALL_TARGET=	jdiff
 WRKSRC_SUBDIR=	src
 
 CONFLICTS_INSTALL=	py*-jsondiff # bin/jdiff
 
-PLIST_FILES=	bin/jdiff bin/jptch
+PLIST_FILES=	bin/jdedup bin/jdiff bin/jpatch bin/jtst
 PORTDOCS=	readme.txt readme.htm
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -E 's,P(RI|8)(zd|hkey), & ,g' \
-		${WRKSRC}/JFileAhead.cpp ${WRKSRC}/JFileIStreamAhead.cpp \
-		${WRKSRC}/JHashPos.cpp ${WRKSRC}/JOutAsc.cpp \
-		${WRKSRC}/JOutRgn.cpp ${WRKSRC}/jpatch.cpp \
-		${WRKSRC}/main.cpp
-	@${REINPLACE_CMD} -e 's,is %d bit,is %zu bit,' \
-		${WRKSRC}/jpatch.cpp ${WRKSRC}/main.cpp
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/j???? ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/jdiff ${STAGEDIR}${PREFIX}/bin
+.for l in jdedup jpatch jtst
+	${LN} -sf jdiff ${STAGEDIR}${PREFIX}/bin/${l}
+.endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${TR} -d \\r < ${WRKSRC}/../${f} | iconv -f latin1 -t utf8 \
-		> ${STAGEDIR}${DOCSDIR}/${f}
-.endfor
+	${TR} -d \\r < ${WRKSRC}/../readme.htm | ${SED} 's,iso-8859-1,utf-8,' \
+		| iconv -f latin1 -t utf8 > ${STAGEDIR}${DOCSDIR}/readme.htm
+	${TR} -d \\r < ${WRKSRC}/../readme.txt \
+		> ${STAGEDIR}${DOCSDIR}/readme.txt
 
 .include <bsd.port.mk>
diff --git a/misc/jojodiff/distinfo b/misc/jojodiff/distinfo
index dd2f4a35df39..1d2116370d8b 100644
--- a/misc/jojodiff/distinfo
+++ b/misc/jojodiff/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1322937085
-SHA256 (jdiff081.tgz) = 8681e503c1d9658a89788d7e4c34c08adce5a0114610cfaaefa32f2bbe613058
-SIZE (jdiff081.tgz) = 427616
+TIMESTAMP = 1603997273
+SHA256 (jdiff085.tgz) = fd10ef977e94b8a4321fb70e2717e448bfa9859a5258a8d0e2bab4430b8aabe8
+SIZE (jdiff085.tgz) = 427599