ksh93u+: rename to ksh93.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: ksh93u+: rename to ksh93.
From: Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Date: Sun, 03 Jul 2022 17:01:24 +0000
Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Sun Jul 3 19:01:24 2022 +0200
Changeset:	41863a4914546d2879aafae2b0437f9225536ab7

Added Files:
	ksh93/DESCR
	ksh93/Makefile
	ksh93/PLIST
	ksh93/distinfo
	ksh93/patches/patch-src_lib_libast_features_syscall
Removed Files:
	ksh93u+/DESCR
	ksh93u+/Makefile
	ksh93u+/PLIST
	ksh93u+/distinfo
	ksh93u+/patches/patch-src_lib_libast_features_syscall

Log Message:
ksh93u+: rename to ksh93.

It looks appropriate to just name this package 'ksh93', in order to
prevent confusion from anybody who isn't comfortable with ksh version
naming conventions.

ksh93u+ isn't even the correct name of this project (aka 'ksh93u+m'),
but the codename of the AT&T ksh93 branch which this version is derived
from.

The latest stable official branch from AT&T is unmistakably provided by
shells/ast-ksh, for anybody needing ksh93 in production.

I consider the package ready to import; it builds fine on NetBSD, Linux
and SunOS. Testing required on other platfomrs especially macOS.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=41863a4914546d2879aafae2b0437f9225536ab7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ksh93/DESCR                                        | 12 +++++
 ksh93/Makefile                                     | 51 ++++++++++++++++++++++
 ksh93/PLIST                                        |  3 ++
 ksh93/distinfo                                     |  6 +++
 .../patches/patch-src_lib_libast_features_syscall  | 32 ++++++++++++++
 ksh93u+/DESCR                                      | 12 -----
 ksh93u+/Makefile                                   | 51 ----------------------
 ksh93u+/PLIST                                      |  3 --
 ksh93u+/distinfo                                   |  6 ---
 .../patches/patch-src_lib_libast_features_syscall  | 32 --------------
 10 files changed, 104 insertions(+), 104 deletions(-)

