From nobody Mon May 22 11:25:24 2023 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 4QPw9J6m72z4TPW1; Mon, 22 May 2023 11:25:24 +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 4QPw9J6Ckbz4RYX; Mon, 22 May 2023 11:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684754724; 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=VFAZOUfKZkq6yn37VPPH2KvTm9UqT7a1HX1eGb9yW6o=; b=TcDQLy4V/MSzFthbECt/hK2GzeDhkPb2WBnbggQj5gm7hQ4vdwCo3o1Wr1hqu7NmvSuPQh T33p40qsaRLCc2nl1RF1Imay+mEYP3Z1eWHWai/SBySuPhnrQupIHEy8euGO4Lfhr5yZH1 kfL7nkHJGPTMegqb1d1Cq3qEzuRfwthxPPoevemFujiRogfODjajH0nVvzwqmapBU/SLyh jxC65/tXTcgUPMQ6vBZPOOTgpDkLjl9BPIG/CjZYSLDGVSGE6Sxz5mfDUfXTJzcgGIcT4d g9/WNzKxwpSz9ijv/jWdLbbLVSt4CrlQO+Vzd07UHMPeCdfd8MSTksTEl4APYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684754724; 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=VFAZOUfKZkq6yn37VPPH2KvTm9UqT7a1HX1eGb9yW6o=; b=Irnzz1lvTouOHMOSF4iEAhSoufkWl84mQdrVshs9fev/zJHQ48vq8CtLwKGaZbBe+kwscF Kn5M2jgpXg8neVLMNBvbrtRjDYMj8NRR0snOmdO3lrbC5tLKx4AcjY2y+7JiEzVkkdgL3h l6QU+KeYvugtveaN0QbngYxQz3/X/Lx9BLiPpjk8ANQh3YwDojO5KoOYnuGAShVjc0P+yL UQ9jwBTkOItP1gXQM+gQstFzW67oCz0wMbjwG/uDsdF8z0DqY3Jqv44WftuGRj7MNynsu9 YPKQamnDsl7iqjLofBAJ19PFzhZtL8C/82UQrQ0Yyn6zSwvMJojCJFUfRcPAMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684754724; a=rsa-sha256; cv=none; b=Zv1DGTbheLg5i2DQDaGLKuVOcBkeyehjWVGdCkSCnkUh4A17fre8+o4HUzYB6Y3F2jsMfu DTx1M4ji2NNR4987nFB4IOjfaOuIWenMl56+BR4RbG2Uj8lNPHsytn7jZca5bD5LPok+e2 V+JFsHf8S1qgUYLaLmVeJTXZyV54YHsrssc4BExwum96GVgspSvH9RUMFOVkLy7zDxb+IT Pi5gVLzvm6X6GYoYgsFgPMKsu84WGTou/Lpn3NYZ3xztRVEie8lnNVbvAJd7rhrICKB9g0 WNmfk39MZmsMctTmfuoNQ/yoyd9Ar9AY02ShGmCWcbU3nqUSWsaqnOzsmV/aBw== 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 4QPw9J5FhPzGK6; Mon, 22 May 2023 11:25:24 +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 34MBPO3C046487; Mon, 22 May 2023 11:25:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34MBPOGv046486; Mon, 22 May 2023 11:25:24 GMT (envelope-from git) Date: Mon, 22 May 2023 11:25:24 GMT Message-Id: <202305221125.34MBPOGv046486@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: 1c8c089423ad - main - net-p2p/edonkey-tool-hash: the port had been improved (+) 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: 1c8c089423ada05db87b2c242eeaacd9c7b63c21 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c8c089423ada05db87b2c242eeaacd9c7b63c21 commit 1c8c089423ada05db87b2c242eeaacd9c7b63c21 Author: Alexey Dokuchaev AuthorDate: 2023-05-22 11:24:44 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-22 11:24:44 +0000 net-p2p/edonkey-tool-hash: the port had been improved (+) - Do not invent our own PORTNAME and just use the upstream one - Rephrase and shorten COMMENT, fix LICENSE, take maintainership - Specify C++03 to unbreak configuring with FLTK support, but better build the port against one particular C++ standard regardless of the selected options - Use existing installation routine (it also installs documentation) - Fix wrong types usage and thus hash production on 64-bit systems Obtained from: Debian (typedef fix) --- net-p2p/edonkey-tool-hash/Makefile | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/net-p2p/edonkey-tool-hash/Makefile b/net-p2p/edonkey-tool-hash/Makefile index 4ab1d7f4cd1f..0947244a8423 100644 --- a/net-p2p/edonkey-tool-hash/Makefile +++ b/net-p2p/edonkey-tool-hash/Makefile @@ -1,31 +1,33 @@ -PORTNAME= edonkey +PORTNAME= ed2k-hash PORTVERSION= 0.4.0 CATEGORIES= net-p2p MASTER_SITES= SF/ed2k-tools/ed2k_hash/${PORTVERSION} -PKGNAMESUFFIX= -tool-hash DISTNAME= ed2k_hash-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT= Both calculates 'eDonkey/Overnet hashes' producing ed2k:// file links -WWW= http://ed2k-tools.sourceforge.net/ +MAINTAINER= danfe@FreeBSD.org +COMMENT= Calculate eD2K hashes and create ed2k:// file links +WWW= https://ed2k-tools.sourceforge.net/ed2k_hash.shtml -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv2+ -PLIST_FILES= bin/edonkey-tool-hash +USE_CXXSTD= c++03 # required for FLTK ./configure detection GNU_CONFIGURE= yes +MAKE_ARGS= mydocdir=${DOCSDIR} -WRKSRC= ${WRKDIR}/ed2k_hash-${PORTVERSION} +PLIST_FILES= bin/ed2k_hash +PORTDOCS= index*.html + +OPTIONS_DEFINE= DOCS X11 + +X11_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk +X11_USES= localbase +X11_LIBS= -lpthread +X11_PLIST_FILES= bin/ed2k_hash_gui post-patch: -# respect CFLAGS - @${REINPLACE_CMD} -E -e \ - 's|-O2||' \ + @${REINPLACE_CMD} -E 's, ?-O2,,' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - -do-install: -# uphold POLA, do not change binary name - @${INSTALL_PROGRAM} ${WRKSRC}/ed2k_hash/ed2k_hash \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} + @${REINPLACE_CMD} -e 's,long int UINT4,int UINT4,' \ + ${WRKSRC}/ed2k_hash/md4.h .include