From nobody Fri Mar 31 15:14:31 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 4Pp3k12rxSz42s2n for ; Fri, 31 Mar 2023 15:14:49 +0000 (UTC) (envelope-from adamw@adamw.org) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pp3k11qVWz4CrT for ; Fri, 31 Mar 2023 15:14:49 +0000 (UTC) (envelope-from adamw@adamw.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52a.google.com with SMTP id er13so49955419edb.9 for ; Fri, 31 Mar 2023 08:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adamw-org.20210112.gappssmtp.com; s=20210112; t=1680275687; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=l5kncIVPY+REFZSmn6Z/EoIcGo8jQ1hIKMNdqcBE+IA=; b=GPWMYWORB42vmjT5HAcPwcUH8eV3EhB5vB5Awwbrv3E2WQ3XxDi+OzvzBRKkaLk413 kqSelDH67una5c8ZeNf8Q2YTHCV6dtS68RPBbqjIsVUqFxdVJaoCBuhSEL2gmH7Gjac2 s4WFb/3VfsrS8fAEmw4tAbeF9vqbjRWY4O2BgdIfnaj3zxtmfNAzQlrQD7qSuSUlo2Ux ORGRr1p7+KySH0Jomub53CVzSXZ47lh3gglP/tQYewFgPD7LP3sGsjgJsFfyweMl9jUj Xzk9j1ju6ct8lQGrKIw1/0BAD9FQoqhEQI/TFlvC66rMO+AIVMK0SyS3AfgxN7X4VBSJ jMjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680275687; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=l5kncIVPY+REFZSmn6Z/EoIcGo8jQ1hIKMNdqcBE+IA=; b=V5ZopM+co1/gYfEUjQ6O5HXKxFsMfxqKk6DOJSw28ov60Wv4NE2IlQxb7jQFIrAOo9 XL7tANCF0WkkjvnwCrsnYgbPFYgI2FMiufXt666lkUjsmE0ZEFcmct3oH0G3u5/9ubPp jXGY6dbxfiHisRKC++KMrcNNpjo5TVN0BLBnXVX55mtx8N76htWjrVFjg3rkYbmvUaDS A2taLVA92oxbA2olUATrRjO6rECTHfn/WpUnMEkjK0OlDoMlPM0tGzx9xXnj7fBX13wX A9MNODfzoFTwQEiD3JlICu34eGj5OJay9CT3mg2fogRkcNhqy3QeDpBH8cTNYbsQydL5 6s+g== X-Gm-Message-State: AAQBX9cABx1Bn5idezv6cSia/pzNSSaA3buNA3eYpNTQ+oZkxpUdLPVW E84ZLAlBVUfazxUWZddeg12xDj3bXJH+d/Cq++CmIVd7G4BWziJ58gM= X-Google-Smtp-Source: AKy350ZA4Cj+I6u0fYC1e9qaXONpS/zC8vF1+GLvhJAJ3RJymCteGNUGGuSarPQNhl6pf1Vx8aptR5MziHQBV7ITbjY= X-Received: by 2002:a17:906:3505:b0:931:faf0:3db1 with SMTP id r5-20020a170906350500b00931faf03db1mr4889853eja.4.1680275687465; Fri, 31 Mar 2023 08:14:47 -0700 (PDT) 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 References: <03eb85e1-14fa-24f4-dcb3-84caeef82a24@FreeBSD.org> <440103A8-A773-4B4E-BEB1-28C49D1B9CB5@adamw.org> <55712a33-dd09-719f-c294-417facb103a0@FreeBSD.org> In-Reply-To: From: Adam Weinberger Date: Fri, 31 Mar 2023 11:14:31 -0400 Message-ID: Subject: Re: git: de841b40d24d - main - sysutils/xxd: New port To: Guido Falsi Cc: gmarco@giovannelli.it, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000079f69f05f833abcf" X-Rspamd-Queue-Id: 4Pp3k11qVWz4CrT X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --00000000000079f69f05f833abcf Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Mar 31, 2023 at 11:07=E2=80=AFAM Guido Falsi = wrote: > 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: > >>> > >>> =EF=BB=BFOn 31/03/23 15:49, Adam Weinberger wrote: > >>>> On Thu, Mar 30, 2023 at 4:45=E2=80=AFPM Guido Falsi >>>> > wrote: > >>>> The branch main has been updated by madpilot: > >>>> URL: > >>>> > >>>> > https://cgit.FreeBSD.org/ports/commit/?id=3Dde841b40d24d22ab51ad05ed632e0= 25903fbb41f > < > https://cgit.FreeBSD.org/ports/commit/?id=3Dde841b40d24d22ab51ad05ed632e0= 25903fbb41f > > > >>>> 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=3D xxd > >>>> +DISTVERSIONPREFIX=3D v > >>>> +DISTVERSION=3D 9.0.1366 > >>>> +CATEGORIES=3D sysutils > >>>> + > >>>> +MAINTAINER=3D gmarco@giovannelli.it > >>>> +COMMENT=3D Hexdump and reverse hexdump utility > >>>> +WWW=3D https://github.com/mew-cx/xxd < > https://github.com/mew-cx/xxd> > >>>> + > >>>> +CONFLICTS_INSTALL=3D vim-[0-9]* vim-gtk2 vim-gtk3 vim-motif > >>>> vim-x11 > >>>> + > >>>> +ALL_TARGET=3D ${PORTNAME} > >>>> +PORTSCOUT=3D ignore:1 > >>>> +EXTRACT_AFTER_ARGS=3D --include=3D'*/src/xxd*' > >>>> +WRKSRC_SUBDIR=3D src/xxd > >>>> + > >>>> +PLIST_FILES=3D bin/xxd > >>>> + > >>>> +USE_GITHUB=3D yes > >>>> +GH_ACCOUNT=3D vim > >>>> +GH_PROJECT=3D vim > >>>> + > >>>> +do-install: > >>>> + ${INSTALL_PROGRAM} ${WRKSRC}/xxd ${STAGEDIR}${PREFIX}/bi= n > >>>> + > >>>> +.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! > One other option is to make a vim-xxd flavor, which honestly may be the best option. It would mean that xxd is built with the same configuration that the mainline vim ports are built with, and vim and xxd already conflict with each other (I'm not too concerned about vim-tiny and vim-xxd conflicting as a byproduct). # Adam --=20 Adam Weinberger adamw@adamw.org https://www.adamw.org --00000000000079f69f05f833abcf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


<= div dir=3D"ltr" class=3D"gmail_attr">On Fri, Mar 31, 2023 at 11:07=E2=80=AF= AM Guido Falsi <madpilot@freebsd= .org> wrote:
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 <madpilot@freebsd.org> wrote:<= br> >>>
>>> =EF=BB=BFOn 31/03/23 15:49, Adam Weinberger wrote:
>>>> On Thu, Mar 30, 2023 at 4:45=E2=80=AFPM Guido Falsi <madpilot@freebsd.or= g
>>>> <mailto:madpilot@freebsd.org>> wrote:
>>>> =C2=A0=C2=A0=C2=A0 The branch main has been updated by mad= pilot:
>>>> =C2=A0=C2=A0=C2=A0 URL:
>>>>=C2=A0 =C2=A0 =C2=A0
>>>> https://cgit.FreeBSD.org/ports/commit/?id=3Dde841b40d24d22ab51ad05ed632e02= 5903fbb41f <https://cgit.FreeBSD.org/ports/commit/?id=3Dde841b40d24d22ab51ad05ed632e= 025903fbb41f>
>>>> =C2=A0=C2=A0=C2=A0 commit de841b40d24d22ab51ad05ed632e0259= 03fbb41f
>>>> =C2=A0=C2=A0=C2=A0 Author:=C2=A0=C2=A0=C2=A0=C2=A0 Guido F= alsi <madpilot@FreeBSD.org>
>>>> =C2=A0=C2=A0=C2=A0 AuthorDate: 2023-03-30 20:42:54 +0000 >>>> =C2=A0=C2=A0=C2=A0 Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Guido F= alsi <madpilot@FreeBSD.org>
>>>> =C2=A0=C2=A0=C2=A0 CommitDate: 2023-03-30 20:42:54 +0000 >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sysutils/= xxd: New port
>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 This is t= he standalone version of the xxd tool provided by
>>>> vim.
>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Submitted= by:=C2=A0=C2=A0 Gianmarco Giovannelli <gmarco@giovannelli.it
>>>> =C2=A0=C2=A0=C2=A0 <mailto:gmarco@giovannelli.it>>
>>>> =C2=A0=C2=A0=C2=A0 diff --git a/sysutils/xxd/Makefile b/sy= sutils/xxd/Makefile
>>>> =C2=A0=C2=A0=C2=A0 new file mode 100644
>>>> =C2=A0=C2=A0=C2=A0 index 000000000000..378f364cf4bf
>>>> =C2=A0=C2=A0=C2=A0 --- /dev/null
>>>> =C2=A0=C2=A0=C2=A0 +++ b/sysutils/xxd/Makefile
>>>> =C2=A0=C2=A0=C2=A0 @@ -0,0 +1,26 @@
>>>> =C2=A0=C2=A0=C2=A0 +PORTNAME=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 xxd
>>>> =C2=A0=C2=A0=C2=A0 +DISTVERSIONPREFIX=3D=C2=A0=C2=A0=C2=A0= =C2=A0 v
>>>> =C2=A0=C2=A0=C2=A0 +DISTVERSION=3D=C2=A0=C2=A0 9.0.1366 >>>> =C2=A0=C2=A0=C2=A0 +CATEGORIES=3D=C2=A0=C2=A0=C2=A0 sysuti= ls
>>>> =C2=A0=C2=A0=C2=A0 +
>>>> =C2=A0=C2=A0=C2=A0 +MAINTAINER=3D gmarco@giovannelli.it <mailto:gmarco@giovannelli.= it>
>>>> =C2=A0=C2=A0=C2=A0 +COMMENT=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 Hexdump and reverse hexdump utility
>>>> =C2=A0=C2=A0=C2=A0 +WWW=3D https://github.com/mew-cx/x= xd <https://github.com/mew-cx/xxd>
>>>> =C2=A0=C2=A0=C2=A0 +
>>>> =C2=A0=C2=A0=C2=A0 +CONFLICTS_INSTALL=3D=C2=A0=C2=A0=C2=A0= =C2=A0 vim-[0-9]* vim-gtk2 vim-gtk3 vim-motif
>>>> vim-x11
>>>> =C2=A0=C2=A0=C2=A0 +
>>>> =C2=A0=C2=A0=C2=A0 +ALL_TARGET=3D=C2=A0=C2=A0=C2=A0 ${PORT= NAME}
>>>> =C2=A0=C2=A0=C2=A0 +PORTSCOUT=3D=C2=A0=C2=A0=C2=A0=C2=A0 i= gnore:1
>>>> =C2=A0=C2=A0=C2=A0 +EXTRACT_AFTER_ARGS=3D=C2=A0=C2=A0=C2= =A0 --include=3D'*/src/xxd*'
>>>> =C2=A0=C2=A0=C2=A0 +WRKSRC_SUBDIR=3D src/xxd
>>>> =C2=A0=C2=A0=C2=A0 +
>>>> =C2=A0=C2=A0=C2=A0 +PLIST_FILES=3D=C2=A0=C2=A0 bin/xxd
>>>> =C2=A0=C2=A0=C2=A0 +
>>>> =C2=A0=C2=A0=C2=A0 +USE_GITHUB=3D=C2=A0=C2=A0=C2=A0 yes >>>> =C2=A0=C2=A0=C2=A0 +GH_ACCOUNT=3D=C2=A0=C2=A0=C2=A0 vim >>>> =C2=A0=C2=A0=C2=A0 +GH_PROJECT=3D=C2=A0=C2=A0=C2=A0 vim >>>> =C2=A0=C2=A0=C2=A0 +
>>>> =C2=A0=C2=A0=C2=A0 +do-install:
>>>> =C2=A0=C2=A0=C2=A0 +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $= {INSTALL_PROGRAM} ${WRKSRC}/xxd ${STAGEDIR}${PREFIX}/bin
>>>> =C2=A0=C2=A0=C2=A0 +
>>>> =C2=A0=C2=A0=C2=A0 +.include <bsd.port.mk <http://bsd.port.mk<= /a>>>
>>>> The WWW is odd here. The source files are coming from
>>>> github.com/vim/vim <http://github.com/vim/vim&g= t;, 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 m= ust
>>> 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 i= t's
>>>> important for us to downstream. Rather than pinning xxd to= a version
>>>> that will be old literally tomorrow, why not pull the DIST= VERSION
>>>> and distinfo from editors/vim/Makefile?
>>>
>>> That would be a good idea, but while using vim distinfo is tri= vial,
>>> 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 <= br> 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!

One other option is to = make a vim-xxd flavor, which honestly may be the best option. It would mean= that xxd is built with the same configuration that the mainline vim ports = are built with, and vim and xxd already conflict with each other (I'm n= ot too concerned about vim-tiny and vim-xxd conflicting as a byproduct).

=
#= Adam


--
--00000000000079f69f05f833abcf--