From nobody Fri Mar 31 15:07:56 2023 X-Original-To: dev-commits-ports-all@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 4Pp3Z64GTjz42rw9; Fri, 31 Mar 2023 15:07:58 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pp3Z63p3Dz4CMw; Fri, 31 Mar 2023 15:07:58 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680275278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K9eci5ouVxzPl/HYfhvy7BlMnCDVkM9plxgukUT/JFg=; b=q78766yD5P67yQmXw7hBqsbRhB3pqpTT1LHoPdrH8BXALRQYZWurmphbdCRsDN/e08J+Xa 0wR1pPp1wDeWXmE6aFRzKtlp4Ztv4Jcn7fQLs6mdMPp8dB6NUV/fslwdEjjfhQevo2YZcp /ELMzuYgrtuWqyIbrVy5mDTt4IeDlCwrQSJhran3GrmmvsyvFrsOhY0nHWOyr9wrm5IgQn x765PHnWd+KSQrJWkz0qHnnrEfZED1QUzyIrxufWGlU/ZnYik87LR5MSufSiqGwK7eL0aN KVV4Cmu0mzw9kRRRmxaVyum4VwaffuVjOjzS18L12mLTGXWJ01g2RfGyDZdiTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680275278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K9eci5ouVxzPl/HYfhvy7BlMnCDVkM9plxgukUT/JFg=; b=FoOkKr2Nmocbd2aEukp7p2DwDyWaLXuKjLI4qB9oUvN+GPaPAsJEOWSPtV3r2tlb3ye9AV GsS5E91DyPN9bryFe/XLlD4f/7aHZLi0s4MAFWLhXbx+BnTkELKYPFjP5QtYO83MCP2hiv 87xzKu5WN0Kh8ShqvaxnO3DQxKgnmMCOIQKXGREJr26DEqu+8E9TDo/HfSCqDlW9dE+AGi lzmOWZ1YHmv7qUz4GIqD07ed9gYq3xfpPdY/F8N9BXuXokF8bVlRzkP9EtvE1MANmCtch5 Xd3xQxmkC6gzfwsAZmpXBQ5fuy9MdVB8aDrZ0NNHNnZBkA9YtLzowNM0k8cQuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680275278; a=rsa-sha256; cv=none; b=mgyEq5GfGskLvCD2RNXo2vIOZs9QiOBaiitYofhpkWJImTtpkJx17pJtHMOxci7feLWzog sG6Le3elwCww0ewQenq4sayuevDmGTbdek8miVxWIfX0J/iOlAYzXadhC94w/yJ+d7QPoA gZv2X5cu+VtgBqb4WaKLvcsqc8FnbcLyry+dnrae1OuPi0Ai17bhNfc1WrnAxFZobXC0fF XwQYtRfh10EV3gGruMPJe2g7cC0UkA+1QpTgJNYLbjQUnURKrvbc9kfPuJ2V8/xxDeiS9P 2xN1S4MvcJwkfYkriZZMLIAqPWHgrbB2Jc8UdPDA9LVnIsQEEX9rCW+PSdflVA== Received: from [172.24.42.13] (host-79-32-120-162.retail.telecomitalia.it [79.32.120.162]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pp3Z54nPVz16Jg; Fri, 31 Mar 2023 15:07:57 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Message-ID: Date: Fri, 31 Mar 2023 17:07:56 +0200 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Content-Language: en-US From: Guido Falsi To: Adam Weinberger Cc: gmarco@giovannelli.it, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org References: <03eb85e1-14fa-24f4-dcb3-84caeef82a24@FreeBSD.org> <440103A8-A773-4B4E-BEB1-28C49D1B9CB5@adamw.org> <55712a33-dd09-719f-c294-417facb103a0@FreeBSD.org> Subject: Re: git: de841b40d24d - main - sysutils/xxd: New port In-Reply-To: <55712a33-dd09-719f-c294-417facb103a0@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 31/03/23 16:32, Guido Falsi wrote: > On 31/03/23 16:30, Adam Weinberger wrote: >> >> >>> On Mar 31, 2023, at 10:28, Guido Falsi wrote: >>> >>> On 31/03/23 15:49, Adam Weinberger wrote: >>>> On Thu, Mar 30, 2023 at 4:45 PM Guido Falsi >>> > wrote: >>>>     The branch main has been updated by madpilot: >>>>     URL: >>>> >>>> https://cgit.FreeBSD.org/ports/commit/?id=de841b40d24d22ab51ad05ed632e025903fbb41f >>>>     commit de841b40d24d22ab51ad05ed632e025903fbb41f >>>>     Author:     Guido Falsi >>>>     AuthorDate: 2023-03-30 20:42:54 +0000 >>>>     Commit:     Guido Falsi >>>>     CommitDate: 2023-03-30 20:42:54 +0000 >>>>          sysutils/xxd: New port >>>>          This is the standalone version of the xxd tool provided by >>>> vim. >>>>          Submitted by:   Gianmarco Giovannelli >>>     > >>>>     diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile >>>>     new file mode 100644 >>>>     index 000000000000..378f364cf4bf >>>>     --- /dev/null >>>>     +++ b/sysutils/xxd/Makefile >>>>     @@ -0,0 +1,26 @@ >>>>     +PORTNAME=      xxd >>>>     +DISTVERSIONPREFIX=     v >>>>     +DISTVERSION=   9.0.1366 >>>>     +CATEGORIES=    sysutils >>>>     + >>>>     +MAINTAINER= gmarco@giovannelli.it >>>>     +COMMENT=       Hexdump and reverse hexdump utility >>>>     +WWW= https://github.com/mew-cx/xxd >>>>     + >>>>     +CONFLICTS_INSTALL=     vim-[0-9]* vim-gtk2 vim-gtk3 vim-motif >>>> vim-x11 >>>>     + >>>>     +ALL_TARGET=    ${PORTNAME} >>>>     +PORTSCOUT=     ignore:1 >>>>     +EXTRACT_AFTER_ARGS=    --include='*/src/xxd*' >>>>     +WRKSRC_SUBDIR= src/xxd >>>>     + >>>>     +PLIST_FILES=   bin/xxd >>>>     + >>>>     +USE_GITHUB=    yes >>>>     +GH_ACCOUNT=    vim >>>>     +GH_PROJECT=    vim >>>>     + >>>>     +do-install: >>>>     +       ${INSTALL_PROGRAM} ${WRKSRC}/xxd ${STAGEDIR}${PREFIX}/bin >>>>     + >>>>     +.include > >>>> The WWW is odd here. The source files are coming from >>>> github.com/vim/vim , but the WWW is for a >>>> related but unused project. >>> >>> Oops, you're right. Submitter proposed to use a fork, but later I >>> decided grabbing the original vim distribution was better, I must >>> have forgotten updating the WWW line. >>> >>> Will fix it! >>> >>>> I update vim at the beginning of every month plus whenever new >>>> minors are released, and whenever there are patches that it's >>>> important for us to downstream. Rather than pinning xxd to a version >>>> that will be old literally tomorrow, why not pull the DISTVERSION >>>> and distinfo from editors/vim/Makefile? >>> >>> That would be a good idea, but while using vim distinfo is trivial, >>> I'm not sure how to import DISTVERSION from another port. Including >>> the Makefile would override a bunch of other variables. >> >> ${MAKE_CMD} -V DISTVERSION >> >> :-) > > Uhm I guess I need to pass it the vim makefile too so it would be: > > ${MAKE_CMD} -f ../editors/vim/Makefile -V DISTVERSION > > I guess. Does not look pretty, but could work. > Writing this here, for the record: This required some more work. I found inspiration in the devel/git-merge-changelog port. The BSDMAKE variable is defined only after bsd.port.pre.mk, so one needs to split the include of bsd.port.mk and extract values after the first one, into temporary variables that are referenced at the start of the Makefile. Committing fixes shortly. Thanks for the suggestions! -- Guido Falsi