From nobody Wed Oct 15 15:05:31 2025 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 4cmvY856Jpz6CWsx for ; Wed, 15 Oct 2025 15:06:04 +0000 (UTC) (envelope-from 6yearold@gmail.com) Received: from mail-yx1-f45.google.com (mail-yx1-f45.google.com [74.125.224.45]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cmvY82qRzz3g24 for ; Wed, 15 Oct 2025 15:06:04 +0000 (UTC) (envelope-from 6yearold@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yx1-f45.google.com with SMTP id 956f58d0204a3-635349b6fe6so6356168d50.2 for ; Wed, 15 Oct 2025 08:06:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760540758; x=1761145558; h=content-transfer-encoding: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=bA1I5fQwxmAWno4jvO1QWYfz/kGZauhjT4mYoTx0Dpw=; b=Ozh2VOsiDJZEbmBxwviHKsVovbWo9cUu26wvtorgVyO5HRsE3N53psm8wxlaXUVZxr YILh1IlFIgLQLMVQuuoOX/w4+62FUl9k+A949Xn7g9KiyXbKqtmmf8t9QztWYxqWLQJx DPPkuyRmJ6DDHl6IjhCxG5sfOMigKiV/5NRK/ePSeynHwm2/3ZHm4e7TTjY++f3mVnEL mHAvtbCSyBljQAxpA3wd8dognNtUXJ3rsuWgE6LSqlzL86fKPkWnz+yE/NbrqM/0IjWX RjVYbJKwOb3Zabs7x0noPvv4DVnJ5Ki/uzuJcDFsZMifTrT50ov1bazTtbPHvw5TucHN jsXQ== X-Forwarded-Encrypted: i=1; AJvYcCUczEXLDBPdr51l9K4YJ7RC31MCyhEWSirOv+BBl6Vga8YuiHJpTG71a1vWAmfUV4Ws/cak+wcBQaID4cPJ2CaVFZONBK4=@freebsd.org X-Gm-Message-State: AOJu0YxG8BxnosRRKE/+nncqi1gjTCrp/p8sAK+qFiQB3savWRTZLdZJ RnvDTZ7Wel62ClKLhAKFcK7bE9KQWgqBv7l+5GjKxZlLn8rJq3SRKBGhNnVL5e5K X-Gm-Gg: ASbGncvvw9z84TpEO3gMg6acNqNMmGlgASKOEyI1OEmtulBJ5cgs7oQLftwULeIMd7g QCqB8UAS3lPtCSdtvBSlZeeAa7AAVCuzcu0xKvzCUegWzKKRhQTNG7s9UxDNw02eZdd43MV9f3P o8WwFEMsTKAtD2y4fAPa/u+XiUBUUUYtTlH1xhDpc/XH4R80LgNC2a3QmFqMiLdbDz9iNPjuPZI 4Jy31iB3W0eHGbKZAweni8zE1MHMeN+rY0gDKx6NISzuW+lSaa07ngH07CGyk9iiVjwljEriTA0 C/0m0ZionWXljt0UBDWsURfdBnTPYxdRaU9UKI3nUsiY8A1aMXVwimvuPGYSDnfVwoZhnfYeVsg ZP+zmfhtjFQMR80n8nKiBYAa+ewrYMjxYxW7YuO6s2Bo7ObVUskxUH/QNzIgEJY8CsfYzlX83GZ ji X-Google-Smtp-Source: AGHT+IFT7jISQA/F54yd3wPZDofaIA/crwaE87Dh092KGYXYDiuzW/R9DFpwe/+AzwD/9weEoNTFgg== X-Received: by 2002:a53:cf11:0:b0:634:94a:3e65 with SMTP id 956f58d0204a3-63ccb90be3cmr19253016d50.24.1760540757373; Wed, 15 Oct 2025 08:05:57 -0700 (PDT) Received: from mail-yx1-f43.google.com (mail-yx1-f43.google.com. [74.125.224.43]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-63cf52f27b9sm3969728d50.0.2025.10.15.08.05.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Oct 2025 08:05:57 -0700 (PDT) Received: by mail-yx1-f43.google.com with SMTP id 956f58d0204a3-63cf0638c1dso5284190d50.1 for ; Wed, 15 Oct 2025 08:05:57 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCWmFVfCjHoKRQNCoZy4wXnAZqydHYgld2Wl6RTPly5bWzrtZF0/iLwA5cwXLXoin0JouYW5suYzwVa5O+GgXEPk8njusFk=@freebsd.org X-Received: by 2002:a53:dcce:0:b0:637:c4eb:f77d with SMTP id 956f58d0204a3-63ccb90ae5dmr19752761d50.33.1760540756834; Wed, 15 Oct 2025 08:05:56 -0700 (PDT) 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 References: <202510151500.59FF0Uj7031567@gitrepo.freebsd.org> In-Reply-To: <202510151500.59FF0Uj7031567@gitrepo.freebsd.org> From: Gleb Popov Date: Wed, 15 Oct 2025 18:05:31 +0300 X-Gmail-Original-Message-ID: X-Gm-Features: AS18NWCSSDQ4eMFlI4y-3iu8tyfkvIzpWaGKjtx-ZAYH-IALXySRaz1bgULoExI Message-ID: Subject: Re: git: d061fc9816e6 - main - sysutils/elephant: look for LOCALBASE/etc/xdg for installed providers To: Hiroki Tagato Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cmvY82qRzz3g24 On Wed, Oct 15, 2025 at 6:00=E2=80=AFPM Hiroki Tagato wrote: > > The branch main has been updated by tagattie: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Dd061fc9816e69509e9d75a0c= 7763b7bc9d3b898a > > commit d061fc9816e69509e9d75a0c7763b7bc9d3b898a > Author: Hiroki Tagato > AuthorDate: 2025-10-15 14:58:18 +0000 > Commit: Hiroki Tagato > CommitDate: 2025-10-15 15:00:20 +0000 > > sysutils/elephant: look for LOCALBASE/etc/xdg for installed providers > > github.com/adrg/xdg specifies only /etc/xdg as the configuration > directories. However, LOCALBASE/etc/xdg is usual in FreeBSD. So add > the path to the config directories. > --- > sysutils/elephant/Makefile | 6 +++++= - > .../files/patch-vendor_github.com_adrg_xdg_paths__unix.go | 11 +++++= ++++++ > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/sysutils/elephant/Makefile b/sysutils/elephant/Makefile > index 1c4c21894ba2..ebd602a9a4ae 100644 > --- a/sysutils/elephant/Makefile > +++ b/sysutils/elephant/Makefile > @@ -1,7 +1,7 @@ > PORTNAME=3D elephant > DISTVERSIONPREFIX=3D v > DISTVERSION=3D 2.1.8 > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D sysutils > > MAINTAINER=3D tagattie@FreeBSD.org > @@ -64,6 +64,10 @@ WEBSEARCH_PLIST_FILES=3D etc/xdg/elephant/provid= ers/websearch.so > > ENABLED_PROVIDERS=3D ${SELECTED_OPTIONS:NDOCS:tl} > > +post-patch: > + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ > + ${GO_WRKSRC}/vendor/github.com/adrg/xdg/paths_unix.go > + > post-build: > .for provider in ${ENABLED_PROVIDERS} > @${ECHO_MSG} "=3D=3D=3D> Building ${provider} from ./internal/pr= oviders/${provider}" > diff --git a/sysutils/elephant/files/patch-vendor_github.com_adrg_xdg_pat= hs__unix.go b/sysutils/elephant/files/patch-vendor_github.com_adrg_xdg_path= s__unix.go > new file mode 100644 > index 000000000000..bee2e9cd1b8c > --- /dev/null > +++ b/sysutils/elephant/files/patch-vendor_github.com_adrg_xdg_paths__uni= x.go > @@ -0,0 +1,11 @@ > +--- vendor/github.com/adrg/xdg/paths_unix.go.orig 2025-10-15 14:39:= 48 UTC > ++++ vendor/github.com/adrg/xdg/paths_unix.go > +@@ -21,7 +21,7 @@ func initBaseDirs(home string) { > + baseDirs.dataHome =3D pathutil.EnvPath(envDataHome, filepath.Join= (home, ".local", "share")) > + baseDirs.data =3D pathutil.EnvPathList(envDataDirs, "/usr/local/s= hare", "/usr/share") > + baseDirs.configHome =3D pathutil.EnvPath(envConfigHome, filepath.= Join(home, ".config")) > +- baseDirs.config =3D pathutil.EnvPathList(envConfigDirs, "/etc/xdg= ") > ++ baseDirs.config =3D pathutil.EnvPathList(envConfigDirs, "%%LOCALB= ASE%%/etc/xdg", "/etc/xdg") The code for "baseDirs.data" already uses "/usr/local", so you could've just put "/usr/local" here instead of %%LOCALBASE%% and adjust ${REINPLACE_CMD} accordingly. It is just a nit pick, but with "/usr/local" the patch is actually upstreamable.