From owner-svn-ports-all@freebsd.org Fri Apr 24 18:39:58 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 161D52BEB68; Fri, 24 Apr 2020 18:39:58 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4982z16WmJz3xPK; Fri, 24 Apr 2020 18:39:57 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB1B122605; Fri, 24 Apr 2020 18:39:57 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03OIdvZk085137; Fri, 24 Apr 2020 18:39:57 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03OIdvaR085134; Fri, 24 Apr 2020 18:39:57 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202004241839.03OIdvaR085134@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 24 Apr 2020 18:39:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532885 - head/sysutils/runwhen/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/sysutils/runwhen/files X-SVN-Commit-Revision: 532885 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 18:39:58 -0000 Author: tcberner Date: Fri Apr 24 18:39:56 2020 New Revision: 532885 URL: https://svnweb.freebsd.org/changeset/ports/532885 Log: sysutils/runwhen: Add support for skalibs 2.9.2.1 Five years after its latest release runwhen 2015.02.24 is no longer compatible the latest skalibs version (2.9.2.1 from 16 days ago). The attached patch allows the old runwhen code to build against the latest skalibs version. It converts the enum values in rw-match.c from lower to upper case to avoid a name collision on "div", deals with the renaming of tainnow.lib to to sysclock.lib and replaces a call to the deprecated env_get() function with getenv(). This gets rid of all compiler warnings and errors. PR: 245836 Submitted by: crest@rlwinm.de Added: head/sysutils/runwhen/files/ head/sysutils/runwhen/files/patch-package_compile (contents, props changed) head/sysutils/runwhen/files/patch-src_rw-match.c (contents, props changed) head/sysutils/runwhen/files/patch-src_rw__scan.c (contents, props changed) head/sysutils/runwhen/files/patch-src_tainnow=contents (contents, props changed) Added: head/sysutils/runwhen/files/patch-package_compile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/runwhen/files/patch-package_compile Fri Apr 24 18:39:56 2020 (r532885) @@ -0,0 +1,74 @@ +--- package/compile.orig 2015-02-24 06:40:08 UTC ++++ package/compile +@@ -634,7 +634,7 @@ make_13() { + set x \ + ./compile/host/rw-add.o \ + ./compile/host/runwhen.a \ +- -lskarnet \ ++ -L/usr/local/lib -lskarnet \ + ${contents_30?} && + shift && + . ./compile/conf/host_link.sh +@@ -679,7 +679,7 @@ make_15() { + set x \ + ./compile/host/rw-match.o \ + ./compile/host/runwhen.a \ +- -lskarnet \ ++ -L/usr/local/lib -lskarnet \ + ${contents_30?} && + shift && + . ./compile/conf/host_link.sh +@@ -724,7 +724,7 @@ make_17() { + set x \ + ./compile/host/rw-max.o \ + ./compile/host/runwhen.a \ +- -lskarnet \ ++ -L/usr/local/lib -lskarnet \ + ${contents_30?} && + shift && + . ./compile/conf/host_link.sh +@@ -769,7 +769,7 @@ make_19() { + set x \ + ./compile/host/rw-min.o \ + ./compile/host/runwhen.a \ +- -lskarnet \ ++ -L/usr/local/lib -lskarnet \ + ${contents_30?} && + shift && + . ./compile/conf/host_link.sh +@@ -814,7 +814,7 @@ make_21() { + set x \ + ./compile/host/rw-sleep.o \ + ./compile/host/runwhen.a \ +- -lskarnet \ ++ -L/usr/local/lib -lskarnet \ + ${contents_30?} && + shift && + . ./compile/conf/host_link.sh +@@ -859,7 +859,7 @@ make_23() { + set x \ + ./compile/host/rw-sub.o \ + ./compile/host/runwhen.a \ +- -lskarnet \ ++ -L/usr/local/lib -lskarnet \ + ${contents_30?} && + shift && + . ./compile/conf/host_link.sh +@@ -904,7 +904,7 @@ make_25() { + set x \ + ./compile/host/rw-touch.o \ + ./compile/host/runwhen.a \ +- -lskarnet \ ++ -L/usr/local/lib -lskarnet \ + ${contents_30?} && + shift && + . ./compile/conf/host_link.sh +@@ -994,7 +994,7 @@ make_30() { + make_ compile/host/skalibs_sysdeps && + echo && + prj_echo Making compile/host/tainnow && +- cp ./compile/host/skalibs_sysdeps/tainnow.lib "${output?}" && ++ cp ./compile/host/skalibs_sysdeps/sysclock.lib "${output?}" && + contents_30=`cat "${output?}"` + } && + Added: head/sysutils/runwhen/files/patch-src_rw-match.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/runwhen/files/patch-src_rw-match.c Fri Apr 24 18:39:56 2020 (r532885) @@ -0,0 +1,110 @@ +--- src/rw-match.c.orig 2020-04-22 21:36:45 UTC ++++ src/rw-match.c +@@ -21,7 +21,7 @@ static void die_malformed(char const* str, char const* + #define DIE_RANGE() DIE1X(100, "timestamp out of range") + #define DIE_UNIT_RANGE(x0) DIE2X(100, "value out of range for unit: ", x0) + +-enum { unset, eq, eqn, div }; ++enum { UNSET, EQ, EQN, DIV }; + + typedef struct { + unsigned int type; +@@ -42,21 +42,21 @@ static unsigned int max_minute (void) { return 59; } + static unsigned int max_second (void) { return 59; } + + static unit units_weekday[]={ +- { unset, 0, -1, 0, max_weekday, 6, 'w' }, +- { unset, 0, -1, 0, max_hour , 23, 'H' }, +- { unset, 0, -1, 0, max_minute , 59, 'M' }, +- { unset, 0, -1, 0, max_second , 59, 'S' }, +- { unset, 0, -1, 0, NULLP , 0, 0 } ++ { UNSET, 0, -1, 0, max_weekday, 6, 'w' }, ++ { UNSET, 0, -1, 0, max_hour , 23, 'H' }, ++ { UNSET, 0, -1, 0, max_minute , 59, 'M' }, ++ { UNSET, 0, -1, 0, max_second , 59, 'S' }, ++ { UNSET, 0, -1, 0, NULLP , 0, 0 } + }; + + static unit units_monthday[]={ +- { unset, 0, -1, 0, max_year , -1, 'y' }, +- { unset, 0, -1, 1, max_month , 12, 'm' }, +- { unset, 0, -1, 1, max_monthday, 31, 'd' }, +- { unset, 0, -1, 0, max_hour , 23, 'H' }, +- { unset, 0, -1, 0, max_minute , 59, 'M' }, +- { unset, 0, -1, 0, max_second , 59, 'S' }, +- { unset, 0, -1, 0, NULLP , 0, 0 } ++ { UNSET, 0, -1, 0, max_year , -1, 'y' }, ++ { UNSET, 0, -1, 1, max_month , 12, 'm' }, ++ { UNSET, 0, -1, 1, max_monthday, 31, 'd' }, ++ { UNSET, 0, -1, 0, max_hour , 23, 'H' }, ++ { UNSET, 0, -1, 0, max_minute , 59, 'M' }, ++ { UNSET, 0, -1, 0, max_second , 59, 'S' }, ++ { UNSET, 0, -1, 0, NULLP , 0, 0 } + }; + + static unsigned int max_monthday(void) { +@@ -99,26 +99,26 @@ int main(int argc, char** argv) { + "\"y\", \"m\", \"d\", \"w\", \"H\", \"M\", or \"S\""); + if (*constraint_str==units[i].id) break; + } +- if (units[i].type!=unset) ++ if (units[i].type!=UNSET) + DIE2X(100, "duplicate constraint for unit: ", constraint); + ++constraint_str; + switch (*constraint_str) { +- case '=': units[i].type=eq; break; +- case '-': units[i].type=eqn; break; +- case '/': units[i].type=div; break; ++ case '=': units[i].type=EQ; break; ++ case '-': units[i].type=EQN; break; ++ case '/': units[i].type=DIV; break; + default: die_malformed(constraint_str, "\"=\", \"-\", \"/\", or \",\""); + } + ++constraint_str; + len=uint_scan(constraint_str, &units[i].spec); + if (len==0) die_malformed(constraint_str, "number"); +- if (units[i].spec==0) units[i].type=eq; +- else if (units[i].type==eqn) units[i].spec--; ++ if (units[i].spec==0) units[i].type=EQ; ++ else if (units[i].type==EQN) units[i].spec--; + if (units[i].spec>units[i].maxmax) { +- if (units[i].type!=div || units[i].min>0) ++ if (units[i].type!=DIV || units[i].min>0) + DIE_UNIT_RANGE(constraint); +- units[i].type=eq; ++ units[i].type=EQ; + units[i].spec=0; +- } else if (units[i].spec