- Update to 051118

  There have been major changes since 040603, including introduction of
  POSIX.1-2001 support.  This should be considered a major update.

PR:		ports/92159
Submitted by:	Jeffrey H. Johnson <CPE1704TKS@bellsouth.net>

4 files changed, 341 insertions, 155 deletions

diff --git a/sysutils/heirloom/Makefile b/sysutils/heirloom/Makefile
index b66105725639..cca6a480774f 100644
--- a/sysutils/heirloom/Makefile
+++ b/sysutils/heirloom/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	heirloom
-PORTVERSION=	040603
+PORTVERSION=	051118
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,11 +18,10 @@ BUILD_DEPENDS=	ksh:${PORTSDIR}/shells/pdksh
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	CC=${CC}
 MAKEFILE=	makefile
-ALL_TARGET=	bsd
+ALL_TARGET=
 DATADIR=	${PREFIX}/${PORTNAME}
 REINPLACE_SUB=	DATADIR="${DATADIR}"
 
@@ -43,9 +42,11 @@ _MAN1=		apropos.1 awk.1 banner.1 basename.1 bc.1 cal.1 calendar.1 \
 		spell.1 split.1 stty.1 su.1 sum.1 tabs.1 tail.1 tape.1 \
 		tapecntl.1 tar.1 tcopy.1 tee.1 time.1 touch.1 tr.1 tsort.1 \
 		tty.1 ul.1 uname.1 unexpand.1 uniq.1 units.1 uptime.1 users.1 \
-		w.1 wc.1 what.1 whatis.1 who.1 whoami.1 whodo.1 xargs.1 yes.1
-_MAN1B=		basename.1b chown.1b deroff.1b df.1b du.1b groups.1b \
-		install.1b ln.1b ls.1b ps.1b stty.1b sum.1b tr.1b
+		w.1 wc.1 what.1 whatis.1 who.1 whoami.1 whodo.1 xargs.1 yes.1 \
+		bdiff.1 bfs.1 dircmp.1 echo.1 fmtmsg.1 getconf.1 getopt.1 kill.1 \
+		mesg.1 mvdir.1 pathchk.1 printf.1 pwd.1 test.1 false.1 true.1
+_MAN1B=		basename.1b chown.1b deroff.1b df.1b du.1b groups.1b echo.1b \
+		install.1b ln.1b ls.1b ps.1b stty.1b sum.1b tr.1b test.1b
 _MAN1M=		mknod.1m sync.1m
 _MAN5=		fspec.5
 _MAN7=		man.7
