From nobody Tue May 02 16:32:40 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 4Q9lx60kXfz498f3; Tue, 2 May 2023 16:32:41 +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 4Q9lx52q9Fz3NmF; Tue, 2 May 2023 16:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683045161; 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=CV0pj7yKPlSdweqF85CG1GbKuc/CMWFzNCNwE2MW3KE=; b=EpR1RzLqBkgKlwfANaX9DauJZq2zX8t/ccj+UuX+lcOQcEmDIzoFoSGb9+90c856Ieo0bk WRerU0NrKt+kkLGt0iI609cHYGLxi4VLbKRTgITiU5DjPgDxQETWZZnub34VFLuT3FOKW3 y8Dl0u1nBfeTlK9vcrrMJHX96TEM+NP+6/D9MnURGL+ZFgINVil6AUG8jS62ehnh+26dIH O7uPhicHJBFLHjgTdTcsnc5ufjYmyOK8hOuUGwt8vBvI4H/zP6jP+whf27NKePOSEYfEoq JLxFJKWMNeew3dy8xFT+ixNlRwnmhEJRXvUJFKvBenhXlAWFi61gg9+9cuDVyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683045161; 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=CV0pj7yKPlSdweqF85CG1GbKuc/CMWFzNCNwE2MW3KE=; b=FyEet5DCzsOwXPiHAXtgqDHlqsb4UiTn+xQVGp1D0oFQeNRpeEguHKNEQwbDn+cEz514yI ImY90tNzxg0CDs/1B4p8gEZOZ4JWeNK0m4OtQ7keGXcYrsG4WlPnc4psaYEvqyc1ZPcVci XzPie9RBoTAQ6BNsAM87A73YgFl7arnSE1KqG7a/ULaOrnVld/Wej1s4FIHf6OGc8aClzO IW8gzsVrtnzbBJOa8AKBQGxnyKF8aecvbYOa0cO5f0HHwX83ThaSW4/+4+/BiaBmDWorpp pKAIYH6nWDSQxI0VjDbfoNhojlzEDouI8Cb4+/46MNfLniUCRpXOF9UVsFR/oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683045161; a=rsa-sha256; cv=none; b=ZSuPGZhZ2N9NNVYYppqK1HTGpiXZURMjhjpXN59sSTk+HtXud7qx2TbxVoYl/x1xPIAo1b 8tdpm28CAOxbElolqep2nlkdwtY4xyXGWDpJT/lN8Zm07HzMtYDp2sH+RzBCO5MEV8528U aZckkfygQN+v1F2804ggXIoOJNKKMtc2ZR4MiLRXGxyQLwC5eC9n5wDoVdTSQV/3KuFFQx gmN/VEi7T/9u08O7lGZU9uaALsJxaNydely0/WBedN2xpGNiRkq7BES8GjLXSBwxbMDrka W1xtU2JVDFggeKsdUVyQs4TmcXfK8kIapgXTgonfmnx0ZyeKs0LlbU+oA20tPA== 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 4Q9lx51cvVzvn2; Tue, 2 May 2023 16:32:41 +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 342GWene093351; Tue, 2 May 2023 16:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 342GWe4X093350; Tue, 2 May 2023 16:32:40 GMT (envelope-from git) Date: Tue, 2 May 2023 16:32:40 GMT Message-Id: <202305021632.342GWe4X093350@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 78710b19ed00 - main - net-p2p/shx: Unbreak on HEAD 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78710b19ed0093ba614a3a781e7ff0597677d4b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=78710b19ed0093ba614a3a781e7ff0597677d4b9 commit 78710b19ed0093ba614a3a781e7ff0597677d4b9 Author: Muhammad Moinur Rahman AuthorDate: 2023-05-02 16:29:06 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-05-02 16:32:27 +0000 net-p2p/shx: Unbreak on HEAD - Pet portclippy - Adopt port --- net-p2p/shx/Makefile | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/net-p2p/shx/Makefile b/net-p2p/shx/Makefile index 97882aa89ac8..dc96afb8a465 100644 --- a/net-p2p/shx/Makefile +++ b/net-p2p/shx/Makefile @@ -7,49 +7,57 @@ MASTER_SITES= http://synhxd.sourceforge.net/releases/ PATCH_SITES= ${MASTER_SITES} PATCHFILES= ${DISTNAME}.diff.gz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org COMMENT= Text based Hotline Communications client for Unix WWW= http://synhxd.sourceforge.net/ LICENSE= GPLv1 -OPTIONS_DEFINE= WARNINGS HTXF_PTHREAD HFS HOPE CIPHER COMPRESS HAL XMMS NOIPV4 -OPTIONS_DEFAULT=HTXF_PTHREAD HFS HOPE CIPHER COMPRESS XMMS +USES= readline ssl tar:tgz -WARNINGS_DESC= Show compiler warnings -HTXF_PTHREAD_DESC= Use pthread instead of fork or clone for htxf -HFS_DESC= Enable HFS file system emulation -HOPE_DESC= Enable HOPE (required by Cipher/Compress) -CIPHER_DESC= Enable Cipher (HOPE required) -COMPRESS_DESC= Enable Compress (HOPE required) -HAL_DESC= Compile MegaHAL (enables hal command) -XMMS_DESC= Enable trackname command -NOIPV4_DESC= IPv6 support (disables IPv4 support) +GNU_CONFIGURE= yes -USES= readline ssl tar:tgz MAKEFILE= makefile -GNU_CONFIGURE= yes + CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} CONFLICTS_INSTALL= helix # bin/hx -CIPHER_IMPLIES= HOPE -COMPRESS_IMPLIES= HOPE +PLIST_FILES= bin/hx \ + share/examples/shx/hxrc \ + share/examples/shx/hxvars +OPTIONS_DEFINE= WARNINGS HTXF_PTHREAD HFS HOPE CIPHER COMPRESS HAL XMMS NOIPV4 +OPTIONS_DEFAULT=HTXF_PTHREAD HFS HOPE CIPHER COMPRESS XMMS + +CIPHER_DESC= Enable Cipher (HOPE required) +COMPRESS_DESC= Enable Compress (HOPE required) +HAL_DESC= Compile MegaHAL (enables hal command) +HFS_DESC= Enable HFS file system emulation +HOPE_DESC= Enable HOPE (required by Cipher/Compress) +HTXF_PTHREAD_DESC= Use pthread instead of fork or clone for htxf +NOIPV4_DESC= IPv6 support (disables IPv4 support) +WARNINGS_DESC= Show compiler warnings +XMMS_DESC= Enable trackname command + +CIPHER_IMPLIES= HOPE CIPHER_CONFIGURE_ENABLE= cipher +COMPRESS_IMPLIES= HOPE COMPRESS_CONFIGURE_ENABLE= compress HAL_CONFIGURE_ENABLE= hal HFS_CONFIGURE_ENABLE= hfs HOPE_CONFIGURE_ENABLE= hope HTXF_PTHREAD_CONFIGURE_ENABLE= htxf-pthread NOIPV4_CONFIGURE_ENABLE= ipv6 -XMMS_CONFIGURE_ENABLE= xmms WARNINGS_CONFIGURE_ENABLE= warnings +XMMS_CONFIGURE_ENABLE= xmms -PLIST_FILES= bin/hx \ - share/examples/shx/hxrc \ - share/examples/shx/hxvars +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 +CFLAGS+= -Wno-error=int-conversion +.endif do-install: ${CP} -fv ${WRKSRC}/run/hx ${STAGEDIR}${PREFIX}/bin/ @@ -57,4 +65,4 @@ do-install: ${CP} -fv ${WRKSRC}/run/hxrc ${STAGEDIR}${PREFIX}/share/examples/${PORTNAME}/ ${CP} -fv ${WRKSRC}/run/hxvars ${STAGEDIR}${PREFIX}/share/examples/${PORTNAME}/ -.include +.include