From e2f5a7ed7e50ce520e1ee3c374873634883a97ca Mon Sep 17 00:00:00 2001
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Mon, 22 Jul 2002 14:52:05 +0000
Subject: Re-enable statvfs() tests now that -CURRENT has the function.

Improve build reliability:
* Make very sure that the build script is run with /bin/sh.
* Add a dubious patch to libast/comp/conf.sh that is reported to fix
  the build for some -STABLE users.

Install example functions.

PR:		39783, 40857

Parts
Submitted by:	Joe Kelsey <joek@mail.flyingcroc.net>
---
 shells/ksh93/Makefile                              |  8 +++++++-
 .../ksh93/files/patch-src_lib_libast_comp_conf.sh  | 13 +++++++++++++
 .../ksh93/files/patch-src_lib_libast_features_fs   | 22 ----------------------
 shells/ksh93/pkg-plist                             |  3 +++
 4 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 shells/ksh93/files/patch-src_lib_libast_comp_conf.sh
 delete mode 100644 shells/ksh93/files/patch-src_lib_libast_features_fs

(limited to 'shells/ksh93')

diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile
index fed7a0a8a72f..a2480792698f 100644
--- a/shells/ksh93/Makefile
+++ b/shells/ksh93/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ksh93
 PORTVERSION=	${VERSION:S/-//g}
+PORTREVISION=	1
 VERSION=	2002-06-28
 CATEGORIES=	shells
 MASTER_SITES=	http://www.research.att.com/~gsf/download/tgz/
@@ -26,13 +27,18 @@ MAKE_ENV+=	LDFLAGS=-static
 MAN1=		ksh93.1
 
 do-build:
-	@cd ${WRKSRC} && env -i ${MAKE_ENV} ./bin/package make
+	@cd ${WRKSRC} && env -i ${MAKE_ENV} ${SH} bin/package make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/arch/freebsd.${ARCH}/bin/ksh \
 	    ${PREFIX}/bin/ksh93
 	${INSTALL_MAN} ${WRKSRC}/arch/freebsd.${ARCH}/man/man1/sh.1 \
 	    ${MANPREFIX}/man/man1/ksh93.1
+	${MKDIR} ${PREFIX}/share/examples/ksh93
+.for fun in dirs popd
+	${INSTALL_SCRIPT} ${WRKSRC}/arch/freebsd.${ARCH}/fun/${fun} \
+	    ${PREFIX}/share/examples/ksh93/
+.endfor
 
 post-install:
 	@${ECHO} "updating /etc/shells"
diff --git a/shells/ksh93/files/patch-src_lib_libast_comp_conf.sh b/shells/ksh93/files/patch-src_lib_libast_comp_conf.sh
new file mode 100644
index 000000000000..d832c5744596
--- /dev/null
+++ b/shells/ksh93/files/patch-src_lib_libast_comp_conf.sh
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/lib/libast/comp/conf.sh.orig	Fri Jul 19 03:26:02 2002
++++ src/lib/libast/comp/conf.sh	Fri Jul 19 03:26:45 2002
+@@ -627,6 +627,7 @@
+ 			cat <<!
+ 	printf("#undef	${macro}\n");
+ 	printf("#define ${macro}	${fmt}\n", ${var});
++
+ !
+ 			case $minmax in
+ 			"")	cat <<!
diff --git a/shells/ksh93/files/patch-src_lib_libast_features_fs b/shells/ksh93/files/patch-src_lib_libast_features_fs
deleted file mode 100644
index 647a92f40179..000000000000
--- a/shells/ksh93/files/patch-src_lib_libast_features_fs
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- src/lib/libast/features/fs.orig	Wed Jul 17 02:32:11 2002
-+++ src/lib/libast/features/fs	Wed Jul 17 02:48:42 2002
-@@ -191,15 +191,11 @@
- mem	mntent.mnt_opts,mnttab.mnt_opts sys/types.h mnttab.h sys/mnttab.h
- mem	stat.st_blocks,stat.st_blksize,stat.st_rdev sys/types.h sys/stat.h
- mem	statfs.f_files,statfs.f_bavail sys/types.h - sys/statfs.h - sys/vfs.h - sys/param.h sys/mount.h
--mem	statvfs.f_basetype,statvfs.f_frsize sys/types.h sys/statvfs.h
--ary	f_reserved7 sys/types.h sys/statvfs.h note{ statvfs.f_reserved7 can double for statvfs.f_basetype }end compile{
--	int f(vp)struct statvfs* vp;{return vp->f_reserved7[0] = 1;}
--}end
- hdr	mntent,mnttab
- lib	getmntent,getmntinfo,mntctl,mntopen,mntread,mntclose,setmntent
- lib	w_getmntent
- lib	statfs,statvfs
--sys	fs_types,mntent,mnttab,mount,statfs,statvfs,vfs,vmount
-+sys	fs_types,mntent,mnttab,mount,statfs,vfs,vmount
- lib	statfs4 sys/types.h - sys/statfs.h - sys/vfs.h - sys/mount.h compile{
- 	int f()
- 	{
diff --git a/shells/ksh93/pkg-plist b/shells/ksh93/pkg-plist
index 9bdf63903058..a9615ede13ad 100644
--- a/shells/ksh93/pkg-plist
+++ b/shells/ksh93/pkg-plist
@@ -1,4 +1,7 @@
 @comment $FreeBSD$
 bin/ksh93
+share/examples/ksh93/dirs
+share/examples/ksh93/popd
+@dirrm share/examples/ksh93
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
-- 
cgit v1.2.3