@@ -70,9 +71,9 @@ _MLINKS_PREPEND+=${_M${sect}LINKS:S%^%${_MANPREFIX}/man${sect:L}/%:S%$%${MANEXT}
 
 DOC_FILES=	CHANGES LICENSE/COPYING LICENSE/LICENSE LICENSE/LUCENT \
 		LICENSE/README LICENSE/COPYING.LGPL README intro.txt
-NOTE_FILES=	cp/NOTES cpio/TODO dd/NOTES grep/NOTES libuxre/NOTES \
-		more/NOTES nawk/NOTES oawk/EXPLAIN oawk/NOTES \
-		oawk/README ps/NOTES shl/NOTES tar/NOTES
+#NOTE_FILES=	cp/NOTES cpio/TODO dd/NOTES grep/NOTES libuxre/NOTES \
+#		more/NOTES nawk/NOTES oawk/EXPLAIN oawk/NOTES \
+#		oawk/README ps/NOTES shl/NOTES tar/NOTES
 
 .include <bsd.port.pre.mk>
 
@@ -93,9 +94,9 @@ install-doc:
 . for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/${file}
 . endfor
-. for file in ${NOTE_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/${file:T}.${file:H}
-. endfor
+#. for file in ${NOTE_FILES}
+#	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/${file:T}.${file:H}
+#. endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/heirloom/distinfo b/sysutils/heirloom/distinfo
index 9f57c747082c..c4b9d25186d6 100644
--- a/sysutils/heirloom/distinfo
+++ b/sysutils/heirloom/distinfo
@@ -1,2 +1,3 @@
-MD5 (heirloom-040603.tar.bz2) = 8ea6afa405737853119af480e224bb4a
-SIZE (heirloom-040603.tar.bz2) = 809372
+MD5 (heirloom-051118.tar.bz2) = a316e4d63100c9787ae17da7d939b6de
+SHA256 (heirloom-051118.tar.bz2) = b0ec695e1b855e9442117fb3f7aeb59f0127c807052b707c11fe05f13e7dc481
+SIZE (heirloom-051118.tar.bz2) = 983022
diff --git a/sysutils/heirloom/files/patch-build::mk.config b/sysutils/heirloom/files/patch-build::mk.config
index 245d2be975be..6d76dabf1740 100644
--- a/sysutils/heirloom/files/patch-build::mk.config
+++ b/sysutils/heirloom/files/patch-build::mk.config
@@ -1,126 +1,253 @@
---- build/mk.config.orig	Mon May 17 21:43:22 2004
-+++ build/mk.config	Thu Jun  3 16:25:47 2004
-@@ -14,57 +14,57 @@
- # Location for binaries that have no special personality. This location
- # may be identical to that of one of the first three personalities below.
- #
--DEFBIN = /usr/5bin
-+DEFBIN = %%DATADIR%%/usr/5bin
- 
- #
- # Location for SVID3/SVR4-style binaries.
- #
--SV3BIN = /usr/5bin
-+SV3BIN = %%DATADIR%%/usr/5bin
- 
- #
- # Location for SVID4/SVR4.2-style binaries.
- #
--S42BIN = /usr/5bin/s42
-+S42BIN = %%DATADIR%%/usr/5bin/s42
- 
- #
- # Location for POSIX.2/SUS-style binaries.
- #
--SUSBIN = /usr/5bin/posix
-+SUSBIN = %%DATADIR%%/usr/5bin/posix
- 
- #
- # Location for SVR4 UCB-style binaries. These do not form a complete
- # personality, and the binary path may not be identical to the default
- # one.
- #
--UCBBIN = /usr/ucb
-+UCBBIN = %%DATADIR%%/usr/ucb
- 
- #
- # Location for library files.
- #
--DEFLIB = /usr/5lib
-+DEFLIB = %%DATADIR%%/usr/5lib
- 
- #
- # Location for superuser-only binaries. May be identical to the
- # default binary directory.
- #
--DEFSBIN = /usr/5bin
-+DEFSBIN = %%DATADIR%%/usr/5bin
- 
- #
- # Location for manual pages (with man1, man1b ... man8 below).
- #
--MANDIR = /usr/share/man/5man
-+MANDIR = %%DATADIR%%/usr/share/man/5man
- 
- #
- # Location for default files. Make sure that this directory is accessible
- # to all users.
- #
--DFLDIR = /etc/default
-+DFLDIR = %%DATADIR%%/etc/default
- 
- #
- # Location for the spell history file (contains misspelled words for
- # all users; set to /dev/null to disable).
- #
--SPELLHIST = /var/adm/spellhist
-+SPELLHIST = /var/db/spellhist
- 
- #
- # Location for the su logfile.
-@@ -75,7 +75,7 @@
- # Where to store the file command's magic. Note that the existing
- # file at this location is replaced unconditionally at installation.
- #
--MAGIC = /usr/5lib/magic
-+MAGIC = %%DATADIR%%/usr/5lib/magic
- 
- #
- # The group whose members may write utmp or utmpx entries. Appropriate values
-@@ -83,7 +83,7 @@
- # does not actually matter but should be set to "adm" too. (The '-g' is an
- # argument to the install command and should remain as is.)
- #
--TTYGRP = -g utmp
-+TTYGRP = -g tty # utmp
- 
- #
- # Curses library. Change to -lncurses if necessary. Caution: Some gcc
-@@ -107,21 +107,21 @@
- #
- # Uncomment this on FreeBSD.
- #
--#LKVM = -lkvm
-+LKVM = -lkvm
- 
- #
- # zlib (statically linked by default). Set USE_ZLIB to 0 if you don't have
- # zlib or don't want to use it; you need it only if you want to use inflate
- # compression when creating zip files with cpio.
- #
--LIBZ = -Wl,-Bstatic -lz -Wl,-Bdynamic
-+LIBZ = -lz # -Wl,-Bstatic -lz -Wl,-Bdynamic
- USE_ZLIB = 1
- 
- #
- # The name of the bzip2 library, and whether to use it. The library is only
- # needed to read and write bzip2 compressed parts of zip files with cpio.
- #
--LIBBZ2 = -Wl,-Bstatic -lbz2 -Wl,-Bdynamic
-+LIBBZ2 = -lbz2 # -Wl,-Bstatic -lbz2 -Wl,-Bdynamic
- USE_BZLIB = 1
- 
- #
-@@ -178,9 +178,9 @@
- # defines here. Leave XO5FL, XO6FL, and GNUFL empty on Solaris, Open UNIX,
- # and FreeBSD.
- #
--XO5FL = -D_XOPEN_SOURCE=500L
--XO6FL = -D_XOPEN_SOURCE=600L
--GNUFL = -D_GNU_SOURCE
-+XO5FL = # -D_XOPEN_SOURCE=500L
-+XO6FL = # -D_XOPEN_SOURCE=600L
-+GNUFL = # -D_GNU_SOURCE
- LARGEF = -D_FILE_OFFSET_BITS=64L
- 
- #
+*** build/mk.config.orig	Fri Nov 18 13:27:51 2005
+--- build/mk.config	Sun Jan 22 08:18:30 2006
+***************
+*** 4,87 ****
+  # versions. It needs not conform to POSIX. The system shell should work
+  # fine; for maximum compatibility with traditional tools, the Heirloom
+  # Bourne shell is recommended. It then must obviously be compiled and
+  # installed first.
+  #
+! SHELL = /bin/sh
+  
+  #
+  # Specify the path name for a POSIX-conforming shell here. For example,
+  # Solaris users should insert /usr/xpg4/bin/sh. This shell is used for
+  # the shell escape in the POSIX variants of the ed utility.
+  #
+! POSIX_SHELL = /bin/sh
+  
+  #
+  # Root directory. Mainly useful for package building; leave empty for
+  # normal installation.
+  #
+! ROOT =
+  
+  #
+  # Location for binaries that have no special personality. This location
+  # may be identical to that of one of the first three personalities below.
+  #
+! DEFBIN = /usr/5bin
+  
+  #
+  # Location for SVID3/SVR4-style binaries.
+  #
+! SV3BIN = /usr/5bin
+  
+  #
+  # Location for SVID4/SVR4.2-style binaries.
+  #
+! S42BIN = /usr/5bin/s42
+  
+  #
+  # Location for POSIX.2/SUS-style binaries.
+  #
+! SUSBIN = /usr/5bin/posix
+  
+  #
+  # Location for POSIX.1-2001/SUSv3-style binaries.
+! SU3BIN = /usr/5bin/posix2001
+  
+  #
+  # Location for SVR4 UCB-style binaries. These do not form a complete
+  # personality, and the binary path must not be identical to the default
+  # one.
+  #
+! UCBBIN = /usr/ucb
+  
+  #
+  # Location for library files.
+  #
+! DEFLIB = /usr/5lib
+  
+  #
+  # Location for superuser-only binaries. May be identical to the
+  # default binary directory.
+  #
+! DEFSBIN = /usr/5bin
+  
+  #
+  # Location for manual pages (with man1, man1b ... man8 below).
+  #
+! MANDIR = /usr/share/man/5man
+  
+  #
+  # Location for default files. Make sure that this directory is accessible
+  # to all users.
+  #
+! DFLDIR = /etc/default
+  
+  #
+  # Location for the spell history file (contains misspelled words for
+  # all users; set to /dev/null to disable).
+  #
+! SPELLHIST = /var/adm/spellhist
+  
+  #
+  # Location for the su logfile.
+  #
+  SULOG = /var/log/sulog
+--- 4,87 ----
+  # versions. It needs not conform to POSIX. The system shell should work
+  # fine; for maximum compatibility with traditional tools, the Heirloom
+  # Bourne shell is recommended. It then must obviously be compiled and
+  # installed first.
+  #
+! SHELL = /bin/sh
+  
+  #
+  # Specify the path name for a POSIX-conforming shell here. For example,
+  # Solaris users should insert /usr/xpg4/bin/sh. This shell is used for
+  # the shell escape in the POSIX variants of the ed utility.
+  #
+! POSIX_SHELL = /bin/sh
+  
+  #
+  # Root directory. Mainly useful for package building; leave empty for
+  # normal installation.
+  #
+! ROOT = 
+  
+  #
+  # Location for binaries that have no special personality. This location
+  # may be identical to that of one of the first three personalities below.
+  #
+! DEFBIN = %%DATADIR%%/usr/5bin
+  
+  #
+  # Location for SVID3/SVR4-style binaries.
+  #
+! SV3BIN = %%DATADIR%%/usr/5bin
+  
+  #
+  # Location for SVID4/SVR4.2-style binaries.
+  #
+! S42BIN = %%DATADIR%%/usr/5bin/s42
+  
+  #
+  # Location for POSIX.2/SUS-style binaries.
+  #
+! SUSBIN = %%DATADIR%%/usr/5bin/posix
+  
+  #
+  # Location for POSIX.1-2001/SUSv3-style binaries.
+! SU3BIN = %%DATADIR%%/usr/5bin/posix2001
+  
+  #
+  # Location for SVR4 UCB-style binaries. These do not form a complete
+  # personality, and the binary path must not be identical to the default
+  # one.
+  #
+! UCBBIN = %%DATADIR%%/usr/ucb
+  
+  #
+  # Location for library files.
+  #
+! DEFLIB = %%DATADIR%%/usr/5lib
+  
+  #
+  # Location for superuser-only binaries. May be identical to the
+  # default binary directory.
+  #
+! DEFSBIN = %%DATADIR%%/usr/5bin
+  
+  #
+  # Location for manual pages (with man1, man1b ... man8 below).
+  #
+! MANDIR = %%DATADIR%%/usr/share/man/5man
+  
+  #
+  # Location for default files. Make sure that this directory is accessible
+  # to all users.
+  #
+! DFLDIR = %%DATADIR%%/etc/default
+  
+  #
+  # Location for the spell history file (contains misspelled words for
+  # all users; set to /dev/null to disable).
+  #
+! SPELLHIST = /var/db/spellhist
+  
+  #
+  # Location for the su logfile.
+  #
+  SULOG = /var/log/sulog
+***************
+*** 98,108 ****
+  # does not actually matter but should be set to "adm" too. (The '-g' is an
+  # argument to the install command and should remain as is.)
+  #
+  # On HP-UX, AIX, FreeBSD, NetBSD, and OpenBSD, this setting is not used.
+  #
+! TTYGRP = -g utmp
+  
+  #
+  # Curses library. Change to -lncurses if necessary. Caution: Some gcc
+  # setups on Solaris are broken so that ncurses headers are used during
+  # compilation, but the system libcurses is used for linking. This will
+--- 98,108 ----
+  # does not actually matter but should be set to "adm" too. (The '-g' is an
+  # argument to the install command and should remain as is.)
+  #
+  # On HP-UX, AIX, FreeBSD, NetBSD, and OpenBSD, this setting is not used.
+  #
+! TTYGRP = -g tty # utmp
+  
+  #
+  # Curses library. Change to -lncurses if necessary. Caution: Some gcc
+  # setups on Solaris are broken so that ncurses headers are used during
+  # compilation, but the system libcurses is used for linking. This will
+***************
+*** 126,151 ****
+  #LIBGEN = -lgen
+  
+  #
+  # Uncomment this on FreeBSD, NetBSD, and OpenBSD.
+  #
+! #LKVM = -lkvm
+  
+  #
+  # zlib (statically linked by default). Set USE_ZLIB to 0 if you don't have
+  # zlib or don't want to use it; you need it only if you want to use inflate
+  # compression when creating zip files with cpio.
+  #
+! LIBZ = -Wl,-Bstatic -lz -Wl,-Bdynamic
+  USE_ZLIB = 1
+  
+  #
+  # The name of the bzip2 library, and whether to use it. The library is only
+  # needed to read and write bzip2 compressed parts of zip files with cpio.
+  #
+! #LIBBZ2 = -Wl,-Bstatic -lbz2 -Wl,-Bdynamic
+! USE_BZLIB = 0
+  
+  #
+  # Compiler and linker flags. HOSTCC is for cross compiling.
+  #
+  
+--- 126,151 ----
+  #LIBGEN = -lgen
+  
+  #
+  # Uncomment this on FreeBSD, NetBSD, and OpenBSD.
+  #
+! LKVM = -lkvm
+  
+  #
+  # zlib (statically linked by default). Set USE_ZLIB to 0 if you don't have
+  # zlib or don't want to use it; you need it only if you want to use inflate
+  # compression when creating zip files with cpio.
+  #
+! LIBZ = -lz #-Wl,-Bstatic -lz -Wl,-Bdynamic
+  USE_ZLIB = 1
+  
+  #
+  # The name of the bzip2 library, and whether to use it. The library is only
+  # needed to read and write bzip2 compressed parts of zip files with cpio.
+  #
+! LIBBZ2 = -lbz2 #-Wl,-Bstatic -lbz2 -Wl,-Bdynamic
+! USE_BZLIB = 1
+  
+  #
+  # Compiler and linker flags. HOSTCC is for cross compiling.
+  #
+  
diff --git a/sysutils/heirloom/pkg-plist b/sysutils/heirloom/pkg-plist
index f6f6daaed1d7..e1fdfce0df00 100644
--- a/sysutils/heirloom/pkg-plist
+++ b/sysutils/heirloom/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 %%DATADIR%%/etc/default/man
 %%DATADIR%%/etc/default/ps
 %%DATADIR%%/etc/default/su
@@ -115,6 +114,50 @@
 %%DATADIR%%/usr/5bin/posix/tr
 %%DATADIR%%/usr/5bin/posix/wc
 %%DATADIR%%/usr/5bin/posix/who
+%%DATADIR%%/usr/5bin/posix/echo
+%%DATADIR%%/usr/5bin/posix/file
+%%DATADIR%%/usr/5bin/posix/getconf
+%%DATADIR%%/usr/5bin/posix/od
+%%DATADIR%%/usr/5bin/posix/test
+%%DATADIR%%/usr/5bin/posix/pax
+%%DATADIR%%/usr/5bin/posix2001/pax
+%%DATADIR%%/usr/5bin/posix2001/csplit
+%%DATADIR%%/usr/5bin/posix2001/ed
+%%DATADIR%%/usr/5bin/posix2001/expr
+%%DATADIR%%/usr/5bin/posix2001/find
+%%DATADIR%%/usr/5bin/posix2001/getconf
+%%DATADIR%%/usr/5bin/posix2001/grep
+%%DATADIR%%/usr/5bin/posix2001/egrep
+%%DATADIR%%/usr/5bin/posix2001/fgrep
+%%DATADIR%%/usr/5bin/posix2001/ls
+%%DATADIR%%/usr/5bin/posix2001/nawk
+%%DATADIR%%/usr/5bin/posix2001/nl
+%%DATADIR%%/usr/5bin/posix2001/pg
+%%DATADIR%%/usr/5bin/posix2001/sed
+%%DATADIR%%/usr/5bin/posix2001/basename
+%%DATADIR%%/usr/5bin/posix2001/chmod
+%%DATADIR%%/usr/5bin/posix2001/cp
+%%DATADIR%%/usr/5bin/posix2001/date
+%%DATADIR%%/usr/5bin/posix2001/du
+%%DATADIR%%/usr/5bin/posix2001/echo
+%%DATADIR%%/usr/5bin/posix2001/file
+%%DATADIR%%/usr/5bin/posix2001/id
+%%DATADIR%%/usr/5bin/posix2001/ln
+%%DATADIR%%/usr/5bin/posix2001/mkdir
+%%DATADIR%%/usr/5bin/posix2001/mv
+%%DATADIR%%/usr/5bin/posix2001/nohup
+%%DATADIR%%/usr/5bin/posix2001/pr
+%%DATADIR%%/usr/5bin/posix2001/ps
+%%DATADIR%%/usr/5bin/posix2001/rm
+%%DATADIR%%/usr/5bin/posix2001/rmdir
+%%DATADIR%%/usr/5bin/posix2001/sort
+%%DATADIR%%/usr/5bin/posix2001/test
+%%DATADIR%%/usr/5bin/posix2001/touch
+%%DATADIR%%/usr/5bin/posix2001/tr
+%%DATADIR%%/usr/5bin/posix2001/wc
+%%DATADIR%%/usr/5bin/posix2001/who
+%%DATADIR%%/usr/5bin/posix2001/od
+%%DATADIR%%/usr/5bin/posix2001/awk
 %%DATADIR%%/usr/5bin/pr
 %%DATADIR%%/usr/5bin/printenv
 %%DATADIR%%/usr/5bin/priocntl
@@ -159,6 +202,12 @@
 %%DATADIR%%/usr/5bin/s42/tr
 %%DATADIR%%/usr/5bin/s42/wc
 %%DATADIR%%/usr/5bin/s42/who
+%%DATADIR%%/usr/5bin/s42/getconf
+%%DATADIR%%/usr/5bin/s42/echo
+%%DATADIR%%/usr/5bin/s42/file
+%%DATADIR%%/usr/5bin/s42/od
+%%DATADIR%%/usr/5bin/s42/pax
+%%DATADIR%%/usr/5bin/s42/test
 %%DATADIR%%/usr/5bin/sdiff
 %%DATADIR%%/usr/5bin/sed
 %%DATADIR%%/usr/5bin/setpgrp
@@ -199,6 +248,22 @@
 %%DATADIR%%/usr/5bin/whodo
 %%DATADIR%%/usr/5bin/xargs
 %%DATADIR%%/usr/5bin/yes
+%%DATADIR%%/usr/5bin/bdiff
+%%DATADIR%%/usr/5bin/bfs
+%%DATADIR%%/usr/5bin/dircmp
+%%DATADIR%%/usr/5bin/echo
+%%DATADIR%%/usr/5bin/fmtmsg
+%%DATADIR%%/usr/5bin/getopt
+%%DATADIR%%/usr/5bin/kill
+%%DATADIR%%/usr/5bin/mesg
+%%DATADIR%%/usr/5bin/mvdir
+%%DATADIR%%/usr/5bin/pathchk
+%%DATADIR%%/usr/5bin/printf
+%%DATADIR%%/usr/5bin/pwd
+%%DATADIR%%/usr/5bin/test
+%%DATADIR%%/usr/5bin/true
+%%DATADIR%%/usr/5bin/false
+%%DATADIR%%/usr/5bin/getconf
 %%DATADIR%%/usr/5lib/calprog
 %%DATADIR%%/usr/5lib/diff3prog
 %%DATADIR%%/usr/5lib/diffh
@@ -208,8 +273,10 @@
 %%DATADIR%%/usr/5lib/spell/hlistb
 %%DATADIR%%/usr/5lib/spell/hstop
 %%DATADIR%%/usr/5lib/spell/spellin
-%%DATADIR%%/usr/5lib/spell/spellout
 %%DATADIR%%/usr/5lib/spell/spellprog
+%%DATADIR%%/usr/5lib/spell/hashcheck
+%%DATADIR%%/usr/5lib/spell/hashmake
+%%DATADIR%%/usr/5lib/spell/compress
 %%DATADIR%%/usr/5lib/tmac/an-old.tmac
 %%DATADIR%%/usr/5lib/tmac/tmac.an
 %%DATADIR%%/usr/5lib/unittab
@@ -242,28 +309,17 @@
 %%DATADIR%%/usr/ucb/w
 %%DATADIR%%/usr/ucb/whatis
 %%DATADIR%%/usr/ucb/whoami
+%%DATADIR%%/usr/ucb/echo
+%%DATADIR%%/usr/ucb/test
 @exec umask 000; touch /var/db/spellhist
 @exec umask 066; touch /var/log/sulog
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/EXPLAIN.oawk
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE/COPYING.LGPL
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE/LUCENT
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE/README
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.cp
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.dd
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.grep
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.libuxre
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.more
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.nawk
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.oawk
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.ps
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.shl
-%%PORTDOCS%%%%DOCSDIR%%/NOTES.tar
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.oawk
-%%PORTDOCS%%%%DOCSDIR%%/TODO.cpio
 %%PORTDOCS%%%%DOCSDIR%%/intro.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/LICENSE
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -286,6 +342,7 @@
 @dirrm %%DATADIR%%/usr/5lib
 @dirrm %%DATADIR%%/usr/5bin/s42
 @dirrm %%DATADIR%%/usr/5bin/posix
+@dirrm %%DATADIR%%/usr/5bin/posix2001
 @dirrm %%DATADIR%%/usr/5bin
 @dirrm %%DATADIR%%/usr
 @dirrm %%DATADIR%%/etc/default