From nobody Wed Oct 12 16:39:35 2022 X-Original-To: dev-commits-ports-branches@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 4MndfH34CRz4fjjh; Wed, 12 Oct 2022 16:39:35 +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 4MndfH2gwbz3QcN; Wed, 12 Oct 2022 16:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665592775; 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=eW/APKowODzP4z/6Kylxk+9a5BkD/QZqj8BxBMBmv3s=; b=frowl8kF+DZ9aZMmXQdUb7G6co8OjtlzT/E6Y4QuUmUgZTKpXY/n205YkV0FpyhB98M4Z7 JtYCekqAvv5RiLPuRYep0FUqiF6jL7qXnzVOy/o/6assXdMnfq0f9c8CDktisdgOn6mzaW dKJBlfXPQ1A5pYbEaUOeQkjfs3/6f70zGPlyDKOfhhUsYnrsZsj+fGWV+vTiOdzFKw6Vbd DAy1fjWZzndN/OEi6529cjN/35h75I1thVSywkQx3A9iH/0xMMaalupD+0DVW4/jh8ekJB r1kjKC99UpX5suTigzLwo7UKN3X21D4uCVZCkH4CejnMH+TxdPBHQUBCX1MJuQ== 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 4MndfH1nWkz1Mnb; Wed, 12 Oct 2022 16:39:35 +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 29CGdZDM094682; Wed, 12 Oct 2022 16:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CGdZtA094681; Wed, 12 Oct 2022 16:39:35 GMT (envelope-from git) Date: Wed, 12 Oct 2022 16:39:35 GMT Message-Id: <202210121639.29CGdZtA094681@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 02148aa2cc6b - 2022Q4 - x11/wl-clipboard: respect LOCALBASE for MIME types List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 02148aa2cc6bbe671c0242933c9cd3d9379f1d6c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665592775; 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=eW/APKowODzP4z/6Kylxk+9a5BkD/QZqj8BxBMBmv3s=; b=Jkt1IlxGHh0LfetbPmuqfvO9hNlCRyUr6WdUT38PoMG95tDQrHGs75gRbqEJbZmXz25nyu S5kowK1WvVPbkhGHPJIQosY0cPKN0dam58bAiUbB2HD5mVk1fWMTqWJIkLcxR81Dq+zhjs EYQY3GY/TPKDCTMalTD98VRTX9/RtmnxBXvy7J0Rv12SeUB55bQ4waeS6K8363qnOEpuBP 617tXtVb54CE+8vXR36D7KsNMrr1kf/c+ybXQVW5z/P6ggtRVWC0omPiaaZfVndVgSWkYT aoLtUyfKcy9eQ6H3WjQ8p7dWv1NY4tstq9N5vmX6HUGNrGp6T4eWRgCc9tKHsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665592775; a=rsa-sha256; cv=none; b=CP9X6oEF5yGvAZEIB/fGQ6KjFYGJO5UruwCZV2UIKAyaiNHQrHVvMNvXrlVw7x55949hSV fFAGzqnmD0lP1s0o1j7mZd8nv7dbxT+iMZB4+R83oXPKEQHX9u2X30t3+xKGLV8L5+5bER NOi9+PrAaLipKEYEf5M+ZLszxGhu0acXRbwDq8c6Qd5quEtjWa/2yF6wOIzrRPMZu3kDmK KRE9MJ9rzswyRIuc/AooA196GyibZ0qxRMoXFODNWwxF+aBfu4VDu2yYbnuOvV1JQ3Wo1L q5FmRBC5r3uyR7ycLtagwrKqAD0lgXzrIDJWngv91peKVePFVL734jfBUSBbGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=02148aa2cc6bbe671c0242933c9cd3d9379f1d6c commit 02148aa2cc6bbe671c0242933c9cd3d9379f1d6c Author: Jan Beich AuthorDate: 2022-10-12 16:08:24 +0000 Commit: Jan Beich CommitDate: 2022-10-12 16:39:22 +0000 x11/wl-clipboard: respect LOCALBASE for MIME types (cherry picked from commit 75618bfd83dd8ce7922ea45b46e22f352689d5db) --- x11/wl-clipboard/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/x11/wl-clipboard/Makefile b/x11/wl-clipboard/Makefile index 3898244ec5ec..becd6cfa12aa 100644 --- a/x11/wl-clipboard/Makefile +++ b/x11/wl-clipboard/Makefile @@ -1,6 +1,7 @@ PORTNAME= wl-clipboard DISTVERSIONPREFIX= v DISTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org @@ -31,5 +32,11 @@ PLIST_FILES= bin/wl-copy \ post-patch: @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/completions/fish/meson.build +# Search mime-support (etc/mime.types) and shared-mime-info (share/mime/types) + @${REINPLACE_CMD} -e 's,/usr/share,${LOCALBASE}/share,' \ + -e '/local/!s,/etc,${LOCALBASE}&,' \ + ${WRKSRC}/completions/bash/wl-copy \ + ${WRKSRC}/completions/zsh/_wl-copy \ + ${WRKSRC}/src/util/files.c .include