8 files changed, 129 insertions, 1 deletions

diff --git a/sysutils/heirloom/Makefile b/sysutils/heirloom/Makefile
index dadf1651aa68..624416f7a60d 100644
--- a/sysutils/heirloom/Makefile
+++ b/sysutils/heirloom/Makefile
@@ -69,6 +69,8 @@ _MLINKS_PREPEND+=${_M${sect}LINKS:S%^%${_MANPREFIX}/man${sect:L}/%:S%$%${MANEXT}
 . endif
 .endfor
 
+SH2FIX=		maninst.sh genintro.sh crossln.sh
+
 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 \
@@ -81,9 +83,10 @@ DOC_FILES=	CHANGES LICENSE/COPYING LICENSE/LICENSE LICENSE/LUCENT \
 IGNORE=		does not build on FreeBSD 4.x which is missing wide-characters
 .endif
 
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/build/mk.config ${WRKSRC}/su/su.dfl.in
+	@${REINPLACE_CMD} -e 's|/sbin/sh| ${SH}|' ${SH2FIX:S|^|${WRKSRC}/build/|}
 
 post-install: compress-man install-doc
 
diff --git a/sysutils/heirloom/files/patch-build_Makefile.mk b/sysutils/heirloom/files/patch-build_Makefile.mk
new file mode 100644
index 000000000000..2b6c58909622
--- /dev/null
+++ b/sysutils/heirloom/files/patch-build_Makefile.mk
@@ -0,0 +1,20 @@
+--- build/Makefile.mk.orgi	Thu Mar 10 17:11:29 2005
++++ build/Makefile.mk	Thu Jul 27 00:45:12 2006
+@@ -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"
+ 	chmod 755 maninst
+ 
+ crossln: crossln.sh
diff --git a/sysutils/heirloom/files/patch-calendar_Makefile.mk b/sysutils/heirloom/files/patch-calendar_Makefile.mk
new file mode 100644
index 000000000000..962736ee1ca4
--- /dev/null
+++ b/sysutils/heirloom/files/patch-calendar_Makefile.mk
@@ -0,0 +1,15 @@
+--- ./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 @@
+ 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
+ 	chmod 755 calendar
+ 
+ calprog: calprog.o
diff --git a/sysutils/heirloom/files/patch-diff3_Makefile.mk b/sysutils/heirloom/files/patch-diff3_Makefile.mk
new file mode 100644
index 000000000000..5e093dcf185b
--- /dev/null
+++ b/sysutils/heirloom/files/patch-diff3_Makefile.mk
@@ -0,0 +1,15 @@
+--- ./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 @@
+ 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
+ 	chmod 755 diff3
+ 
+ diff3prog: diff3prog.o
diff --git a/sysutils/heirloom/files/patch-dircmp_Makefile.mk b/sysutils/heirloom/files/patch-dircmp_Makefile.mk
new file mode 100644
index 000000000000..9e0eeacbc792
--- /dev/null
+++ b/sysutils/heirloom/files/patch-dircmp_Makefile.mk
@@ -0,0 +1,15 @@
+--- ./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 @@
+ 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
+ 	chmod 755 dircmp
+ 
+ install: all
diff --git a/sysutils/heirloom/files/patch-makefile b/sysutils/heirloom/files/patch-makefile
new file mode 100644
index 000000000000..e60a67573447
--- /dev/null
+++ b/sysutils/heirloom/files/patch-makefile
@@ -0,0 +1,19 @@
+--- ./makefile.orig	Sun Jan 22 22:48:04 2006
++++ ./makefile	Thu Jul 27 01:01:57 2006
+@@ -87,14 +87,14 @@
+ 		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
diff --git a/sysutils/heirloom/files/patch-mvdir_Makefile.mk b/sysutils/heirloom/files/patch-mvdir_Makefile.mk
new file mode 100644
index 000000000000..50e7aa68aae7
--- /dev/null
+++ b/sysutils/heirloom/files/patch-mvdir_Makefile.mk
@@ -0,0 +1,15 @@
+--- ./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 @@
+ 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
+ 	chmod 755 mvdir
+ 
+ install: all
diff --git a/sysutils/heirloom/files/patch-spell_Makefile.mk b/sysutils/heirloom/files/patch-spell_Makefile.mk
new file mode 100644
index 000000000000..7a2a550727fe
--- /dev/null
+++ b/sysutils/heirloom/files/patch-spell_Makefile.mk
@@ -0,0 +1,26 @@
+--- ./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 @@
+ 		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
+ 	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
+ 	chmod 755 compress
+ 
+ spellprog: spellprog.o hash.o hashlook.o huff.o