From nobody Sun Mar 10 10:47:07 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 4TsxS73F0xz5CZ6y; Sun, 10 Mar 2024 10:47:19 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4TsxS72PLLz4XwW; Sun, 10 Mar 2024 10:47:19 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710067639; 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=J/5W3rrDlht6NZ5OqB4/dyLNZL+MQzxS7a7BsUUvruY=; b=jnmNMcdtcLEXiKl/La5EAUdmwCN7drj12AYv6SqmE9On3aFAxQ8Zv172UoIJxRzeqSDb+j wbCoG1xe/MM4mf+p+vYFPIOeJN5xDcXG+fCDcO1GgfTT725l8dZajZMV2h5UOYUuHziznE e4PfPcFdxo85SAYmlMji7xFJa3YkOxW3uPFsjN4FMUj2X5jc0XAWAUSRHJ56cyk4lZehYo 7zWhoo2nUZXC4axW3YzsOWnAcurvR16Ssp9k3v3ZkAo4VRw/kqPpcGBkRXckiEf5p6EWsr PjuRMrA34m35xBaKNVaizzE2Xugi1U23yRMvZTBdpcL8t4YtUtuwqR7Q17ZCpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710067639; a=rsa-sha256; cv=none; b=OvKDcHkyBCJYNGeMESP+KTUy7T8SSpnW4y8YyeIpTuAmS6bW3p2lB4dYCd8AXHNCCywCw9 YcYhxUvow2E7Wwup35RY6r3GIzrouM4Fso5Uh/zo//p+1RLt/VZms35N9r2SrqloekIrmT RfCtWM5koUN6uRJRiVs7lr/W+1vBolVJw5sqtfYRosTjOwXFarVnCcyKXaYNz/rT//uX4o A9jXSVvx8S/qJ/PvxuWEXJxj/H8jfCi9idQWcJId8r5wvuSDgBkuJhf7Cha1yhlgChDEjl rtXnGMTTJccjkaXP1n3eYtsuXDOg5MsyaRhdfVK0N8V6A/PMs7t3KrpddHrLLQ== 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=1710067639; 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=J/5W3rrDlht6NZ5OqB4/dyLNZL+MQzxS7a7BsUUvruY=; b=OLqKSB7PTu7cMlpL3rCEMrsugpwq1dg7RXeokeaQpmKiaWZQAnULKZBUale9EceWnpXiaa qzj8WxnhePw80Ab3iqucqN+PdUcNAlnTYCgx7zs+9wuJIzNag21eowgLUXkpCtd0ObE+KR ckX7dKjvY8YGamQlRFYjqeWo4uKATdKn+BwlkNVJxH5QqIux+NBP4PJIJu00SZXURJiXwn zV7n3cqfVOF8aWJBkLA9S5vdkACFunUukWf00luFq1c6Mg2hIKm3YkO2D+T/Q/FGccA8JJ yK0Nib3XweeEF9lArdq39Jz5fb0FEyU19iX9EbeahYX9L4AIC7yU6lVETMobFw== Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) (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 4TsxS71sRXzGsv; Sun, 10 Mar 2024 10:47:19 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-oo1-f53.google.com with SMTP id 006d021491bc7-5a19de33898so2044692eaf.0; Sun, 10 Mar 2024 03:47:19 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCU7bhYfZoNVxvaWdCGdz1nDW9VbTuVAHo5tA3mQGiT0IS5ZBWOZs6c2X4ET9lqoQ5C6A4Sjpcrr2zhAinHnYF4DtJybcxGZPpK5nspS7zMINjBmAjVCZCwD18/WTpemQ6GyJA/0t56SfJPJcelKDqkHgorohZQ= X-Gm-Message-State: AOJu0Ywe7dQK861PdJlHe83Vo5MN3KXReOmYGGG7k6Lf7oeRJSFq+ZJZ 4s7p8gh4qC3H6QRus7JhEIX9PkEfDhwfr51NR/AF7IsBmQAP0rAWm1AbzBiLuJYds/QSICd2O5C gznlhxztorCh0yAHgur0OgYBzuyU= X-Google-Smtp-Source: AGHT+IE37KTRMosjHlsi0mvAVH673z6sNRqV8gbt0+8PAS8EHOsbltWFLJtqRvXBOsFDaOzyLux9eUKdQXWQERMahTw= X-Received: by 2002:a05:6359:7c22:b0:17b:f233:9890 with SMTP id xm34-20020a0563597c2200b0017bf2339890mr4724569rwb.6.1710067638182; Sun, 10 Mar 2024 03:47:18 -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:47:07 +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 (...) Works fine: =3D=3D=3D +MAKE_ARGS=3D PREFIX=3D${PREFIX} MANDIR=3D${STAGEDIR}${PREFIX}/share/ma= n PLIST_FILES=3D bin/coffeebreak \ share/man/man6/coffeebreak.6.gz -post-patch: - ${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile - --- a/games/coffeebreak/files/patch-Makefile +++ /dev/null =3D=3D=3D What do you think? This way it is nicely simplified without patch or sed. Nuno Teixeira escreveu (domingo, 10/03/2024 =C3=A0(s)= 10:05): > > (...) > > 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}/Makefil= e > > > > > > > > .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 ha= ve > > > MAKE_ARGS for that matter. Grepping "git log" output for MAKE_ARGS c= an > > > yield plenty of examples. > > > > > > ./danfe > > > > > > > > -- > > Nuno Teixeira > > FreeBSD Committer (ports) > > > > -- > Nuno Teixeira > FreeBSD Committer (ports) --=20 Nuno Teixeira FreeBSD Committer (ports)