Date: Wed, 28 Mar 2007 23:29:58 +0200 (CEST) From: trasz <trasz@pin.if.uz.zgora.pl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110986: [PATCH] sysutils/heirloom: update to 070227 Message-ID: <20070328212958.7C02039DBA@pin.if.uz.zgora.pl> Resent-Message-ID: <200703282130.l2SLU5xW087396@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110986
>Category: ports
>Synopsis: [PATCH] sysutils/heirloom: update to 070227
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 28 21:30:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: trasz
>Release: FreeBSD 6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006
>Description:
- Update to 070227
Removed file(s):
- files/patch-spell_spellin.c
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- heirloom-070227.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/Makefile /home/trasz/heirloom/Makefile
--- /usr/ports/sysutils/heirloom/Makefile Fri Aug 4 14:34:48 2006
+++ /home/trasz/heirloom/Makefile Wed Mar 28 23:29:09 2007
@@ -6,7 +6,7 @@
#
PORTNAME= heirloom
-PORTVERSION= 060122
+PORTVERSION= 070227
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/distinfo /home/trasz/heirloom/distinfo
--- /usr/ports/sysutils/heirloom/distinfo Tue Jan 24 13:06:17 2006
+++ /home/trasz/heirloom/distinfo Wed Mar 28 23:29:09 2007
@@ -1,3 +1,3 @@
-MD5 (heirloom-060122.tar.bz2) = 898f1936bc20bfd1421ca56448954f63
-SHA256 (heirloom-060122.tar.bz2) = 3edf8cf319abd6d19cd27fe2bb1ef968732caf38018772ab2cc7f83dbf6d3aa7
-SIZE (heirloom-060122.tar.bz2) = 991655
+MD5 (heirloom-070227.tar.bz2) = c3d3885b87400f1131f63579ad5ae015
+SHA256 (heirloom-070227.tar.bz2) = df40cc4032b286f3be1eb1ef9d8e3c0cc3b2821ec48034afda1cb6c16c84c3d8
+SIZE (heirloom-070227.tar.bz2) = 997486
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/files/patch-build::mk.config /home/trasz/heirloom/files/patch-build::mk.config
--- /usr/ports/sysutils/heirloom/files/patch-build::mk.config Sun Jan 22 19:49:14 2006
+++ /home/trasz/heirloom/files/patch-build::mk.config Wed Mar 28 23:29:09 2007
@@ -1,253 +1,120 @@
-*** 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.
- #
-
+--- build/mk.config.orig Tue Feb 27 00:03:01 2007
++++ build/mk.config Wed Mar 28 10:53:59 2007
+@@ -25,33 +25,33 @@
+ # 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 POSIX.1-2001/SUSv3-style binaries.
+-SU3BIN = /usr/5bin/posix2001
++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 = /usr/ucb
++UCBBIN = %%DATADIR%%/usr/ucb
+
+ #
+ # Location for development binaries. The "tsort" utility is
+@@ -59,35 +59,35 @@
+ # "Heirloom Development Tools" package are expected to be
+ # installed in it.
+ #
+-CCSBIN = /usr/ccs/bin
++CCSBIN = %%DATADIR%%/usr/ccs/bin
+
+ #
+ # 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.
+@@ -108,7 +108,7 @@
+ #
+ # On HP-UX, AIX, FreeBSD, NetBSD, and OpenBSD, this setting is not used.
+ #
+-TTYGRP = -g utmp
++TTYGRP = -g tty # utmp
+
+ #
+ # Curses library. Change to -lncurses if necessary. Caution: Some gcc
+@@ -136,22 +136,22 @@
+ #
+ # Uncomment this on FreeBSD, NetBSD, and OpenBSD.
+ #
+-#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
+-USE_BZLIB = 0
++LIBBZ2 = -lbz2 #-Wl,-Bstatic -lbz2 -Wl,-Bdynamic
++USE_BZLIB = 1
+
+ #
+ # Compiler and linker flags. HOSTCC is for cross compiling.
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/files/patch-build_Makefile.mk /home/trasz/heirloom/files/patch-build_Makefile.mk
--- /usr/ports/sysutils/heirloom/files/patch-build_Makefile.mk Thu Jul 27 09:55:12 2006
+++ /home/trasz/heirloom/files/patch-build_Makefile.mk Wed Mar 28 23:29:08 2007
@@ -1,20 +1,11 @@
---- build/Makefile.mk.orgi Thu Mar 10 17:11:29 2005
-+++ build/Makefile.mk Thu Jul 27 00:45:12 2006
+--- build/Makefile.mk.orig Sat Jan 27 17:39:38 2007
++++ build/Makefile.mk Wed Mar 28 10:55:47 2007
@@ -1,7 +1,7 @@
all: maninst crossln genintro
maninst: maninst.sh mk.config
-- <maninst.sh >maninst sed ' \
-+ <maninst.sh >maninst sed " \
- s,@DEFLIB@,$(DEFLIB),g; \
- s,@SPELLHIST@,$(SPELLHIST),g; \
- s,@MAGIC@,$(MAGIC),g; \
-@@ -11,7 +11,7 @@
- s,@S42BIN@,$(S42BIN),g; \
- s,@SUSBIN@,$(SUSBIN),g; \
- s,@SU3BIN@,$(SU3BIN),g; \
-- s,@UCBBIN@,$(UCBBIN),g'
-+ s,@UCBBIN@,$(UCBBIN),g"
+- <maninst.sh >maninst sed ' s,@DEFLIB@,$(DEFLIB),g; s,@SPELLHIST@,$(SPELLHIST),g; s,@MAGIC@,$(MAGIC),g; s,@DFLDIR@,$(DFLDIR),g; s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@S42BIN@,$(S42BIN),g; s,@SUSBIN@,$(SUSBIN),g; s,@SU3BIN@,$(SU3BIN),g; s,@UCBBIN@,$(UCBBIN),g; s,@CCSBIN@,$(CCSBIN),g'
++ <maninst.sh >maninst sed " s,@DEFLIB@,$(DEFLIB),g; s,@SPELLHIST@,$(SPELLHIST),g; s,@MAGIC@,$(MAGIC),g; s,@DFLDIR@,$(DFLDIR),g; s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@S42BIN@,$(S42BIN),g; s,@SUSBIN@,$(SUSBIN),g; s,@SU3BIN@,$(SU3BIN),g; s,@UCBBIN@,$(UCBBIN),g; s,@CCSBIN@,$(CCSBIN),g"
chmod 755 maninst
crossln: crossln.sh
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/files/patch-calendar_Makefile.mk /home/trasz/heirloom/files/patch-calendar_Makefile.mk
--- /usr/ports/sysutils/heirloom/files/patch-calendar_Makefile.mk Thu Jul 27 09:55:12 2006
+++ /home/trasz/heirloom/files/patch-calendar_Makefile.mk Wed Mar 28 23:29:08 2007
@@ -1,15 +1,11 @@
---- ./calendar/Makefile.mk.orig Sat May 1 18:58:02 2004
-+++ ./calendar/Makefile.mk Thu Jul 27 00:52:02 2006
-@@ -1,10 +1,10 @@
+--- calendar/Makefile.mk.orig Wed May 24 16:43:22 2006
++++ calendar/Makefile.mk Wed Mar 28 10:58:09 2007
+@@ -1,7 +1,7 @@
all: calendar calprog
calendar: calendar.sh
-- echo '#!$(SHELL)' | cat - calendar.sh | sed ' \
-+ echo '#!$(SHELL)' | cat - calendar.sh | sed " \
- s,@DEFBIN@,$(DEFBIN),g; \
- s,@SV3BIN@,$(SV3BIN),g; \
-- s,@DEFLIB@,$(DEFLIB),g' >calendar
-+ s,@DEFLIB@,$(DEFLIB),g" >calendar
+- echo '#!$(SHELL)' | cat - calendar.sh | sed ' s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g' >calendar
++ echo '#!$(SHELL)' | cat - calendar.sh | sed " s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g" >calendar
chmod 755 calendar
calprog: calprog.o
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/files/patch-diff3_Makefile.mk /home/trasz/heirloom/files/patch-diff3_Makefile.mk
--- /usr/ports/sysutils/heirloom/files/patch-diff3_Makefile.mk Thu Jul 27 09:55:12 2006
+++ /home/trasz/heirloom/files/patch-diff3_Makefile.mk Wed Mar 28 23:29:08 2007
@@ -1,15 +1,11 @@
---- ./diff3/Makefile.mk.orig Thu May 29 21:35:23 2003
-+++ ./diff3/Makefile.mk Thu Jul 27 00:56:30 2006
-@@ -1,10 +1,10 @@
+--- diff3/Makefile.mk.orig Wed May 24 16:44:17 2006
++++ diff3/Makefile.mk Wed Mar 28 10:59:08 2007
+@@ -1,7 +1,7 @@
all: diff3 diff3prog
diff3: diff3.sh
-- echo '#!$(SHELL)' | cat - diff3.sh | sed ' \
-+ echo '#!$(SHELL)' | cat - diff3.sh | sed " \
- s,@DEFBIN@,$(DEFBIN),g; \
- s,@SV3BIN@,$(SV3BIN),g; \
-- s,@DEFLIB@,$(DEFLIB),g' >diff3
-+ s,@DEFLIB@,$(DEFLIB),g" >diff3
+- echo '#!$(SHELL)' | cat - diff3.sh | sed ' s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g' >diff3
++ echo '#!$(SHELL)' | cat - diff3.sh | sed " s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g" >diff3
chmod 755 diff3
diff3prog: diff3prog.o
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/files/patch-dircmp_Makefile.mk /home/trasz/heirloom/files/patch-dircmp_Makefile.mk
--- /usr/ports/sysutils/heirloom/files/patch-dircmp_Makefile.mk Thu Jul 27 09:55:12 2006
+++ /home/trasz/heirloom/files/patch-dircmp_Makefile.mk Wed Mar 28 23:29:08 2007
@@ -1,15 +1,11 @@
---- ./dircmp/Makefile.mk.orig Sat Jun 25 18:48:53 2005
-+++ ./dircmp/Makefile.mk Thu Jul 27 00:59:45 2006
-@@ -1,10 +1,10 @@
+--- dircmp/Makefile.mk.orig Wed May 24 16:44:34 2006
++++ dircmp/Makefile.mk Wed Mar 28 11:00:11 2007
+@@ -1,7 +1,7 @@
all: dircmp
dircmp: dircmp.sh
-- echo '#!$(SHELL)' | cat - dircmp.sh | sed ' \
-+ echo '#!$(SHELL)' | cat - dircmp.sh | sed " \
- s,@DEFBIN@,$(DEFBIN),g; \
- s,@SV3BIN@,$(SV3BIN),g; \
-- s,@DEFLIB@,$(DEFLIB),g' >dircmp
-+ s,@DEFLIB@,$(DEFLIB),g" >dircmp
+- echo '#!$(SHELL)' | cat - dircmp.sh | sed ' s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g' >dircmp
++ echo '#!$(SHELL)' | cat - dircmp.sh | sed " s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g" >dircmp
chmod 755 dircmp
install: all
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/files/patch-makefile /home/trasz/heirloom/files/patch-makefile
--- /usr/ports/sysutils/heirloom/files/patch-makefile Thu Jul 27 09:55:12 2006
+++ /home/trasz/heirloom/files/patch-makefile Wed Mar 28 23:29:08 2007
@@ -1,19 +1,11 @@
---- ./makefile.orig Sun Jan 22 22:48:04 2006
-+++ ./makefile Thu Jul 27 01:01:57 2006
-@@ -87,14 +87,14 @@
+--- makefile.orig Tue Feb 27 00:03:01 2007
++++ makefile Wed Mar 28 11:02:49 2007
+@@ -70,7 +70,7 @@
cpio -pdm $(PKGROOT)/usr/share/doc/heirloom
rm -f $(PKGPROTO)
echo 'i pkginfo' >$(PKGPROTO)
-- (cd $(PKGROOT) && find . -print | pkgproto) | >>$(PKGPROTO) sed '\
-+ (cd $(PKGROOT) && find . -print | pkgproto) | >>$(PKGPROTO) sed " \
- s:^\([df] [^ ]* [^ ]* [^ ]*\) .*:\1 root root:; \
- s:^\(f [^ ]* [^ ]*/ps \).*:\14755 root root:; \
- s:^\(f [^ ]* [^ ]*/shl \).*:\12755 root adm:; \
- s:^\(f [^ ]* [^ ]*/su \).*:\14755 root root:; \
- s:^f\( [^ ]* etc/\):v \1:; \
- s:^f\( [^ ]* var/\):v \1:; \
-- s:^\(s [^ ]* [^ ]*=\)\([^/]\):\1./\2:'
-+ s:^\(s [^ ]* [^ ]*=\)\([^/]\):\1./\2:"
- rm -rf $(PKGTEMP)/heirloom
- pkgmk -a `uname -m` -d $(PKGTEMP) -r $(PKGROOT) -f $(PKGPROTO) heirloom
- pkgtrans -o -s $(PKGTEMP) `pwd`/heirloom.pkg heirloom
+- (cd $(PKGROOT) && find . -print | pkgproto) | >>$(PKGPROTO) sed 's:^\([df] [^ ]* [^ ]* [^ ]*\) .*:\1 root root:; s:^\(f [^ ]* [^ ]*/ps \).*:\14755 root root:; s:^\(f [^ ]* [^ ]*/shl \).*:\12755 root adm:; s:^\(f [^ ]* [^ ]*/su \).*:\14755 root root:; s:^f\( [^ ]* etc/\):v \1:; s:^f\( [^ ]* var/\):v \1:; s:^\(s [^ ]* [^ ]*=\)\([^/]\):\1./\2:'
++ (cd $(PKGROOT) && find . -print | pkgproto) | >>$(PKGPROTO) sed "s:^\([df] [^ ]* [^ ]* [^ ]*\) .*:\1 root root:; s:^\(f [^ ]* [^ ]*/ps \).*:\14755 root root:; s:^\(f [^ ]* [^ ]*/shl \).*:\12755 root adm:; s:^\(f [^ ]* [^ ]*/su \).*:\14755 root root:; s:^f\( [^ ]* etc/\):v \1:; s:^f\( [^ ]* var/\):v \1:; s:^\(s [^ ]* [^ ]*=\)\([^/]\):\1./\2:"
+ rm -rf $(PKGTEMP)/$@
+ pkgmk -a `uname -m` -d $(PKGTEMP) -r $(PKGROOT) -f $(PKGPROTO) $@
+ pkgtrans -o -s $(PKGTEMP) `pwd`/$@ $@
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/files/patch-mvdir_Makefile.mk /home/trasz/heirloom/files/patch-mvdir_Makefile.mk
--- /usr/ports/sysutils/heirloom/files/patch-mvdir_Makefile.mk Thu Jul 27 09:55:12 2006
+++ /home/trasz/heirloom/files/patch-mvdir_Makefile.mk Wed Mar 28 23:29:09 2007
@@ -1,15 +1,11 @@
---- ./mvdir/Makefile.mk.orig Sat Jun 25 19:03:27 2005
-+++ ./mvdir/Makefile.mk Thu Jul 27 01:06:15 2006
-@@ -1,10 +1,10 @@
+--- mvdir/Makefile.mk.orig Wed May 24 16:45:48 2006
++++ mvdir/Makefile.mk Wed Mar 28 11:03:32 2007
+@@ -1,7 +1,7 @@
all: mvdir
mvdir: mvdir.sh
-- echo '#!$(SHELL)' | cat - mvdir.sh | sed ' \
-+ echo '#!$(SHELL)' | cat - mvdir.sh | sed " \
- s,@DEFBIN@,$(DEFBIN),g; \
- s,@SV3BIN@,$(SV3BIN),g; \
-- s,@DEFLIB@,$(DEFLIB),g' >mvdir
-+ s,@DEFLIB@,$(DEFLIB),g" >mvdir
+- echo '#!$(SHELL)' | cat - mvdir.sh | sed ' s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g' >mvdir
++ echo '#!$(SHELL)' | cat - mvdir.sh | sed " s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g" >mvdir
chmod 755 mvdir
install: all
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/files/patch-spell_Makefile.mk /home/trasz/heirloom/files/patch-spell_Makefile.mk
--- /usr/ports/sysutils/heirloom/files/patch-spell_Makefile.mk Thu Jul 27 09:55:12 2006
+++ /home/trasz/heirloom/files/patch-spell_Makefile.mk Wed Mar 28 23:29:09 2007
@@ -1,26 +1,16 @@
---- ./spell/Makefile.mk.orig Sun Jul 17 13:24:27 2005
-+++ ./spell/Makefile.mk Thu Jul 27 01:00:46 2006
-@@ -36,19 +36,19 @@
+--- spell/Makefile.mk.orig Wed May 24 16:46:54 2006
++++ spell/Makefile.mk Wed Mar 28 11:04:59 2007
+@@ -36,11 +36,11 @@
hlista hlistb hstop hashmake hashcheck
spell: spell.sh
-- echo '#!$(SHELL)' | cat - spell.sh | sed ' \
-+ echo '#!$(SHELL)' | cat - spell.sh | sed " \
- s,@DEFBIN@,$(DEFBIN),g; \
- s,@SV3BIN@,$(SV3BIN),g; \
- s,@DEFLIB@,$(DEFLIB),g; \
-- s,@SPELLHIST@,$(SPELLHIST),g' >spell
-+ s,@SPELLHIST@,$(SPELLHIST),g" >spell
+- echo '#!$(SHELL)' | cat - spell.sh | sed ' s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g; s,@SPELLHIST@,$(SPELLHIST),g' >spell
++ echo '#!$(SHELL)' | cat - spell.sh | sed " s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g; s,@SPELLHIST@,$(SPELLHIST),g" >spell
chmod 755 spell
compress: compress.sh
-- echo '#!$(SHELL)' | cat - compress.sh | sed ' \
-+ echo '#!$(SHELL)' | cat - compress.sh | sed " \
- s,@DEFBIN@,$(DEFBIN),g; \
- s,@SV3BIN@,$(SV3BIN),g; \
- s,@DEFLIB@,$(DEFLIB),g; \
-- s,@SPELLHIST@,$(SPELLHIST),g' >compress
-+ s,@SPELLHIST@,$(SPELLHIST),g" >compress
+- echo '#!$(SHELL)' | cat - compress.sh | sed ' s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g; s,@SPELLHIST@,$(SPELLHIST),g' >compress
++ echo '#!$(SHELL)' | cat - compress.sh | sed " s,@DEFBIN@,$(DEFBIN),g; s,@SV3BIN@,$(SV3BIN),g; s,@DEFLIB@,$(DEFLIB),g; s,@SPELLHIST@,$(SPELLHIST),g" >compress
chmod 755 compress
spellprog: spellprog.o hash.o hashlook.o huff.o
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/files/patch-spell_spellin.c /home/trasz/heirloom/files/patch-spell_spellin.c
--- /usr/ports/sysutils/heirloom/files/patch-spell_spellin.c Tue Feb 7 11:44:12 2006
+++ /home/trasz/heirloom/files/patch-spell_spellin.c Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
---- spell/spellin.c.orig Fri Feb 3 19:13:19 2006
-+++ spell/spellin.c Fri Feb 3 19:19:20 2006
-@@ -77,6 +77,7 @@
- main(int argc, char **argv)
- {
- int32_t h, k, d;
-+ unsigned hu;
- int32_t i;
- int32_t count;
- int32_t w1;
-@@ -103,7 +104,8 @@
- z = huff((1L<<HASHWIDTH)/atof(argv[1]));
- fprintf(stderr, "%s: expected code widths = %f\n",
- argv[0], z);
-- for (count = 0; scanf("%lo", (long *)&h) == 1; ++count) {
-+ for (count = 0; scanf("%o", &hu) == 1; ++count) {
-+ h = (int32_t)hu;
- if ((t = h >> (HASHWIDTH - INDEXWIDTH)) != u) {
- if (bp != B)
- wp++;
diff -ruN --exclude=CVS /usr/ports/sysutils/heirloom/pkg-plist /home/trasz/heirloom/pkg-plist
--- /usr/ports/sysutils/heirloom/pkg-plist Sun Jan 22 19:49:14 2006
+++ /home/trasz/heirloom/pkg-plist Wed Mar 28 23:29:10 2007
@@ -1,108 +1,69 @@
-%%DATADIR%%/etc/default/man
-%%DATADIR%%/etc/default/ps
-%%DATADIR%%/etc/default/su
-%%DATADIR%%/etc/default/tar
-%%DATADIR%%/usr/5bin/STTY
-%%DATADIR%%/usr/5bin/apropos
-%%DATADIR%%/usr/5bin/awk
-%%DATADIR%%/usr/5bin/banner
-%%DATADIR%%/usr/5bin/basename
-%%DATADIR%%/usr/5bin/bc
-%%DATADIR%%/usr/5bin/cal
-%%DATADIR%%/usr/5bin/calendar
-%%DATADIR%%/usr/5bin/cat
-%%DATADIR%%/usr/5bin/catman
-%%DATADIR%%/usr/5bin/chgrp
-%%DATADIR%%/usr/5bin/chmod
-%%DATADIR%%/usr/5bin/chown
-%%DATADIR%%/usr/5bin/cksum
-%%DATADIR%%/usr/5bin/cmp
-%%DATADIR%%/usr/5bin/col
-%%DATADIR%%/usr/5bin/comm
-%%DATADIR%%/usr/5bin/copy
-%%DATADIR%%/usr/5bin/cp
-%%DATADIR%%/usr/5bin/cpio
-%%DATADIR%%/usr/5bin/csplit
-%%DATADIR%%/usr/5bin/cut
-%%DATADIR%%/usr/5bin/date
-%%DATADIR%%/usr/5bin/dc
-%%DATADIR%%/usr/5bin/dd
-%%DATADIR%%/usr/5bin/deroff
-%%DATADIR%%/usr/5bin/df
-%%DATADIR%%/usr/5bin/dfspace
-%%DATADIR%%/usr/5bin/diff
-%%DATADIR%%/usr/5bin/diff3
-%%DATADIR%%/usr/5bin/dirname
-%%DATADIR%%/usr/5bin/du
-%%DATADIR%%/usr/5bin/ed
-%%DATADIR%%/usr/5bin/egrep
-%%DATADIR%%/usr/5bin/env
-%%DATADIR%%/usr/5bin/expand
-%%DATADIR%%/usr/5bin/expr
-%%DATADIR%%/usr/5bin/factor
-%%DATADIR%%/usr/5bin/fgrep
-%%DATADIR%%/usr/5bin/file
-%%DATADIR%%/usr/5bin/find
-%%DATADIR%%/usr/5bin/fmt
-%%DATADIR%%/usr/5bin/fold
-%%DATADIR%%/usr/5bin/grep
-%%DATADIR%%/usr/5bin/groups
-%%DATADIR%%/usr/5bin/hd
-%%DATADIR%%/usr/5bin/head
-%%DATADIR%%/usr/5bin/hostname
-%%DATADIR%%/usr/5bin/id
-%%DATADIR%%/usr/5bin/install
-%%DATADIR%%/usr/5bin/join
-%%DATADIR%%/usr/5bin/lc
-%%DATADIR%%/usr/5bin/line
-%%DATADIR%%/usr/5bin/listusers
-%%DATADIR%%/usr/5bin/ln
-%%DATADIR%%/usr/5bin/logins
-%%DATADIR%%/usr/5bin/logname
-%%DATADIR%%/usr/5bin/ls
-%%DATADIR%%/usr/5bin/mail
-%%DATADIR%%/usr/5bin/man
-%%DATADIR%%/usr/5bin/mkdir
-%%DATADIR%%/usr/5bin/mkfifo
-%%DATADIR%%/usr/5bin/mknod
-%%DATADIR%%/usr/5bin/more
-%%DATADIR%%/usr/5bin/mt
-%%DATADIR%%/usr/5bin/mv
-%%DATADIR%%/usr/5bin/nawk
-%%DATADIR%%/usr/5bin/newform
-%%DATADIR%%/usr/5bin/news
-%%DATADIR%%/usr/5bin/nice
-%%DATADIR%%/usr/5bin/nl
-%%DATADIR%%/usr/5bin/nohup
-%%DATADIR%%/usr/5bin/oawk
-%%DATADIR%%/usr/5bin/od
-%%DATADIR%%/usr/5bin/page
-%%DATADIR%%/usr/5bin/paste
-%%DATADIR%%/usr/5bin/pax
-%%DATADIR%%/usr/5bin/pg
-%%DATADIR%%/usr/5bin/pgrep
-%%DATADIR%%/usr/5bin/pkill
-%%DATADIR%%/usr/5bin/posix/awk
+%%DATADIR%%/usr/5bin/s42/cp
+%%DATADIR%%/usr/5bin/s42/ln
+%%DATADIR%%/usr/5bin/s42/mv
+%%DATADIR%%/usr/5bin/s42/ed
+%%DATADIR%%/usr/5bin/s42/expr
+%%DATADIR%%/usr/5bin/s42/nl
+%%DATADIR%%/usr/5bin/s42/priocntl
+%%DATADIR%%/usr/5bin/s42/ps
+%%DATADIR%%/usr/5bin/s42/sed
+%%DATADIR%%/usr/5bin/s42/wc
+%%DATADIR%%/usr/5bin/s42/csplit
+%%DATADIR%%/usr/5bin/s42/date
+%%DATADIR%%/usr/5bin/s42/egrep
+%%DATADIR%%/usr/5bin/s42/fgrep
+%%DATADIR%%/usr/5bin/s42/find
+%%DATADIR%%/usr/5bin/s42/getconf
+%%DATADIR%%/usr/5bin/s42/grep
+%%DATADIR%%/usr/5bin/s42/id
+%%DATADIR%%/usr/5bin/s42/mkdir
+%%DATADIR%%/usr/5bin/s42/nawk
+%%DATADIR%%/usr/5bin/s42/pg
+%%DATADIR%%/usr/5bin/s42/basename
+%%DATADIR%%/usr/5bin/s42/chmod
+%%DATADIR%%/usr/5bin/s42/du
+%%DATADIR%%/usr/5bin/s42/echo
+%%DATADIR%%/usr/5bin/s42/file
+%%DATADIR%%/usr/5bin/s42/lc
+%%DATADIR%%/usr/5bin/s42/ls
+%%DATADIR%%/usr/5bin/s42/more
+%%DATADIR%%/usr/5bin/s42/nohup
+%%DATADIR%%/usr/5bin/s42/od
+%%DATADIR%%/usr/5bin/s42/page
+%%DATADIR%%/usr/5bin/s42/pax
+%%DATADIR%%/usr/5bin/s42/pr
+%%DATADIR%%/usr/5bin/s42/rm
+%%DATADIR%%/usr/5bin/s42/rmdir
+%%DATADIR%%/usr/5bin/s42/sort
+%%DATADIR%%/usr/5bin/s42/test
+%%DATADIR%%/usr/5bin/s42/touch
+%%DATADIR%%/usr/5bin/s42/tr
+%%DATADIR%%/usr/5bin/s42/who
+%%DATADIR%%/usr/5bin/s42/awk
%%DATADIR%%/usr/5bin/posix/basename
%%DATADIR%%/usr/5bin/posix/chmod
%%DATADIR%%/usr/5bin/posix/cp
+%%DATADIR%%/usr/5bin/posix/ln
+%%DATADIR%%/usr/5bin/posix/mv
%%DATADIR%%/usr/5bin/posix/csplit
%%DATADIR%%/usr/5bin/posix/date
%%DATADIR%%/usr/5bin/posix/du
+%%DATADIR%%/usr/5bin/posix/echo
%%DATADIR%%/usr/5bin/posix/ed
-%%DATADIR%%/usr/5bin/posix/egrep
%%DATADIR%%/usr/5bin/posix/expr
-%%DATADIR%%/usr/5bin/posix/fgrep
+%%DATADIR%%/usr/5bin/posix/file
%%DATADIR%%/usr/5bin/posix/find
+%%DATADIR%%/usr/5bin/posix/getconf
%%DATADIR%%/usr/5bin/posix/grep
+%%DATADIR%%/usr/5bin/posix/egrep
+%%DATADIR%%/usr/5bin/posix/fgrep
%%DATADIR%%/usr/5bin/posix/id
-%%DATADIR%%/usr/5bin/posix/ln
%%DATADIR%%/usr/5bin/posix/ls
%%DATADIR%%/usr/5bin/posix/mkdir
-%%DATADIR%%/usr/5bin/posix/mv
%%DATADIR%%/usr/5bin/posix/nawk
%%DATADIR%%/usr/5bin/posix/nl
%%DATADIR%%/usr/5bin/posix/nohup
+%%DATADIR%%/usr/5bin/posix/od
%%DATADIR%%/usr/5bin/posix/pg
%%DATADIR%%/usr/5bin/posix/pr
%%DATADIR%%/usr/5bin/posix/ps
@@ -110,16 +71,13 @@
%%DATADIR%%/usr/5bin/posix/rmdir
%%DATADIR%%/usr/5bin/posix/sed
%%DATADIR%%/usr/5bin/posix/sort
+%%DATADIR%%/usr/5bin/posix/test
%%DATADIR%%/usr/5bin/posix/touch
%%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/posix/awk
%%DATADIR%%/usr/5bin/posix2001/pax
%%DATADIR%%/usr/5bin/posix2001/csplit
%%DATADIR%%/usr/5bin/posix2001/ed
@@ -158,159 +116,203 @@
%%DATADIR%%/usr/5bin/posix2001/who
%%DATADIR%%/usr/5bin/posix2001/od
%%DATADIR%%/usr/5bin/posix2001/awk
+%%DATADIR%%/usr/5bin/banner
+%%DATADIR%%/usr/5bin/basename
+%%DATADIR%%/usr/5bin/bc
+%%DATADIR%%/usr/5bin/bdiff
+%%DATADIR%%/usr/5bin/bfs
+%%DATADIR%%/usr/5bin/cal
+%%DATADIR%%/usr/5bin/calendar
+%%DATADIR%%/usr/5bin/cat
+%%DATADIR%%/usr/5bin/chmod
+%%DATADIR%%/usr/5bin/chown
+%%DATADIR%%/usr/5bin/chgrp
+%%DATADIR%%/usr/5bin/cksum
+%%DATADIR%%/usr/5bin/cmp
+%%DATADIR%%/usr/5bin/col
+%%DATADIR%%/usr/5bin/comm
+%%DATADIR%%/usr/5bin/copy
+%%DATADIR%%/usr/5bin/cp
+%%DATADIR%%/usr/5bin/ln
+%%DATADIR%%/usr/5bin/mv
+%%DATADIR%%/usr/5bin/cpio
+%%DATADIR%%/usr/5bin/pax
+%%DATADIR%%/usr/5bin/csplit
+%%DATADIR%%/usr/5bin/cut
+%%DATADIR%%/usr/5bin/date
+%%DATADIR%%/usr/5bin/dc
+%%DATADIR%%/usr/5bin/dd
+%%DATADIR%%/usr/5bin/deroff
+%%DATADIR%%/usr/5bin/diff
+%%DATADIR%%/usr/5bin/diff3
+%%DATADIR%%/usr/5bin/dircmp
+%%DATADIR%%/usr/5bin/dirname
+%%DATADIR%%/usr/5bin/df
+%%DATADIR%%/usr/5bin/dfspace
+%%DATADIR%%/usr/5bin/du
+%%DATADIR%%/usr/5bin/echo
+%%DATADIR%%/usr/5bin/ed
+%%DATADIR%%/usr/5bin/env
+%%DATADIR%%/usr/5bin/expand
+%%DATADIR%%/usr/5bin/unexpand
+%%DATADIR%%/usr/5bin/expr
+%%DATADIR%%/usr/5bin/factor
+%%DATADIR%%/usr/5bin/file
+%%DATADIR%%/usr/5bin/find
+%%DATADIR%%/usr/5bin/fmt
+%%DATADIR%%/usr/5bin/fmtmsg
+%%DATADIR%%/usr/5bin/fold
+%%DATADIR%%/usr/5bin/getopt
+%%DATADIR%%/usr/5bin/egrep
+%%DATADIR%%/usr/5bin/fgrep
+%%DATADIR%%/usr/5bin/grep
+%%DATADIR%%/usr/5bin/groups
+%%DATADIR%%/usr/5bin/hd
+%%DATADIR%%/usr/5bin/head
+%%DATADIR%%/usr/5bin/hostname
+%%DATADIR%%/usr/5bin/id
+%%DATADIR%%/usr/5bin/join
+%%DATADIR%%/usr/5bin/kill
+%%DATADIR%%/usr/5bin/line
+%%DATADIR%%/usr/5bin/listusers
+%%DATADIR%%/usr/5bin/logins
+%%DATADIR%%/usr/5bin/logname
+%%DATADIR%%/usr/5bin/ls
+%%DATADIR%%/usr/5bin/lc
+%%DATADIR%%/usr/5bin/mail
+%%DATADIR%%/usr/5bin/man
+%%DATADIR%%/usr/5bin/apropos
+%%DATADIR%%/usr/5bin/whatis
+%%DATADIR%%/usr/5bin/catman
+%%DATADIR%%/usr/5bin/mesg
+%%DATADIR%%/usr/5bin/mkdir
+%%DATADIR%%/usr/5bin/mkfifo
+%%DATADIR%%/usr/5bin/mknod
+%%DATADIR%%/usr/5bin/more
+%%DATADIR%%/usr/5bin/page
+%%DATADIR%%/usr/5bin/mvdir
+%%DATADIR%%/usr/5bin/nawk
+%%DATADIR%%/usr/5bin/news
+%%DATADIR%%/usr/5bin/nice
+%%DATADIR%%/usr/5bin/nl
+%%DATADIR%%/usr/5bin/nohup
+%%DATADIR%%/usr/5bin/oawk
+%%DATADIR%%/usr/5bin/od
+%%DATADIR%%/usr/5bin/paste
+%%DATADIR%%/usr/5bin/pathchk
+%%DATADIR%%/usr/5bin/pg
+%%DATADIR%%/usr/5bin/pgrep
+%%DATADIR%%/usr/5bin/pkill
%%DATADIR%%/usr/5bin/pr
%%DATADIR%%/usr/5bin/printenv
+%%DATADIR%%/usr/5bin/printf
%%DATADIR%%/usr/5bin/priocntl
%%DATADIR%%/usr/5bin/ps
+%%DATADIR%%/usr/5bin/pwd
%%DATADIR%%/usr/5bin/random
%%DATADIR%%/usr/5bin/renice
%%DATADIR%%/usr/5bin/rm
%%DATADIR%%/usr/5bin/rmdir
-%%DATADIR%%/usr/5bin/s42/awk
-%%DATADIR%%/usr/5bin/s42/basename
-%%DATADIR%%/usr/5bin/s42/chmod
-%%DATADIR%%/usr/5bin/s42/cp
-%%DATADIR%%/usr/5bin/s42/csplit
-%%DATADIR%%/usr/5bin/s42/date
-%%DATADIR%%/usr/5bin/s42/du
-%%DATADIR%%/usr/5bin/s42/ed
-%%DATADIR%%/usr/5bin/s42/egrep
-%%DATADIR%%/usr/5bin/s42/expr
-%%DATADIR%%/usr/5bin/s42/fgrep
-%%DATADIR%%/usr/5bin/s42/find
-%%DATADIR%%/usr/5bin/s42/grep
-%%DATADIR%%/usr/5bin/s42/id
-%%DATADIR%%/usr/5bin/s42/lc
-%%DATADIR%%/usr/5bin/s42/ln
-%%DATADIR%%/usr/5bin/s42/ls
-%%DATADIR%%/usr/5bin/s42/mkdir
-%%DATADIR%%/usr/5bin/s42/more
-%%DATADIR%%/usr/5bin/s42/mv
-%%DATADIR%%/usr/5bin/s42/nawk
-%%DATADIR%%/usr/5bin/s42/nl
-%%DATADIR%%/usr/5bin/s42/nohup
-%%DATADIR%%/usr/5bin/s42/page
-%%DATADIR%%/usr/5bin/s42/pg
-%%DATADIR%%/usr/5bin/s42/pr
-%%DATADIR%%/usr/5bin/s42/priocntl
-%%DATADIR%%/usr/5bin/s42/ps
-%%DATADIR%%/usr/5bin/s42/rm
-%%DATADIR%%/usr/5bin/s42/rmdir
-%%DATADIR%%/usr/5bin/s42/sed
-%%DATADIR%%/usr/5bin/s42/sort
-%%DATADIR%%/usr/5bin/s42/touch
-%%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
-%%DATADIR%%/usr/5bin/settime
%%DATADIR%%/usr/5bin/sleep
%%DATADIR%%/usr/5bin/sort
%%DATADIR%%/usr/5bin/spell
%%DATADIR%%/usr/5bin/split
%%DATADIR%%/usr/5bin/stty
+%%DATADIR%%/usr/5bin/STTY
%%DATADIR%%/usr/5bin/su
%%DATADIR%%/usr/5bin/sum
%%DATADIR%%/usr/5bin/sync
%%DATADIR%%/usr/5bin/tabs
+%%DATADIR%%/usr/5bin/newform
%%DATADIR%%/usr/5bin/tail
-%%DATADIR%%/usr/5bin/tape
%%DATADIR%%/usr/5bin/tapecntl
+%%DATADIR%%/usr/5bin/mt
+%%DATADIR%%/usr/5bin/tape
%%DATADIR%%/usr/5bin/tar
%%DATADIR%%/usr/5bin/tcopy
%%DATADIR%%/usr/5bin/tee
+%%DATADIR%%/usr/5bin/test
%%DATADIR%%/usr/5bin/time
%%DATADIR%%/usr/5bin/touch
+%%DATADIR%%/usr/5bin/settime
%%DATADIR%%/usr/5bin/tr
-%%DATADIR%%/usr/5bin/tsort
+%%DATADIR%%/usr/5bin/true
+%%DATADIR%%/usr/5bin/false
%%DATADIR%%/usr/5bin/tty
%%DATADIR%%/usr/5bin/ul
%%DATADIR%%/usr/5bin/uname
-%%DATADIR%%/usr/5bin/unexpand
%%DATADIR%%/usr/5bin/uniq
%%DATADIR%%/usr/5bin/units
-%%DATADIR%%/usr/5bin/uptime
%%DATADIR%%/usr/5bin/users
-%%DATADIR%%/usr/5bin/w
%%DATADIR%%/usr/5bin/wc
%%DATADIR%%/usr/5bin/what
-%%DATADIR%%/usr/5bin/whatis
%%DATADIR%%/usr/5bin/who
%%DATADIR%%/usr/5bin/whoami
%%DATADIR%%/usr/5bin/whodo
+%%DATADIR%%/usr/5bin/w
+%%DATADIR%%/usr/5bin/uptime
%%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/install
%%DATADIR%%/usr/5bin/getconf
+%%DATADIR%%/usr/5bin/awk
+%%DATADIR%%/usr/5lib/lib.b
%%DATADIR%%/usr/5lib/calprog
-%%DATADIR%%/usr/5lib/diff3prog
%%DATADIR%%/usr/5lib/diffh
-%%DATADIR%%/usr/5lib/lib.b
+%%DATADIR%%/usr/5lib/diff3prog
%%DATADIR%%/usr/5lib/magic
-%%DATADIR%%/usr/5lib/spell/hlista
-%%DATADIR%%/usr/5lib/spell/hlistb
-%%DATADIR%%/usr/5lib/spell/hstop
-%%DATADIR%%/usr/5lib/spell/spellin
+%%DATADIR%%/usr/5lib/tmac/tmac.an
+%%DATADIR%%/usr/5lib/tmac/an-old.tmac
%%DATADIR%%/usr/5lib/spell/spellprog
+%%DATADIR%%/usr/5lib/spell/spellin
%%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/spell/hlista
+%%DATADIR%%/usr/5lib/spell/hlistb
+%%DATADIR%%/usr/5lib/spell/hstop
%%DATADIR%%/usr/5lib/unittab
-%%DATADIR%%/usr/ucb/apropos
+%%DATADIR%%/usr/ucb/install
%%DATADIR%%/usr/ucb/basename
-%%DATADIR%%/usr/ucb/catman
%%DATADIR%%/usr/ucb/chown
%%DATADIR%%/usr/ucb/deroff
%%DATADIR%%/usr/ucb/df
%%DATADIR%%/usr/ucb/du
-%%DATADIR%%/usr/ucb/expand
+%%DATADIR%%/usr/ucb/echo
%%DATADIR%%/usr/ucb/groups
-%%DATADIR%%/usr/ucb/hostname
-%%DATADIR%%/usr/ucb/install
%%DATADIR%%/usr/ucb/ln
%%DATADIR%%/usr/ucb/ls
-%%DATADIR%%/usr/ucb/man
-%%DATADIR%%/usr/ucb/more
-%%DATADIR%%/usr/ucb/printenv
%%DATADIR%%/usr/ucb/ps
-%%DATADIR%%/usr/ucb/renice
%%DATADIR%%/usr/ucb/stty
%%DATADIR%%/usr/ucb/sum
-%%DATADIR%%/usr/ucb/tcopy
+%%DATADIR%%/usr/ucb/test
%%DATADIR%%/usr/ucb/tr
+%%DATADIR%%/usr/ucb/apropos
+%%DATADIR%%/usr/ucb/expand
+%%DATADIR%%/usr/ucb/hostname
+%%DATADIR%%/usr/ucb/man
+%%DATADIR%%/usr/ucb/printenv
+%%DATADIR%%/usr/ucb/renice
+%%DATADIR%%/usr/ucb/tcopy
%%DATADIR%%/usr/ucb/ul
%%DATADIR%%/usr/ucb/unexpand
%%DATADIR%%/usr/ucb/uptime
%%DATADIR%%/usr/ucb/users
%%DATADIR%%/usr/ucb/w
-%%DATADIR%%/usr/ucb/whatis
%%DATADIR%%/usr/ucb/whoami
-%%DATADIR%%/usr/ucb/echo
-%%DATADIR%%/usr/ucb/test
+%%DATADIR%%/usr/ucb/whatis
+%%DATADIR%%/usr/ucb/more
+%%DATADIR%%/usr/ucb/catman
+%%DATADIR%%/usr/ucb/sccs
+%%DATADIR%%/usr/ucb/prt
+%%DATADIR%%/usr/ccs/bin/tsort
+%%DATADIR%%/etc/default/man
+%%DATADIR%%/etc/default/ps
+%%DATADIR%%/etc/default/su
+%%DATADIR%%/etc/default/tar
@exec umask 000; touch /var/db/spellhist
@exec umask 066; touch /var/log/sulog
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
@@ -344,6 +346,8 @@
@dirrm %%DATADIR%%/usr/5bin/posix
@dirrm %%DATADIR%%/usr/5bin/posix2001
@dirrm %%DATADIR%%/usr/5bin
+@dirrm %%DATADIR%%/usr/ccs/bin
+@dirrm %%DATADIR%%/usr/ccs
@dirrm %%DATADIR%%/usr
@dirrm %%DATADIR%%/etc/default
@dirrm %%DATADIR%%/etc
--- heirloom-070227.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070328212958.7C02039DBA>