From nobody Thu Oct 20 20:56:02 2022 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 4MtfyV2Ljrz4gYPV; Thu, 20 Oct 2022 20:56:02 +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 4MtfyV1p8gz3Q9d; Thu, 20 Oct 2022 20:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666299362; 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=W8S7ky8M5tdnbZwY1WjT9px693dMQchNs3c5LZojLs0=; b=vLHwYMYjtL1yzBvIeAKAcnPySAJN/SmtRtkJDJk08M+HKwogHxVgLDx3WDPe8iJ59P5srv KbqWJM1uUDlmnP/50Y7l+uGPH6oGnDQKlmrGsQBMfpnknuzUrsRKFD4duKItnW9DJ0z/Uj a6Gh3HNiRChbhZL0ppdPE6pxcDynwQd4bOYoGQVYGErYoX9o2zmvB1/TOFAkZxK0rh47pG Rz8JOnWVvqItER2WxRWSrNmq4Uzsi7i9Sb6msbGEdbOLdLieFwIj7Kop4xkLxg6AqOfFei MjkaEJSEq999z54gws6Bzb5TZ9J+usTcHOuJTTUbsG1fXiHtpHVtbsPyE7WqDw== 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 4MtfyV0nqxz10Fd; Thu, 20 Oct 2022 20:56:02 +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 29KKu2oX026868; Thu, 20 Oct 2022 20:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29KKu2Fb026867; Thu, 20 Oct 2022 20:56:02 GMT (envelope-from git) Date: Thu, 20 Oct 2022 20:56:02 GMT Message-Id: <202210202056.29KKu2Fb026867@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 6266198345bc - main - deskutils/remind: fix build on FreeBSD 12. 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6266198345bc09234456296f97db68d7206ee996 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666299362; 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=W8S7ky8M5tdnbZwY1WjT9px693dMQchNs3c5LZojLs0=; b=fk3Hk1Gb9UbDMmXq+eY82sNhqhmHjg/vRBBZtrU3QpT99CxbOBdbeGnveFsaTG934n2JwF Tk1dlau7aKGUZfwzfxpukYVHaAVQQw5XaZlThjdrIHdfs9k5ESALyBP7DXIK8VgRXIv4oi BAau13xL5a79EmtK1XhyhjZd4JElgLxVpGvgJv9LhQTHv4IV+bo90TERXnII7wbvTH3rEh +bFAWens1kaRRkZzI/ppWTBHc5WXTvuH9SdGDT3FN4FQYwI1TGVf5Llnlkg0ckSyWs5Nv9 cr9GM/eoWdampL//xeHcr+Bkrsam0e3pAM9mwPTZZ/ISvxEuh/Jd+fVFIOmY6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666299362; a=rsa-sha256; cv=none; b=XueqTbNUuYlpij6G487UWna+WKvythyxQeLmx08bQ+/oQqwVtdFv4Mw14o7KALgHE/jZXy Mm2HOUFVQWFGwVz1Dw360zJ8W9Thia0Lp12zY8vmaevbZA2SEqStu4cU0+Vqw8Id5HPxxQ GsqRVhKUkgdwP/DaGIyNVtrf5eHETAGsZz5HFvODuvSIL4de9kJSDh3ZWE6B7G7tQhpFjo ttgfDvJLzdi0I1gYfq56wm/cGIfoGIuYeFdMMaCmNB6r1o6C5pE/4zxk0nYkuLsCWC/Y0H SoWfZI5dLI/HX5IlOlzUELEGjSxt7wMwEHy7m09qFb9c4FwY87Eu4IUrPSZZgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=6266198345bc09234456296f97db68d7206ee996 commit 6266198345bc09234456296f97db68d7206ee996 Author: Robert Clausecker AuthorDate: 2022-10-20 05:52:56 +0000 Commit: Fernando Apesteguía CommitDate: 2022-10-20 20:52:12 +0000 deskutils/remind: fix build on FreeBSD 12. ChangeLog: https://lists.freebsd.org/archives/freebsd-pkg-fallout/2022-October/282238.html PR: 267196 Reported by: fuz@fuz.su (maintainer) --- deskutils/remind/Makefile | 6 +++--- deskutils/remind/files/patch-src_Makefile.in | 4 ++-- deskutils/remind/files/patch-src_funcs.c | 13 +++++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/deskutils/remind/Makefile b/deskutils/remind/Makefile index 8f3d618e6e64..4320f8fd9948 100644 --- a/deskutils/remind/Makefile +++ b/deskutils/remind/Makefile @@ -67,16 +67,16 @@ LOCATION?= Ottawa .include -post-patch: +pre-configure: @${REINPLACE_CMD} \ -e 's#DEFAULT_LATITUDE 39#DEFAULT_LATITUDE ${DEFAULT_LATITUDE}#' \ -e 's#DEFAULT_LONGITUDE 39#DEFAULT_LONGITUDE ${DEFAULT_LONGITUDE}#' \ -e 's#Ottawa#${LOCATION}#' ${WRKSRC}/src/custom.h -post-patch-A4-on: +pre-configure-A4-on: @${REINPLACE_CMD} -e 's#"Letter", 612, 792#"A4", 595, 842#' ${WRKSRC}/src/custom.h -post-patch-TCLTK-on: +pre-configure-TCLTK-on: @${REINPLACE_CMD} -e 's,wish,${WISH},' ${WRKSRC}/scripts/tkremind do-build: diff --git a/deskutils/remind/files/patch-src_Makefile.in b/deskutils/remind/files/patch-src_Makefile.in index b97ab8f15d13..3314391e7576 100644 --- a/deskutils/remind/files/patch-src_Makefile.in +++ b/deskutils/remind/files/patch-src_Makefile.in @@ -1,8 +1,8 @@ ---- src/Makefile.in.orig 2022-02-10 22:15:01 UTC +--- src/Makefile.in.orig 2022-10-14 15:06:27 UTC +++ src/Makefile.in @@ -52,8 +52,11 @@ remind: $(REMINDOBJS) - install-nostripped: all + install: all -mkdir -p $(DESTDIR)$(bindir) || true - for prog in $(PROGS) $(SCRIPTS) ; do \ + for prog in $(PROGS) ; do \ diff --git a/deskutils/remind/files/patch-src_funcs.c b/deskutils/remind/files/patch-src_funcs.c new file mode 100644 index 000000000000..90e64dbf9c68 --- /dev/null +++ b/deskutils/remind/files/patch-src_funcs.c @@ -0,0 +1,13 @@ +--- src/funcs.c.orig 2022-10-19 10:26:29 UTC ++++ src/funcs.c +@@ -29,9 +29,7 @@ + + #include + +-#ifdef HAVE_SYS_FILE_H +-#include +-#endif ++#include + + #include +