Received: by mail.netbsd.org (Postfix, from userid 605) id 76B8A84D9E; Wed, 24 Jul 2019 11:15:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F10A484D7C for ; Wed, 24 Jul 2019 11:15:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id dAawWfqrrlB9 for ; Wed, 24 Jul 2019 11:15:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5FF0B84C8B for ; Wed, 24 Jul 2019 11:15:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5A14EFBF4; Wed, 24 Jul 2019 11:15:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1563966941274950" MIME-Version: 1.0 Date: Wed, 24 Jul 2019 11:15:41 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/shells/oksh To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20190724111541.5A14EFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1563966941274950 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Wed Jul 24 11:15:41 UTC 2019 Modified Files: pkgsrc/shells/oksh: Makefile distinfo Added Files: pkgsrc/shells/oksh/patches: patch-io.c patch-portable.h Log Message: oksh: update to 6.5 Note release version goes backwards. Version now follows openbsd version numbering. No changes available. Patched to eliminate compilation warnings on netbsd. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/oksh/Makefile \ pkgsrc/shells/oksh/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/shells/oksh/patches/patch-io.c \ pkgsrc/shells/oksh/patches/patch-portable.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1563966941274950 Content-Disposition: inline Content-Length: 3652 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/shells/oksh/Makefile diff -u pkgsrc/shells/oksh/Makefile:1.1 pkgsrc/shells/oksh/Makefile:1.2 --- pkgsrc/shells/oksh/Makefile:1.1 Fri Nov 9 22:15:12 2018 +++ pkgsrc/shells/oksh/Makefile Wed Jul 24 11:15:41 2019 @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.1 2018/11/09 22:15:12 maya Exp $ +# $NetBSD: Makefile,v 1.2 2019/07/24 11:15:41 maya Exp $ -DISTNAME= oksh-20181009 +DISTNAME= oksh-6.5 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GITHUB:=ibara/} -GITHUB_TAG= ${PKGVERSION_NOREV} +GITHUB_TAG= ${DISTNAME} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/ibara/oksh/ COMMENT= Portable OpenBSD ksh(1) LICENSE= original-bsd -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +WRKSRC= ${WRKDIR}/oksh-${PKGNAME_NOREV} GNU_CONFIGURE= yes Index: pkgsrc/shells/oksh/distinfo diff -u pkgsrc/shells/oksh/distinfo:1.1 pkgsrc/shells/oksh/distinfo:1.2 --- pkgsrc/shells/oksh/distinfo:1.1 Fri Nov 9 22:15:12 2018 +++ pkgsrc/shells/oksh/distinfo Wed Jul 24 11:15:41 2019 @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1 2018/11/09 22:15:12 maya Exp $ +$NetBSD: distinfo,v 1.2 2019/07/24 11:15:41 maya Exp $ -SHA1 (oksh-20181009-20181009.tar.gz) = decc85574c362889f7f9eb74b1ae25eea0241f3c -RMD160 (oksh-20181009-20181009.tar.gz) = d2c8217d9271ac9ac9ed1f10a2884fdc3ba537a1 -SHA512 (oksh-20181009-20181009.tar.gz) = ba4d5d00e5a45ed035da1e4129163e9043f84a662bd100972754fe330ee7811b8b448321d202e61a63b1cc36ceac8df005a17e1473ac842cb536b1e50122e29b -Size (oksh-20181009-20181009.tar.gz) = 301271 bytes +SHA1 (oksh-6.5.tar.gz) = 80ca09d09a430b70ad38d7b3098d642560f5323e +RMD160 (oksh-6.5.tar.gz) = d774a686fc76f6671cc9d6be542c6d4f0afcd07c +SHA512 (oksh-6.5.tar.gz) = 473fc21e829018d3dd2977ae2909d95488a0c8f7a293778fe1e73f8e047cf46da2e3afe4786e95ff650fc7d207da342e0b2a8f8ccd98aa5957765a25bb844f98 +Size (oksh-6.5.tar.gz) = 301894 bytes +SHA1 (patch-io.c) = e231fe9fbef5df7f7a73facbedb0260134e8158c +SHA1 (patch-portable.h) = 9b4cdc1511db6093a0fe24c101bd4491c5df2f49 Added files: Index: pkgsrc/shells/oksh/patches/patch-io.c diff -u /dev/null pkgsrc/shells/oksh/patches/patch-io.c:1.1 --- /dev/null Wed Jul 24 11:15:41 2019 +++ pkgsrc/shells/oksh/patches/patch-io.c Wed Jul 24 11:15:41 2019 @@ -0,0 +1,12 @@ +$NetBSD: patch-io.c,v 1.1 2019/07/24 11:15:41 maya Exp $ + +--- io.c.orig 2019-04-10 23:55:43.000000000 +0000 ++++ io.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + + #include "sh.h" Index: pkgsrc/shells/oksh/patches/patch-portable.h diff -u /dev/null pkgsrc/shells/oksh/patches/patch-portable.h:1.1 --- /dev/null Wed Jul 24 11:15:41 2019 +++ pkgsrc/shells/oksh/patches/patch-portable.h Wed Jul 24 11:15:41 2019 @@ -0,0 +1,22 @@ +$NetBSD: patch-portable.h,v 1.1 2019/07/24 11:15:41 maya Exp $ + +Avoid re-defining timespecsub on netbsd, that already has it. + +--- portable.h.orig 2019-04-10 23:55:43.000000000 +0000 ++++ portable.h +@@ -151,6 +151,7 @@ + ((tsp)->tv_nsec cmp (usp)->tv_nsec) : \ + ((tsp)->tv_sec cmp (usp)->tv_sec)) + ++#ifndef timespecsub + #define timespecsub(tsp, usp, vsp) \ + do { \ + (vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \ +@@ -160,6 +161,7 @@ + (vsp)->tv_nsec += 1000000000L; \ + } \ + } while (0) ++#endif + #endif /* !__OpenBSD__ */ + + #if !defined(HAVE_ST_MTIM) && !defined(HAVE_ST_MTIMESPEC) --_----------=_1563966941274950--