diffs:
diff --git a/ksh93/DESCR b/ksh93/DESCR
new file mode 100644
index 0000000000..8a3d156261
--- /dev/null
+++ b/ksh93/DESCR
@@ -0,0 +1,12 @@
+Between 2017 and 2020 there was an ultimately unsuccessful attempt to breathe
+new life into the KornShell by extensively refactoring the last unstable AST
+beta version (93v-). While that ksh2020 effort is now abandoned and still has
+many critical bugs, it also had a lot of bugs fixed. More importantly, the AST
+issue tracker now contains a lot of documentation on how to fix those bugs,
+which made it possible to backport many of them to the last stable release
+instead. This ksh 93u+m reboot now incorporates many of these bugfixes, plus
+patches from OpenSUSE, Red Hat, and Solaris, as well as many new fixes from the
+community (1, 2). Though there are many bugs left to fix, we are confident at
+this point that 93u+m is already the least buggy version of ksh93 ever
+released. As of late 2021, distributions such as Debian and Slackware have
+begun to package it as their default version of ksh93.
diff --git a/ksh93/Makefile b/ksh93/Makefile
new file mode 100644
index 0000000000..fdce08ea60
--- /dev/null
+++ b/ksh93/Makefile
@@ -0,0 +1,51 @@
+# $NetBSD$
+
+DISTNAME=	v1.0.0-beta.2
+PKGVER=		${DISTNAME:S,^v,,:S,-beta,,}	
+PKGNAME=	${GITHUB_PROJECT}93-${PKGVER}
+CATEGORIES=	shells
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ksh93/}
+GITHUB_PROJECT=	ksh
+GITHUB_TAG=	${DISTNAME}
+
+MAINTAINER=	vms%retrobsd.ddns.net@localhost
+HOMEPAGE=	https://github.com/ksh93/ksh/
+COMMENT=	Actively developed fork of AT&T KornShell 93u+
+LICENSE=	epl-v1.0
+
+CONFLICTS+=		ast-ksh-[0-9]* static-ast-ksh-[0-9]*
+
+USE_LANGUAGES=		c
+FORTIFY_SUPPORTED=	no
+
+KSH=	${TOOLS_PATH.ksh:Q}
+
+MAKEFLAGS+=		CC=${CC:Q} SHELL=${KSH}
+MAKEFLAGS+=		CCFLAGS=${CFLAGS:M*:Q}
+
+CFLAGS.SunOS+=	-std=c11 -D__EXTENSIONS__
+
+PKG_SHELL=		bin/ksh93
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
+WRKSRC=	${WRKDIR}/ksh-${DISTNAME:S,^v,,}
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} 				\
+		${KSH} ./bin/package make ${MAKEFLAGS}
+
+do-install:
+	set -e;								\
+	arch=`${WRKSRC}/bin/package host`;                              \
+	${INSTALL_PROGRAM} ${WRKSRC}/arch/"$${arch}"/bin/ksh 		\
+		${DESTDIR}${PREFIX}/bin/ksh93
+
+	${INSTALL_MAN} ${WRKSRC}/src/cmd/ksh93/sh.1 			\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ksh93.1
+
+do-test:
+	cd ${WRKSRC} && ${SETENV} SHELL=${KSH}				\
+		${KSH} ./bin/package test
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/ksh93/PLIST b/ksh93/PLIST
new file mode 100644
index 0000000000..6c70f0ba7b
--- /dev/null
+++ b/ksh93/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+bin/ksh93
+man/man1/ksh93.1
diff --git a/ksh93/distinfo b/ksh93/distinfo
new file mode 100644
index 0000000000..7729b98f85
--- /dev/null
+++ b/ksh93/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+BLAKE2s (v1.0.0-beta.2.tar.gz) = 1852a7f7963978ea6b80d47a915fe0da868bb91f8d9830056dfc6ea1b3303165
+SHA512 (v1.0.0-beta.2.tar.gz) = c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2
+Size (v1.0.0-beta.2.tar.gz) = 2238224 bytes
+SHA1 (patch-src_lib_libast_features_syscall) = 725fead538810678e808c6fdfd543fa1a0415645
diff --git a/ksh93/patches/patch-src_lib_libast_features_syscall b/ksh93/patches/patch-src_lib_libast_features_syscall
new file mode 100644
index 0000000000..6c26c6c35b
--- /dev/null
+++ b/ksh93/patches/patch-src_lib_libast_features_syscall
@@ -0,0 +1,32 @@
+$NetBSD$
+
+On NetBSD, use `SYS___getcwd' to get the getcwd(2) syscall. 
+
+--- src/lib/libast/features/syscall.orig	2021-12-17 03:20:04.000000000 +0000
++++ src/lib/libast/features/syscall
+@@ -1,9 +1,13 @@
+-lib	sysgetcwd note{ syscall(SYS_getcwd,buf,len) implemented }end link{
++lib    sysgetcwd note{ syscall(SYS_getcwd/SYS___getcwd,buf,len) implemented }end link{
+ 	#include <sys/syscall.h>
+ 	int main()
+ 	{
+ 		char	buf[256];
++	#ifdef __NetBSD__
++		return syscall(SYS___getcwd, buf, sizeof(buf)) < 0;
++	#else
+ 		return syscall(SYS_getcwd, buf, sizeof(buf)) < 0;
++	#endif
+ 	}
+ }end
+ 
+@@ -13,6 +17,10 @@ if	( _lib_sysgetcwd ) {
+ endif
+ 
+ if	( _lib_sysgetcwd ) {
++	#ifdef __NetBSD__
++	#define SYSGETCWD(a,b)		syscall(SYS___getcwd,a,b)
++	#else
+ 	#define SYSGETCWD(a,b)		syscall(SYS_getcwd,a,b)
++	#endif
+ }
+ endif
diff --git a/ksh93u+/DESCR b/ksh93u+/DESCR
deleted file mode 100644
index 8a3d156261..0000000000
--- a/ksh93u+/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Between 2017 and 2020 there was an ultimately unsuccessful attempt to breathe
-new life into the KornShell by extensively refactoring the last unstable AST
-beta version (93v-). While that ksh2020 effort is now abandoned and still has
-many critical bugs, it also had a lot of bugs fixed. More importantly, the AST
-issue tracker now contains a lot of documentation on how to fix those bugs,
-which made it possible to backport many of them to the last stable release
-instead. This ksh 93u+m reboot now incorporates many of these bugfixes, plus
-patches from OpenSUSE, Red Hat, and Solaris, as well as many new fixes from the
-community (1, 2). Though there are many bugs left to fix, we are confident at
-this point that 93u+m is already the least buggy version of ksh93 ever
-released. As of late 2021, distributions such as Debian and Slackware have
-begun to package it as their default version of ksh93.
diff --git a/ksh93u+/Makefile b/ksh93u+/Makefile
deleted file mode 100644
index 79f0373ac3..0000000000
--- a/ksh93u+/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	v1.0.0-beta.2
-PKGVER=		1.0.0
-PKGNAME=	${GITHUB_PROJECT}93u+-${PKGVER}
-CATEGORIES=	shells
-MASTER_SITES=	${MASTER_SITE_GITHUB:=ksh93/}
-GITHUB_PROJECT=	ksh
-GITHUB_TAG=	${DISTNAME}
-
-MAINTAINER=	vms%retrobsd.ddns.net@localhost
-HOMEPAGE=	https://github.com/ksh93/ksh/
-COMMENT=	Actively developed fork of AT&T KornShell 93u+
-LICENSE=	epl-v1.0
-
-CONFLICTS+=		ast-ksh-[0-9]* static-ast-ksh-[0-9]*
-
-USE_LANGUAGES=		c
-FORTIFY_SUPPORTED=	no
-
-KSH=	${TOOLS_PATH.ksh:Q}
-
-MAKEFLAGS+=		CC=${CC:Q} SHELL=${KSH}
-MAKEFLAGS+=		CCFLAGS=${CFLAGS:M*:Q}
-
-CFLAGS.SunOS+=	-std=c11 -D__EXTENSIONS__
-
-PKG_SHELL=		bin/ksh93
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-WRKSRC=	${WRKDIR}/ksh-${DISTNAME:S,^v,,}
-
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} 				\
-		${KSH} ./bin/package make ${MAKEFLAGS}
-
-do-install:
-	set -e;								\
-	arch=`${WRKSRC}/bin/package host`;                              \
-	${INSTALL_PROGRAM} ${WRKSRC}/arch/"$${arch}"/bin/ksh 		\
-		${DESTDIR}${PREFIX}/bin/ksh93
-
-	${INSTALL_MAN} ${WRKSRC}/src/cmd/ksh93/sh.1 			\
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ksh93.1
-
-do-test:
-	cd ${WRKSRC} && ${SETENV} SHELL=${KSH}				\
-		${KSH} ./bin/package test
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/ksh93u+/PLIST b/ksh93u+/PLIST
deleted file mode 100644
index 6c70f0ba7b..0000000000
--- a/ksh93u+/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-bin/ksh93
-man/man1/ksh93.1
diff --git a/ksh93u+/distinfo b/ksh93u+/distinfo
deleted file mode 100644
index 7729b98f85..0000000000
--- a/ksh93u+/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-BLAKE2s (v1.0.0-beta.2.tar.gz) = 1852a7f7963978ea6b80d47a915fe0da868bb91f8d9830056dfc6ea1b3303165
-SHA512 (v1.0.0-beta.2.tar.gz) = c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2
-Size (v1.0.0-beta.2.tar.gz) = 2238224 bytes
-SHA1 (patch-src_lib_libast_features_syscall) = 725fead538810678e808c6fdfd543fa1a0415645
diff --git a/ksh93u+/patches/patch-src_lib_libast_features_syscall b/ksh93u+/patches/patch-src_lib_libast_features_syscall
deleted file mode 100644
index 6c26c6c35b..0000000000
--- a/ksh93u+/patches/patch-src_lib_libast_features_syscall
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-On NetBSD, use `SYS___getcwd' to get the getcwd(2) syscall. 
-
---- src/lib/libast/features/syscall.orig	2021-12-17 03:20:04.000000000 +0000
-+++ src/lib/libast/features/syscall
-@@ -1,9 +1,13 @@
--lib	sysgetcwd note{ syscall(SYS_getcwd,buf,len) implemented }end link{
-+lib    sysgetcwd note{ syscall(SYS_getcwd/SYS___getcwd,buf,len) implemented }end link{
- 	#include <sys/syscall.h>
- 	int main()
- 	{
- 		char	buf[256];
-+	#ifdef __NetBSD__
-+		return syscall(SYS___getcwd, buf, sizeof(buf)) < 0;
-+	#else
- 		return syscall(SYS_getcwd, buf, sizeof(buf)) < 0;
-+	#endif
- 	}
- }end
- 
-@@ -13,6 +17,10 @@ if	( _lib_sysgetcwd ) {
- endif
- 
- if	( _lib_sysgetcwd ) {
-+	#ifdef __NetBSD__
-+	#define SYSGETCWD(a,b)		syscall(SYS___getcwd,a,b)
-+	#else
- 	#define SYSGETCWD(a,b)		syscall(SYS_getcwd,a,b)
-+	#endif
- }
- endif
Prev by Date: signify-libbsd: REMOVE; superseded by wip/signify.
Next by Date: ksh93: linted
Previous by Thread: signify-libbsd: REMOVE; superseded by wip/signify.
Next by Thread: ksh93: linted
Indexes:
Home | Main Index | Thread Index | Old Index