Date: Mon, 22 May 2023 11:25:24 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1c8c089423ad - main - net-p2p/edonkey-tool-hash: the port had been improved (+) Message-ID: <202305221125.34MBPOGv046486@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c8c089423ada05db87b2c242eeaacd9c7b63c21 commit 1c8c089423ada05db87b2c242eeaacd9c7b63c21 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-05-22 11:24:44 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> 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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305221125.34MBPOGv046486>