From nobody Sun Mar 10 10:05:55 2024 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 4TswXc2GJrz5Dkfg; Sun, 10 Mar 2024 10:06:08 +0000 (UTC) (envelope-from eduardo@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 4TswXc1Rvhz4V6s; Sun, 10 Mar 2024 10:06:08 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710065168; 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=6oh0Yfjul72581plNalSQCVHtJ2VEDvVgY4Xwg2hBtc=; b=KNxUtZXqzwxHEO8v6u88ykS15ts03UkHZabwwXvWB7in0570G2y5NDm3/0cQ3xGhptBuCR 99X/7DirMo1zLWBuKtDSDg2YOg3jxvYxzpwh4sEtGwgOjrVMjwabPz/rc67gQLG/O3PMkc 552T740YVm6ESP+i1mLUQumghO6oI5dTqm85Hj8b5zF7KuskBYhJvDOKr7uQsjtUg3lPwJ lULQwd7kqNiAEXeZJzrciG1zIJwnPKjkjx0hOYZMhBY1ZuLXBsdLlADFRHcSR76lYVVoVh wgRLaJDphFIl+FAVxTS8pATMbZ394HZpsPKVoD4Ho8IrzRkx4aUbyVpmvHmSIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710065168; a=rsa-sha256; cv=none; b=YMAdbIFuPICrSdTWhG8vXagp3I4fOaA8Ya4iK9i8hhlQXHV/IhpJZBKuoZYCZMaU61h0C6 /jvvYU3nZTxjfIHNesibySu5mCPiMdLMR6obmzlQG5OK6LRbJMfTLU3b7Os/Ye36BcZK/i ssXHcSjVvQl4ScZ2/r+NcDlFgZqCU0PLiK7t31SLwOZFOlDIhGyg1j6RhmYXeE0fcINPnN 0IcbPbhQs/ZZnBPc723EjztsPjVGIg5AG4UvxvGOxPHp2lG3zwzzmPOsymScyrVaNFUXRo Cua2Me0F7ZdVVQFMhB3Y3GT+pQ/GcXG0t2y79oc8Zk0HDNNnwzl9cnRDXke+gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710065168; 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=6oh0Yfjul72581plNalSQCVHtJ2VEDvVgY4Xwg2hBtc=; b=hgHToo9rcGjmgy8lq8aZ08csq6qCx9sQHCZ3Pmc3OPoL4noIdn4WGDqrziDjpdXDGnX9XW f2GWabcWuAWgu9Bk1oJFD+vGXzVcpRl4qbDJWqpvjuys/ePxrGjRo5ci2jv5HrbH5ZM7jO baGNARKfkTPaGyXKp+fAnmnyPSRzQAIgqTRUYPYjHfpxrlXFQTc5QGKMu0rRVQPRN/lzi7 KeBllnE3ERna+DJDEuIEPTsK/s55g7J6PT7JDJSup9GBrVmDt3izExIchh5MaW2cFWMocD 9WyMoGjqfL2KUxwunEpG1v+STk4gDPxtBCtkRibWfScCL16TpLLTKEhwFovwgg== Received: from mail-oo1-f47.google.com (mail-oo1-f47.google.com [209.85.161.47]) (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)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TswXc0wzvzG7k; Sun, 10 Mar 2024 10:06:08 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-oo1-f47.google.com with SMTP id 006d021491bc7-5a128e202b6so1959366eaf.2; Sun, 10 Mar 2024 03:06:08 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCV5lFkJF7T0InPU/lXV+4UJS6AlKy/kc1KgAa+jrukfVx/EDKfObdyTL6nG89DBG0scPL4qY/5MmU6dyFi2DGZJHaW4+jKpRzt8m77XWkp/92/8wiVQmrmdkiGL6EH/ikAeBcAhkwBSqqEG71v8yruFk1PfG3Q= X-Gm-Message-State: AOJu0YydM1OB2kFWi91b7xkjORL8V/LrRtgC63wvox3TxxTFNWrOiROi EBexCkpQ7r43r4v0F88u1KEdelPmoTVyHqs3HRT9u4JhOgVjPIqVgm+slbkWGpl9UVXZIwDxmen 8tDzCzyeKWWDShOvPyY9gW3s5LRs= X-Google-Smtp-Source: AGHT+IFlJmc4w0R5h7eXBU1gKBxzJZDS604W1Csp92obKKQg8bDhrXQAwYJsDeJPn5Dgg0sqeuaxpJ9TRGeZdKZ41Dc= X-Received: by 2002:a05:6358:4c55:b0:17e:2e05:94b7 with SMTP id lc21-20020a0563584c5500b0017e2e0594b7mr4790505rwc.6.1710065166986; Sun, 10 Mar 2024 03:06:06 -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: <202403090831.4298VJo6024021@gitrepo.freebsd.org> In-Reply-To: From: Nuno Teixeira Date: Sun, 10 Mar 2024 10:05:55 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 021fcd36af22 - main - games/coffeebreak: Move man pages to share/man To: Alexey Dokuchaev 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 (...) One possibility is: MAKE_ARGS=3D PREFIX=3D${PREFIX} MANDIR=3D${STAGEDIR}${PREFIX}/share/man but maybe I need to patch 'VAR =3D' to 'VAR ?=3D' Makefile: PREFIX =3D /usr/local BINDIR =3D $(DESTDIR)$(PREFIX)/bin MANDIR =3D $(DESTDIR)$(PREFIX)/man MAN6DIR =3D $(MANDIR)/man6 Nuno Teixeira escreveu (domingo, 10/03/2024 =C3=A0(s)= 09:43): > > Hello danfe! > > Good point. > > The problem here is that I can't use MANDIR in MAKE_ARGS because > Makefile have $(DESTDIR) defined in MANDIR var. > MANDIR =3D $(DESTDIR)$(PREFIX)/man > > Also, SED is needed anyway to fix hardcoded "/usr/local" to PREFIX. > > Any sugestions to simplify this? > > Thanks, > > Alexey Dokuchaev escreveu (domingo, 10/03/2024 =C3=A0= (s) 09:16): > > > > On Sat, Mar 09, 2024 at 08:31:19AM +0000, Nuno Teixeira wrote: > > > commit 021fcd36af22585a4bcf6e71ccb9a7d0f6ed204a > > > > > > games/coffeebreak: Move man pages to share/man > > > ... > > > + > > > +post-patch: > > > + ${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile > > > > > > .include > > > ... > > > +--- Makefile.orig 2024-03-09 06:57:33 UTC > > > ++++ Makefile > > > +@@ -27,7 +27,7 @@ BINDIR =3D $(DESTDIR)$(PREFIX)/bin > > > + > > > + PREFIX =3D /usr/local > > > + BINDIR =3D $(DESTDIR)$(PREFIX)/bin > > > +-MANDIR =3D $(DESTDIR)$(PREFIX)/man > > > ++MANDIR =3D $(DESTDIR)$(PREFIX)/share/man > > > > We typically don't patch makefiles, esp. twice (sed+patch) when we have > > MAKE_ARGS for that matter. Grepping "git log" output for MAKE_ARGS can > > yield plenty of examples. > > > > ./danfe > > > > -- > Nuno Teixeira > FreeBSD Committer (ports) --=20 Nuno Teixeira FreeBSD Committer (ports)