From nobody Sat Jun 11 18:01:02 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4FA238446CC; Sat, 11 Jun 2022 18:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LL5H21prhz4STx; Sat, 11 Jun 2022 18:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654970462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xjv+LNl7j4ZocpJVsInDbdv932n0U+jUUk1xg7Kj9Ro=; b=sH3AlLJU0aUBBpPKUbelUEFGrI9PrLO6aXFFbPly0VlzkaczoB/jkFjctAO6UONjGOyJpG o8IOuVo5v2IH0khHRUhDJbJHz9Pw0GMNX3mKpB3JwZr5HqK4xGnJbNLQZ++EYu/aBZmhUF NzgObct8ImchxlNayl7n6uh91wY/36kEYOIMAMd4veEKObD3iJwSwS14+6IvgGRR8N9wEi T2n7lcUBrZdURrYkm5/yD7J5JF2IZIU4P05mTnVyXf0V5GQIIlXjp2Wkg6lsX/oGhqdrMC 2y1EyxnHQxy2BBfWY4a107hvZMNUNzIqDzRviw5hll+STglalkQXAqMM2ZwmQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 143E611CEE; Sat, 11 Jun 2022 18:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25BI1247016258; Sat, 11 Jun 2022 18:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25BI12Nv016257; Sat, 11 Jun 2022 18:01:02 GMT (envelope-from git) Date: Sat, 11 Jun 2022 18:01:02 GMT Message-Id: <202206111801.25BI12Nv016257@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: f99d2974a5a3 - main - misc/jojodiff: belatedly update the port to version 0.8.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f99d2974a5a3f121b240ecde66d5e6cb3b6c75ff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654970462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xjv+LNl7j4ZocpJVsInDbdv932n0U+jUUk1xg7Kj9Ro=; b=PinZpk7pwRHu6Xa+oLNTdl0SXK3YjlEBn0VgVHydDMT5gDnuMmwDohQctENjdGBIFwBS31 pu/ah69PBmEdPsuSK8wwELfO31xdMlnYE+V4KuA/YfgiOQN/FN2iEoo0REpvnRY4K642j9 Z7WgJvSL/aqY3X0h8bv15w/vXhgLAeo/9ugv4gH6R4JcBlhmia1WbIcwZdnJGnUtcz7wgi QOKSDk2XBffW0nTc0WWzg3daDkYLP69Lph5gsjNpwp76pjZn7ImM2UgROIHYyS9HozX2IA 5y78JHggQ/0HpUDiPRcjZ4IuTkQ9eX928yGtq5iBEE42F09gSjIE8msV1HHODQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654970462; a=rsa-sha256; cv=none; b=wy+FYtvJq6MfBq39+MxWB/nq+x+4oA6RUWEqwGzuwM4ayfqb3gSCzB2tStLPhOwo4+uM4C 2HTZdnLX7jakn3HCoLRp7vIl+79LU8fdTlXTda+m5djhRHP+LpzIkhpkKZPhcAZhVR+Nys BGdzRvaUHAYcowrYHn77SCOXSPkXLOIVypI8Ey5bAazP0HwpQsDgfR+2zcNRJ4OHx3XRxR keoHMWE1o/90aX1L7IHZme5EI/RSKun3uVwG2dXhNlZpWbM122DxjVctZzJ5vOIqBhZcwH iwRskDyS87wqI4QxiF8pSu79Wy6Q+NOPk9rUzvrY/TXHTswTkOob6QVBir8wCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f99d2974a5a3f121b240ecde66d5e6cb3b6c75ff commit f99d2974a5a3f121b240ecde66d5e6cb3b6c75ff Author: Alexey Dokuchaev AuthorDate: 2022-06-11 18:00:00 +0000 Commit: Alexey Dokuchaev 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 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 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