From nobody Thu Apr 6 21:46:22 2023 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 4Psw732z15z43QSq; Thu, 6 Apr 2023 21:46:23 +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 4Psw726C9Pz49dc; Thu, 6 Apr 2023 21:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680817583; 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=cP0OTWG12IRj8Bs9/HmMXGRT4VNjs85Jp+1kz7A0mWI=; b=lhK6ZhJ7sOtPa7MnLwqfMsuzk41bdvVDN/v5kDfZusnX6Rxkpe6pBx03O7G7IPeOkJvX+5 vZC54pf8y7re97EC3OcB9goeUNmVqP99K/kJAUCHDNO3zz3K9XeKgEiZKtZ9J4DbAiKhXw hhbb+MJ/VIUN825JcFOjZfE+b4u9+5mUrRSF+VK/75rRMtzZVGPvSIPpHvBqulOBjj/NwY DB6syvatb2pZ9uyqJQ0ZfHIUDOtPNMR3cHbCs7uTp4pTR3W1SAPraoQae+CPYv/3df+rtk rlyme4T3z7VMYApTE+33Xukac3y1xydmcj0SpAvS3yssuhMeXIqcEK2EgThgYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680817583; 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=cP0OTWG12IRj8Bs9/HmMXGRT4VNjs85Jp+1kz7A0mWI=; b=x5WPbJZOeq+WL7OnmrD3XE0RwdofgSqFf+TcFjAtlYWGLWF8KtJibco/EmuPjhBqwN3glP ppW4Zk6pXMw4AK2put6WnEulTWQCEJvSrZpJ82wqQSK6sUs1iWXwnEiN5QuLgr6Dd7r0w3 yuP30+PPHSpqVDgxB4dnYrPYAQ7h5waD0yvHulmjaeNpYS64c2qGFx7970btb4t/QwWvLH dmFQovl3W1ym8hKsfi5CR3uhkEghS6ot/tdz9oiWX71DFlRlfuQzGhBEKH0BEzWZqUNdBN 9BkgF5qxN4AM/we/NLxvxyJPwhbA6U/PFwh2r/ZFBhEN7Ahdmj/slqElZrAHOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680817583; a=rsa-sha256; cv=none; b=COxas4olsyLI7gDTEOI7yP61OHb/ZvAzW7wProTVqUDWwiPX2OL6n7sBCgVKFPMl0LuVM7 H29qxSu/OfKb2o6uQLWVoXBSfvB8gRxJ3D0HRRqslPv4DleDWpPxIn6gRmnkVmug8oE+Xd +pgPIgEm2VbHZtQzyusGqmgpccRVVTZQLnnkvlx0WZOZT1cK4SemYP/TZRYdocr3XF1+m3 z8dAxiQc2RKSyPGRdjucmpiOZuChxZIMS6w1h1KSJTk/K70uN1pZ6mLUOHXK5X8a0U8aR2 yym9oA5UGkgOedaYoBVtLqryIEQh41cScj/b7UrMTPrI5aVtwKbC6KhFCfrq9w== 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 4Psw721FcGzKxt; Thu, 6 Apr 2023 21:46:22 +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 336LkM3p071433; Thu, 6 Apr 2023 21:46:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336LkMhp071432; Thu, 6 Apr 2023 21:46:22 GMT (envelope-from git) Date: Thu, 6 Apr 2023 21:46:22 GMT Message-Id: <202304062146.336LkMhp071432@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 7a615ccd342f - 2023Q2 - sysutils/runwhen: fix build with skalibs 2.13.x.y 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 7a615ccd342f70840f4b9c9ecd41006cf8a87d27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a615ccd342f70840f4b9c9ecd41006cf8a87d27 commit 7a615ccd342f70840f4b9c9ecd41006cf8a87d27 Author: Jan Bramkamp AuthorDate: 2023-04-05 00:55:22 +0000 Commit: Robert Clausecker CommitDate: 2023-04-06 21:45:53 +0000 sysutils/runwhen: fix build with skalibs 2.13.x.y While we are at it, convert to USES=localbase. MFH: 2023Q2 (cherry picked from commit ca83bc565ae88449e1a4ddeb93f12213f0e3044f) --- sysutils/runwhen/Makefile | 13 +++--- ...h-src_.mkmed-data_src_prjlibs-include_diewarn.h | 46 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/sysutils/runwhen/Makefile b/sysutils/runwhen/Makefile index f20afbd09a4c..9bedabdc3f45 100644 --- a/sysutils/runwhen/Makefile +++ b/sysutils/runwhen/Makefile @@ -1,6 +1,6 @@ PORTNAME= runwhen -PORTVERSION= 2021.04.30 -PORTREVISION= 1 +DISTVERSION= 2021.04.30 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://code.dogmap.org/runwhen/releases/ @@ -9,26 +9,23 @@ COMMENT= Tools for running commands at particular times WWW= http://code.dogmap.org/runwhen/ LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/package/LICENSE -BUILD_DEPENDS= skalibs>=2.12.0.0:devel/skalibs +BUILD_DEPENDS= skalibs>=2.13.1.1:devel/skalibs LIB_DEPENDS= libskarnet.so:devel/skalibs -USES= tar:bzip2 +USES= localbase tar:bzip2 WRKSRC= ${WRKDIR}/admin/${DISTNAME} PLIST_FILES= bin/rw-add bin/rw-match bin/rw-max bin/rw-min \ bin/rw-sleep bin/rw-sub bin/rw-touch -CFLAGS+= -I${LOCALBASE}/include - post-patch: @${REINPLACE_CMD} -e 's!gcc -O2!${CC} ${CFLAGS}!' \ ${WRKSRC}/conf-compile/defaults/host_compile.sh @${REINPLACE_CMD} 's!gcc!${CC} ${LDFLAGS} ${LIBS}!' \ ${WRKSRC}/conf-compile/defaults/host_link.sh - @${REINPLACE_CMD} 's!-lskarnet!-L${LOCALBASE}/lib -lskarnet!' \ - ${WRKSRC}/package/compile do-configure: ${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-compile/defaults/package_home diff --git a/sysutils/runwhen/files/patch-src_.mkmed-data_src_prjlibs-include_diewarn.h b/sysutils/runwhen/files/patch-src_.mkmed-data_src_prjlibs-include_diewarn.h new file mode 100644 index 000000000000..87343712d183 --- /dev/null +++ b/sysutils/runwhen/files/patch-src_.mkmed-data_src_prjlibs-include_diewarn.h @@ -0,0 +1,46 @@ +--- src/.mkmed-data/src/prjlibs-include/diewarn.h.orig 2023-04-05 00:31:59 UTC ++++ src/.mkmed-data/src/prjlibs-include/diewarn.h +@@ -1,14 +1,14 @@ + #ifndef PACKAGE__PROG__PRJLIBS__DIEWARN_H + #define PACKAGE__PROG__PRJLIBS__DIEWARN_H + +-#define DIE1X(status,x0) strerr_die3x((status),PROG,": ",(x0)) +-#define DIE2X(status,x0,x1) strerr_die4x((status),PROG,": ",(x0),(x1)) +-#define DIE3X(status,x0,x1,x2) strerr_die5x((status),PROG,": ",(x0),(x1),\ ++#define DIE1X(status,x0) strerr_die((status),PROG,": ",(x0)) ++#define DIE2X(status,x0,x1) strerr_die((status),PROG,": ",(x0),(x1)) ++#define DIE3X(status,x0,x1,x2) strerr_die((status),PROG,": ",(x0),(x1),\ + (x2)) +-#define DIE4X(status,x0,x1,x2,x3) strerr_die6x((status),PROG,": ",(x0),(x1),\ ++#define DIE4X(status,x0,x1,x2,x3) strerr_die((status),PROG,": ",(x0),(x1),\ + (x2),(x3)) + +-#define DIE_USAGE(x0) strerr_die3x(100, "usage: ", PROG, x0) ++#define DIE_USAGE(x0) strerr_dien(100, 3, "usage: ", PROG, x0) + #define DIE_OVERFLOW() DIE1X(100, "arithmetic overflow") + #define DIE_NOTSET(x0) DIE2X(100, "variable not set: ", (x0)) + #define DIE_MALFORMED(x0, x1) DIE4X(100, "malformed ", (x0), ": ", (x1)) +@@ -76,17 +76,17 @@ + #define WARNTEXT1(op) WARNTEXT_unable(1, op) " " + #define WARNTEXT2(op) WARNTEXT_unable(2, op) " " + +-#define WARN0(op) strerr_warn2sys(PROG, WARNTEXT0(WARNTEXT0_##op)) +-#define WARN1(op,x0) strerr_warn4sys(PROG, WARNTEXT1(WARNTEXT1_##op), \ ++#define WARN0(op) strerr_warnsys(PROG, WARNTEXT0(WARNTEXT0_##op)) ++#define WARN1(op,x0) strerr_warnsys(PROG, WARNTEXT1(WARNTEXT1_##op), \ + (x0), ": ") +-#define WARN2(op,x0,x1) strerr_warn6sys(PROG, WARNTEXT2(WARNTEXT2_##op), \ ++#define WARN2(op,x0,x1) strerr_warnsys(PROG, WARNTEXT2(WARNTEXT2_##op), \ + (x0), WARNSEP2_##op, (x1), ": ") + +-#define DIE0(op) strerr_die2sys(DIESTAT(#op), PROG, \ ++#define DIE0(op) strerr_diesys(DIESTAT(#op), PROG, \ + WARNTEXT0(WARNTEXT0_##op)) +-#define DIE1(op,x0) strerr_die4sys(DIESTAT(#op), PROG, \ ++#define DIE1(op,x0) strerr_diesys(DIESTAT(#op), PROG, \ + WARNTEXT1(WARNTEXT1_##op), (x0), ": ") +-#define DIE2(op,x0,x1) strerr_die6sys(DIESTAT(#op), PROG, \ ++#define DIE2(op,x0,x1) strerr_diesys(DIESTAT(#op), PROG, \ + WARNTEXT2(WARNTEXT2_##op), (x0),\ + WARNSEP2_##op, (x1), ": ") +