Update to 20100604 aka 6

* Convert patches to MAKE_FLAGS and BUILDLINK_TRANSFORM.
* Add CONF_FILES support.
* Replace /bin/rc.
* Add workaround for NetBSD 5.1

Tested on NetBSD/i386 4.0.1, 5.1, 5.99.56, and NetBSD/amd64 5.99.55,
and DragonFly/i386 2.10.1.

Changelog:
unknown

33 files changed, 366 insertions, 643 deletions

diff --git a/sysutils/9base/Makefile b/sysutils/9base/Makefile
index 8ea1d2d2472..2c81d083ade 100644
--- a/sysutils/9base/Makefile
+++ b/sysutils/9base/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2010/05/07 12:02:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2011/10/25 16:28:17 ryoon Exp $
 #
 
-DISTNAME=	9base-20051114
-PKGREVISION=	1
+DISTNAME=	9base-6
+PKGNAME=	9base-20100604
 CATEGORIES=	sysutils shells
-MASTER_SITES=	http://www.suckless.org/download/
+MASTER_SITES=	http://dl.suckless.org/tools/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.suckless.org/wiki/wmii/download
+HOMEPAGE=	http://tools.suckless.org/9base
 COMMENT=	Port of various original plan9 tools
+#LICENSE=	lucent-public-v1.02 AND mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -21,17 +22,39 @@ PKG_SHELL=		bin/rc
 .include "../../mk/bsd.prefs.mk"
 
 # Darwin doesn't support static link.
-# See http://developer.apple.com/qa/qa2001/qa1118.html
-.if ${OPSYS} != "Darwin"
+# See http://developer.apple.com/library/mac/#qa/qa1118/_index.html
+.if ${OPSYS} == "Darwin"
+BUILDLINK_TRANSFORM+=	rm:-static
+.else
 LDFLAGS+= -static
 .endif
 
+#XXX see http://gnats.netbsd.org/43228
+.if !empty(MACHINE_PLATFORM:MNetBSD-5.1*)
+BUILDLINK_TRANSFORM+=	rm:-static
+.endif
+
 .if ${GNU_PROGRAM_PREFIX} == ""
 CONFLICTS+=		coreutils-[0-9]*
 CONFLICTS+=		grep-[0-9]*
 CONFLICTS+=		gsed-[0-9]*
 .endif
 
+MAKE_FLAGS+=	PREFIX=${PREFIX} \
+		MANPREFIX=${PREFIX}/${PKGMANDIR}
+
+SUBST_CLASSES+=		shebang
+SUBST_STAGE.shebang=	pre-configure
+SUBST_MESSAGE.shebang=	Fixing shebang
+SUBST_FILES.shebang=	troff/tmac/sendcover
+SUBST_FILES.shebang+=	troff/font/devutf/mkMAP
+SUBST_SED.shebang=	-e 's,/bin/rc,${PREFIX}/bin/rc,'
+
+INSTALLATION_DIRS=	${PREFIX}/share/examples/9base
+
+EGDIR=		${PREFIX}/share/examples/9base
+CONF_FILES=	${EGDIR}/rcmain ${PKG_SYSCONFDIR}/rcmain
+
 post-extract:
 	${LN} -s getcallerpc-x86_64.c ${WRKSRC}/lib9/getcallerpc-amd64.c
 
diff --git a/sysutils/9base/PLIST b/sysutils/9base/PLIST
index da71b1f249b..dfbc4b91067 100644
--- a/sysutils/9base/PLIST
+++ b/sysutils/9base/PLIST
@@ -1,39 +1,291 @@
-@comment $NetBSD: PLIST,v 1.2 2005/12/06 18:50:36 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/10/25 16:28:17 ryoon Exp $
+bin/ascii
 bin/awk
 bin/basename
 bin/bc
+bin/cal
 bin/cat
 bin/cleanname
+bin/cmp
 bin/date
+bin/dc
+bin/dd
+bin/diff
+bin/du
 bin/echo
+bin/ed
+bin/factor
+bin/fmt
+bin/fortune
+bin/freq
+bin/getflags
 bin/grep
+bin/hoc
+bin/join
+bin/look
+bin/ls
+bin/mk
+bin/mkdir
+bin/mtime
+bin/pbd
+bin/primes
 bin/rc
+bin/read
+bin/sam
 bin/sed
 bin/seq
+bin/sha1sum
 bin/sleep
 bin/sort
+bin/split
+bin/strings
+bin/tail
 bin/tee
 bin/test
 bin/touch
 bin/tr
+bin/troff
+bin/unicode
 bin/uniq
-lib/rcmain
+bin/unutf
+bin/yacc
+lib/troff/font/devutf/0100to25ff
+lib/troff/font/devutf/AB
+lib/troff/font/devutf/AI
+lib/troff/font/devutf/AR
+lib/troff/font/devutf/AX
+lib/troff/font/devutf/B
+lib/troff/font/devutf/BI
+lib/troff/font/devutf/C
+lib/troff/font/devutf/CB
+lib/troff/font/devutf/CI
+lib/troff/font/devutf/CO
+lib/troff/font/devutf/CW
+lib/troff/font/devutf/CX
+lib/troff/font/devutf/CY
+lib/troff/font/devutf/DESC
+lib/troff/font/devutf/DejaVuCondensedSans
+lib/troff/font/devutf/DejaVuCondensedSansBold
+lib/troff/font/devutf/DejaVuCondensedSansBoldOblique
+lib/troff/font/devutf/DejaVuCondensedSansOblique
+lib/troff/font/devutf/DejaVuCondensedSerif
+lib/troff/font/devutf/DejaVuCondensedSerifBold
+lib/troff/font/devutf/DejaVuCondensedSerifBoldOblique
+lib/troff/font/devutf/DejaVuCondensedSerifOblique
+lib/troff/font/devutf/DejaVuMonoSans
+lib/troff/font/devutf/DejaVuMonoSansBold
+lib/troff/font/devutf/DejaVuMonoSansBoldOblique
+lib/troff/font/devutf/DejaVuMonoSansOblique
+lib/troff/font/devutf/DejaVuSans
+lib/troff/font/devutf/DejaVuSansBold
+lib/troff/font/devutf/DejaVuSansBoldOblique
+lib/troff/font/devutf/DejaVuSansOblique
+lib/troff/font/devutf/DejaVuSerif
+lib/troff/font/devutf/DejaVuSerifBold
+lib/troff/font/devutf/DejaVuSerifBoldOblique
+lib/troff/font/devutf/DejaVuSerifOblique
+lib/troff/font/devutf/GR
+lib/troff/font/devutf/H
+lib/troff/font/devutf/HB
+lib/troff/font/devutf/HI
+lib/troff/font/devutf/HK
+lib/troff/font/devutf/HL
+lib/troff/font/devutf/HM
+lib/troff/font/devutf/HX
+lib/troff/font/devutf/Helvetica-Narrow
+lib/troff/font/devutf/Helvetica-Narrow-Bold
+lib/troff/font/devutf/Helvetica-Narrow-BoldOblique
+lib/troff/font/devutf/Helvetica-Narrow-Oblique
+lib/troff/font/devutf/I
+lib/troff/font/devutf/Jp
+lib/troff/font/devutf/KB
+lib/troff/font/devutf/KI
+lib/troff/font/devutf/KR
+lib/troff/font/devutf/KX
+lib/troff/font/devutf/LINKFILE
+lib/troff/font/devutf/LucidaCW
+lib/troff/font/devutf/LucidaSans
+lib/troff/font/devutf/LucidaSansB
+lib/troff/font/devutf/LucidaSansCW
+lib/troff/font/devutf/LucidaSansCW83
+lib/troff/font/devutf/LucidaSansI
+lib/troff/font/devutf/LuxiMono
+lib/troff/font/devutf/LuxiMono-Bold
+lib/troff/font/devutf/LuxiMono-BoldOblique
+lib/troff/font/devutf/LuxiMono-Oblique
+lib/troff/font/devutf/LuxiSans
+lib/troff/font/devutf/LuxiSans-Bold
+lib/troff/font/devutf/LuxiSans-BoldOblique
+lib/troff/font/devutf/LuxiSans-Oblique
+lib/troff/font/devutf/LuxiSerif
+lib/troff/font/devutf/LuxiSerif-Bold
+lib/troff/font/devutf/LuxiSerif-BoldOblique
+lib/troff/font/devutf/LuxiSerif-Oblique
+lib/troff/font/devutf/NB
+lib/troff/font/devutf/NI
+lib/troff/font/devutf/NR
+lib/troff/font/devutf/NX
+lib/troff/font/devutf/PA
+lib/troff/font/devutf/PB
+lib/troff/font/devutf/PI
+lib/troff/font/devutf/PX
+lib/troff/font/devutf/R
+lib/troff/font/devutf/R.nomath
+lib/troff/font/devutf/S
+lib/troff/font/devutf/S1
+lib/troff/font/devutf/Syntax
+lib/troff/font/devutf/SyntaxB
+lib/troff/font/devutf/SyntaxI
+lib/troff/font/devutf/UnivMath1
+lib/troff/font/devutf/UnivMath2
+lib/troff/font/devutf/UnivMath3
+lib/troff/font/devutf/UnivMath4
+lib/troff/font/devutf/UnivMath5
+lib/troff/font/devutf/UnivMath6
+lib/troff/font/devutf/ZD
+lib/troff/font/devutf/ZI
+lib/troff/font/devutf/charlib/#263a
+lib/troff/font/devutf/charlib/12
+lib/troff/font/devutf/charlib/14
+lib/troff/font/devutf/charlib/34
+lib/troff/font/devutf/charlib/DG
+lib/troff/font/devutf/charlib/FA
+lib/troff/font/devutf/charlib/F_i
+lib/troff/font/devutf/charlib/F_l
+lib/troff/font/devutf/charlib/L1
+lib/troff/font/devutf/charlib/LA
+lib/troff/font/devutf/charlib/LH
+lib/troff/font/devutf/charlib/LH.example
+lib/troff/font/devutf/charlib/LV
+lib/troff/font/devutf/charlib/PC
+lib/troff/font/devutf/charlib/RC
+lib/troff/font/devutf/charlib/README
+lib/troff/font/devutf/charlib/S_l
+lib/troff/font/devutf/charlib/_b_x
+lib/troff/font/devutf/charlib/_c_i
+lib/troff/font/devutf/charlib/_f_f
+lib/troff/font/devutf/charlib/_lH
+lib/troff/font/devutf/charlib/_l_c
+lib/troff/font/devutf/charlib/_l_f
+lib/troff/font/devutf/charlib/_l_h
+lib/troff/font/devutf/charlib/_o_b
+lib/troff/font/devutf/charlib/_p_w
+lib/troff/font/devutf/charlib/_rH
+lib/troff/font/devutf/charlib/_r_c
+lib/troff/font/devutf/charlib/_r_f
+lib/troff/font/devutf/charlib/_r_h
+lib/troff/font/devutf/charlib/_s_q
+lib/troff/font/devutf/charlib/~=
+lib/troff/font/devutf/mkMAP
+lib/troff/font/devutf/shell.lib
+lib/troff/font/devutf/utfmap
+lib/troff/hyphen.tex
+lib/troff/term/tab.37
+lib/troff/term/tab.450
+lib/troff/term/tab.450-12
+lib/troff/term/tab.dumb
+lib/troff/term/tab.i300
+lib/troff/term/tab.lp
+lib/troff/term/tab.post
+lib/troff/term/tab.think
+lib/troff/term/tab.thinkbold
+lib/troff/term/tab.thinksmall
+lib/troff/term/tab.utf
+lib/troff/tmac/complet.1127
+lib/troff/tmac/cover.1127
+lib/troff/tmac/me/acm.me
+lib/troff/tmac/me/chars.me
+lib/troff/tmac/me/deltext.me
+lib/troff/tmac/me/eqn.me
+lib/troff/tmac/me/float.me
+lib/troff/tmac/me/footnote.me
+lib/troff/tmac/me/index.me
+lib/troff/tmac/me/local.me
+lib/troff/tmac/me/null.me
+lib/troff/tmac/me/revisions
+lib/troff/tmac/me/sh.me
+lib/troff/tmac/me/tbl.me
+lib/troff/tmac/me/thesis.me
+lib/troff/tmac/mmn
+lib/troff/tmac/mmt
+lib/troff/tmac/name.sed
+lib/troff/tmac/sendcover
+lib/troff/tmac/strings.mm
+lib/troff/tmac/tmac.an
+lib/troff/tmac/tmac.anhtml
+lib/troff/tmac/tmac.antimes
+lib/troff/tmac/tmac.bits
+lib/troff/tmac/tmac.cs
+lib/troff/tmac/tmac.e
+lib/troff/tmac/tmac.html
+lib/troff/tmac/tmac.jsdisp
+lib/troff/tmac/tmac.m
+lib/troff/tmac/tmac.mcs
+lib/troff/tmac/tmac.nihongo
+lib/troff/tmac/tmac.org
+lib/troff/tmac/tmac.pictures
+lib/troff/tmac/tmac.pm
+lib/troff/tmac/tmac.psychrefs
+lib/troff/tmac/tmac.ptx
+lib/troff/tmac/tmac.rscover
+lib/troff/tmac/tmac.s
+lib/troff/tmac/tmac.scover
+lib/troff/tmac/tmac.sdisp
+lib/troff/tmac/tmac.skeep
+lib/troff/tmac/tmac.soft
+lib/troff/tmac/tmac.spe
+lib/troff/tmac/tmac.srefs
+lib/troff/tmac/tmac.twb
+lib/troff/tmac/tmac.uni
+lib/troff/tmac/tmac.v
+man/man1/ascii.1
 man/man1/awk.1
 man/man1/basename.1
 man/man1/bc.1
+man/man1/cal.1
 man/man1/cat.1
 man/man1/cleanname.1
+man/man1/cmp.1
 man/man1/date.1
+man/man1/dc.1
+man/man1/dd.1
+man/man1/diff.1
+man/man1/du.1
 man/man1/echo.1
+man/man1/ed.1
+man/man1/factor.1
+man/man1/fmt.1
+man/man1/fortune.1
+man/man1/freq.1
+man/man1/getflags.1
 man/man1/grep.1
+man/man1/hoc.1
+man/man1/join.1
+man/man1/look.1
+man/man1/ls.1
+man/man1/mk.1
+man/man1/mkdir.1
+man/man1/mtime.1
+man/man1/pbd.1
+man/man1/primes.1
 man/man1/rc.1
+man/man1/read.1
+man/man1/sam.1
 man/man1/sed.1
 man/man1/seq.1
+man/man1/sha1sum.1
 man/man1/sleep.1
 man/man1/sort.1
+man/man1/split.1
+man/man1/strings.1
+man/man1/tail.1
 man/man1/tee.1
 man/man1/test.1
 man/man1/touch.1
 man/man1/tr.1
+man/man1/troff.1
+man/man1/unicode.1
 man/man1/uniq.1
-man/man7/regexp.7
+man/man1/unutf.1
+man/man1/yacc.1
+share/examples/9base/rcmain
diff --git a/sysutils/9base/distinfo b/sysutils/9base/distinfo
index 04fd71104c1..54e294fb668 100644
--- a/sysutils/9base/distinfo
+++ b/sysutils/9base/distinfo
@@ -1,33 +1,10 @@
-$NetBSD: distinfo,v 1.5 2011/08/04 11:37:58 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/10/25 16:28:17 ryoon Exp $
 
-SHA1 (9base-20051114.tar.gz) = 27fb8879677dbb83a9f2f24a3be7cc96d97ea244
-RMD160 (9base-20051114.tar.gz) = 59223d40e2c761ed80f3eb73afcc046b4d6e921b
-Size (9base-20051114.tar.gz) = 248172 bytes
-SHA1 (patch-aa) = c3aba45d46d6a5dd4544d89b4e734b86b163f7b1
-SHA1 (patch-ab) = 9a5733206b91bd18f084419ca228c39ae2398a90
-SHA1 (patch-ac) = 24a7e16710bceca65aa7caa8e49e08be09c0bf62
-SHA1 (patch-ad) = 17218711e3982d462935c2435159cde733ac7591
-SHA1 (patch-ae) = bf00af00e983b92b50413b8bd7985283b1da31f3
-SHA1 (patch-af) = 58dc3ee3496aa37c007dff4e2e89f27066985dc1
-SHA1 (patch-ag) = 9b98850e7120e2becfdb27b296e3d100fa2d9aa8
-SHA1 (patch-ah) = ae54a800a4a73e1a2da2cbb6cc0e55002445e173
-SHA1 (patch-ai) = 9251d8493ea6741e23a3041cd675d78dec549021
-SHA1 (patch-aj) = c944ea4a093d1b6e979fbc21c3981e4a5705b481
-SHA1 (patch-ak) = 41cc2d936fd7d1a46fb1cd51e61b62dfe7cfff6d
-SHA1 (patch-al) = 36069d4831d24d617c11c0fc4a668a68222f720f
-SHA1 (patch-am) = ac229974863415e06c2f137eb7ba99ddac94d8e9
-SHA1 (patch-an) = c48b6f24aa1d31c31d01450771dbf851e020d3ac
-SHA1 (patch-ao) = b764a9176a4d3db3f73718a831b88074b34e3974
-SHA1 (patch-ap) = f0af754044732828c8b720e9df4c30898098eb5a
-SHA1 (patch-aq) = d96b45504957af2f9872b04bcaaf92d31b1059c4
-SHA1 (patch-ar) = b1eb60766952dd983b8b72c6198c4a45119e0b53
-SHA1 (patch-as) = 997dc92229699c0e3a51a753b0b2480d517c64ca
-SHA1 (patch-at) = 32d0da68f18b56e8774f90e5f0090ef8c5aed84a
-SHA1 (patch-au) = d412607f5d49b5e72e24de91da2dec63dd1f3437
-SHA1 (patch-av) = 6553a9e7260d879a04ae1c0c873c2706130dba9e
-SHA1 (patch-awk-proctab.c) = e74887d26b32335af1b1d50a1f0e1493a58fbfd4
-SHA1 (patch-awk-proto.h) = 55991e304df7d891e0a4e811131437d02d585cad
-SHA1 (patch-awk-run.c) = 969be20828a9aca566c1f6b79e122f66dfb27572
-SHA1 (patch-ba) = 97aff6df9b6971ee5ddfeb9a88fcaf383a9a9bbb
-SHA1 (patch-bb) = a7b5b80ed7125f66d845c74d21d8de41b10d112a
-SHA1 (patch-bc) = 46debf24eab8dcef0768aef88aee0029b2f316ec
+SHA1 (9base-6.tar.gz) = f349d696859db9a0ff9823cb053f54cf7501ec42
+RMD160 (9base-6.tar.gz) = 7a3686ac1630c52810eebca91b2e49a935dd0812
+Size (9base-6.tar.gz) = 1045868 bytes
+SHA1 (patch-ed_ed.c) = c9f3c08efc2cf2e15922b4f359da4915ec967d48
+SHA1 (patch-lib9_dirfwstat.c) = 4e277a72fc2552c177ade11f5ee14570a2b2650f
+SHA1 (patch-lib9_dirread.c) = a2e06bdb794a67f8b454e18f377f32e87098c70a
+SHA1 (patch-lib9_u.h) = d1ab4bfc119b4308176f990f7ef001c940610aed
+SHA1 (patch-rc_Makefile) = 20b65f190fd96cd31870b01b98dfa09e87a8f3d2
diff --git a/sysutils/9base/patches/patch-aa b/sysutils/9base/patches/patch-aa
deleted file mode 100644
index d72092cddf8..00000000000
--- a/sysutils/9base/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/12/06 18:50:36 rillig Exp $
-
---- config.mk.orig	2005-11-14 10:22:41.000000000 +0000
-+++ config.mk
-@@ -1,16 +1,16 @@
- # Customize to fit your system
- 
- # paths
--PREFIX      = /usr/local/9
--MANPREFIX   = ${PREFIX}/share/man
-+#PREFIX      = /usr/local/9
-+MANPREFIX   = ${PREFIX}/${PKGMANDIR}
- 
- # flags
- VERSION     = 20051114
--CFLAGS      = -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -Os -c -I. -DPREFIX="\"${PREFIX}\""
--LDFLAGS     =
-+CFLAGS      += -c -I. -DPREFIX="\"${PREFIX}\""
-+LDFLAGS     +=
- O           = o
- 
- # compiler
- AR          = ar rc
--CC          = cc
-+#CC          = cc
- YACC        = ../yacc/9yacc
diff --git a/sysutils/9base/patches/patch-ab b/sysutils/9base/patches/patch-ab
deleted file mode 100644
index fda0e0b4c6d..00000000000
--- a/sysutils/9base/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- bc/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ bc/Makefile
-@@ -23,12 +23,10 @@ depend:
- 	@${YACC} -d ${YFILES}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -43,4 +41,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -lm -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -lm -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-ac b/sysutils/9base/patches/patch-ac
deleted file mode 100644
index 4e56d55cc9d..00000000000
--- a/sysutils/9base/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- rc/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ rc/Makefile
-@@ -27,15 +27,12 @@ depend:
- 	@${YACC} -d ${YFILES}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/lib
--	@cp -f ${RCMAIN} ${DESTDIR}${PREFIX}/lib
--	@chmod 755 ${DESTDIR}${PREFIX}/lib/${RCMAIN}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib
-+	@${BSD_INSTALL_LIB} ${RCMAIN} ${DESTDIR}${PREFIX}/lib
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -51,4 +48,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-ad b/sysutils/9base/patches/patch-ad
deleted file mode 100644
index 93bc11b6462..00000000000
--- a/sysutils/9base/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- basename/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ basename/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-ae b/sysutils/9base/patches/patch-ae
deleted file mode 100644
index 1f55f1da09b..00000000000
--- a/sysutils/9base/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- cat/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ cat/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-af b/sysutils/9base/patches/patch-af
deleted file mode 100644
index 5ea7eaaff3c..00000000000
--- a/sysutils/9base/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- cleanname/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ cleanname/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-ag b/sysutils/9base/patches/patch-ag
deleted file mode 100644
index cf17af45969..00000000000
--- a/sysutils/9base/patches/patch-ag
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- echo/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ echo/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-ah b/sysutils/9base/patches/patch-ah
deleted file mode 100644
index 9a2494fe571..00000000000
--- a/sysutils/9base/patches/patch-ah
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- grep/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ grep/Makefile
-@@ -23,12 +23,10 @@ depend:
- 	@${YACC} -d ${YFILES}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -43,4 +41,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-ai b/sysutils/9base/patches/patch-ai
deleted file mode 100644
index 514080df078..00000000000
--- a/sysutils/9base/patches/patch-ai
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- sed/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ sed/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-aj b/sysutils/9base/patches/patch-aj
deleted file mode 100644
index cac9b44eaef..00000000000
--- a/sysutils/9base/patches/patch-aj
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- seq/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ seq/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-ak b/sysutils/9base/patches/patch-ak
deleted file mode 100644
index 7e401405fe2..00000000000
--- a/sysutils/9base/patches/patch-ak
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- sleep/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ sleep/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -34,4 +32,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-al b/sysutils/9base/patches/patch-al
deleted file mode 100644
index a92494bd1aa..00000000000
--- a/sysutils/9base/patches/patch-al
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-al,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- sort/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ sort/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-am b/sysutils/9base/patches/patch-am
deleted file mode 100644
index 9c28e66aa32..00000000000
--- a/sysutils/9base/patches/patch-am
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-am,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- tee/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ tee/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-an b/sysutils/9base/patches/patch-an
deleted file mode 100644
index b5666f4f98a..00000000000
--- a/sysutils/9base/patches/patch-an
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-an,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- test/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ test/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-ao b/sysutils/9base/patches/patch-ao
deleted file mode 100644
index 14bb2fb968c..00000000000
--- a/sysutils/9base/patches/patch-ao
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2005/12/06 18:50:36 rillig Exp $
-
---- lib9/Makefile.orig	2005-11-14 10:22:41.000000000 +0000
-+++ lib9/Makefile
-@@ -189,9 +189,8 @@ all: ${LIB}
- 	@echo built lib9
- 
- install:
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man7
--	@cp -f regexp.7 ${DESTDIR}${MANPREFIX}/man7
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man7/regexp.7
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man7
-+	@${BSD_INSTALL_MAN} regexp.7 ${DESTDIR}${MANPREFIX}/man7
- 
- uninstall:
- 	rm -f ${DESTDIR}${MANPREFIX}/man7/regexp.7
diff --git a/sysutils/9base/patches/patch-ap b/sysutils/9base/patches/patch-ap
deleted file mode 100644
index e37438eef13..00000000000
--- a/sysutils/9base/patches/patch-ap
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- tr/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ tr/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-aq b/sysutils/9base/patches/patch-aq
deleted file mode 100644
index 87efe8ff439..00000000000
--- a/sysutils/9base/patches/patch-aq
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- uniq/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ uniq/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-ar b/sysutils/9base/patches/patch-ar
deleted file mode 100644
index 6945f19fce5..00000000000
--- a/sysutils/9base/patches/patch-ar
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2006/02/14 16:26:38 yyamano Exp $
-
---- awk/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ awk/Makefile
-@@ -24,12 +24,10 @@ depend:
- 	@${YACC} -d ${YFILES}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -44,4 +42,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -lm -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -lm -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-as b/sysutils/9base/patches/patch-as
deleted file mode 100644
index 3f6d29476d0..00000000000
--- a/sysutils/9base/patches/patch-as
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-as,v 1.2 2006/02/14 16:26:38 yyamano Exp $
-
---- date/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ date/Makefile
-@@ -13,12 +13,10 @@ all: ${TARG}
- 	@echo built ${TARG}
- 
- install: ${TARG}
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
--	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
--	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-+	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_PROGRAM} ${TARG} ${DESTDIR}${PREFIX}/bin/
-+	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+	@${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
- 
- uninstall:
- 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
-@@ -33,4 +31,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-at b/sysutils/9base/patches/patch-at
deleted file mode 100644
index f213a41cf78..00000000000
--- a/sysutils/9base/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/02/14 16:26:38 yyamano Exp $
-
---- yacc/Makefile.orig	2005-11-14 19:22:41.000000000 +0900
-+++ yacc/Makefile
-@@ -20,7 +20,7 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
- 
- install:
- 
diff --git a/sysutils/9base/patches/patch-au b/sysutils/9base/patches/patch-au
deleted file mode 100644
index 7d93812e069..00000000000
--- a/sysutils/9base/patches/patch-au
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-au,v 1.1 2006/02/14 16:26:38 yyamano Exp $
-
---- touch/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
-+++ touch/Makefile
-@@ -33,4 +33,4 @@ clean:
- 
- ${TARG}: ${OFILES}
- 	@echo LD ${TARG}
--	@${CC} ${LDFLAGS} -static -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
-+	@${CC} ${LDFLAGS} -o ${TARG} ${OFILES} -L${PREFIX}/lib -L../lib9 -l9
diff --git a/sysutils/9base/patches/patch-awk-proctab.c b/sysutils/9base/patches/patch-awk-proctab.c
deleted file mode 100644
index 894c1133426..00000000000
--- a/sysutils/9base/patches/patch-awk-proctab.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-awk-proctab.c,v 1.1 2011/08/04 11:37:59 joerg Exp $
-
---- awk/proctab.c.orig	2011-08-03 11:53:00.000000000 +0000
-+++ awk/proctab.c
-@@ -179,7 +179,7 @@ Cell *(*proctab[92])(Node **, int) = {
- 	nullproc,	/* NUMBER */
- 	nullproc,	/* STRING */
- 	nullproc,	/* REGEXPR */
--	getline,	/* GETLINE */
-+	my_getline,	/* GETLINE */
- 	jump,	/* RETURN */
- 	split,	/* SPLIT */
- 	substr,	/* SUBSTR */
diff --git a/sysutils/9base/patches/patch-awk-proto.h b/sysutils/9base/patches/patch-awk-proto.h
deleted file mode 100644
index a572298c061..00000000000
--- a/sysutils/9base/patches/patch-awk-proto.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-awk-proto.h,v 1.1 2011/08/04 11:37:59 joerg Exp $
-
---- awk/proto.h.orig	2011-08-03 11:53:03.000000000 +0000
-+++ awk/proto.h
-@@ -131,7 +131,7 @@ extern	Cell	*call(Node **, int);
- extern	Cell	*copycell(Cell *);
- extern	Cell	*arg(Node **, int);
- extern	Cell	*jump(Node **, int);
--extern	Cell	*getline(Node **, int);
-+extern	Cell	*my_getline(Node **, int);
- extern	Cell	*getnf(Node **, int);
- extern	Cell	*array(Node **, int);
- extern	Cell	*awkdelete(Node **, int);
diff --git a/sysutils/9base/patches/patch-awk-run.c b/sysutils/9base/patches/patch-awk-run.c
deleted file mode 100644
index 852b4a8cc6e..00000000000
--- a/sysutils/9base/patches/patch-awk-run.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-awk-run.c,v 1.1 2011/08/04 11:37:59 joerg Exp $
-
---- awk/run.c.orig	2011-08-03 11:53:06.000000000 +0000
-+++ awk/run.c
-@@ -377,7 +377,7 @@ Cell *jump(Node **a, int n)	/* break, co
- 	return 0;	/* not reached */
- }
- 
--Cell *getline(Node **a, int n)	/* get next line from specific input */
-+Cell *my_getline(Node **a, int n)	/* get next line from specific input */
- {		/* a[0] is variable, a[1] is operator, a[2] is filename */
- 	Cell *r, *x;
- 	extern Cell **fldtab;
diff --git a/sysutils/9base/patches/patch-ba b/sysutils/9base/patches/patch-ba
deleted file mode 100644
index 108604c2401..00000000000
--- a/sysutils/9base/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2005/12/06 18:50:36 rillig Exp $
-
---- lib9/_p9dir.c.orig	Mon Nov 14 11:22:41 2005
-+++ lib9/_p9dir.c	Tue Dec  6 19:43:58 2005
-@@ -7,7 +7,7 @@
- #include <pwd.h>
- #include <grp.h>
- 
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- #include <sys/disklabel.h>
- #include <sys/ioctl.h>
- static int diskdev[] = {
diff --git a/sysutils/9base/patches/patch-bb b/sysutils/9base/patches/patch-bb
index bd045a82d7d..3fedb3e3c5e 100644
--- a/sysutils/9base/patches/patch-bb
+++ b/sysutils/9base/patches/patch-bb
@@ -1,13 +1,13 @@
-$NetBSD: patch-bb,v 1.1 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-bb,v 1.2 2011/10/25 16:28:17 ryoon Exp $
 
---- lib9/dirfwstat.c.orig	Mon Nov 14 11:22:41 2005
-+++ lib9/dirfwstat.c	Tue Dec  6 19:43:49 2005
+--- lib9/dirfwstat.c.orig	2010-06-04 10:46:05.000000000 +0000
++++ lib9/dirfwstat.c
 @@ -4,7 +4,7 @@
  #include <sys/time.h>
  #include <sys/stat.h>
  
--#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
+-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__linux__)
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__linux__) || defined(__NetBSD__)
  /* do nothing -- futimes exists and is fine */
  
  #elif defined(__SunOS5_9__)
diff --git a/sysutils/9base/patches/patch-bc b/sysutils/9base/patches/patch-bc
index 02e4ebe147b..562fa552053 100644
--- a/sysutils/9base/patches/patch-bc
+++ b/sysutils/9base/patches/patch-bc
@@ -1,13 +1,13 @@
-$NetBSD: patch-bc,v 1.1 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-bc,v 1.2 2011/10/25 16:28:17 ryoon Exp $
 
---- lib9/u.h.orig	Mon Nov 14 11:22:41 2005
-+++ lib9/u.h	Tue Dec  6 19:43:23 2005
-@@ -16,7 +16,7 @@ extern "C" {
+--- lib9/u.h.orig	2010-06-04 10:46:05.000000000 +0000
++++ lib9/u.h
+@@ -17,7 +17,7 @@ extern "C" {
  #define _BSD_SOURCE 1
  #define _NETBSD_SOURCE 1	/* NetBSD */
  #define _SVID_SOURCE 1
 -#if !defined(__APPLE__) && !defined(__OpenBSD__)
-+#if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
++#if !defined(__APPLE__) && !defined(__OpenBSD__) || !define(__NetBSD__)
  #	define _XOPEN_SOURCE 1000
  #	define _XOPEN_SOURCE_EXTENDED 1
  #endif
diff --git a/sysutils/9base/patches/patch-ed_ed.c b/sysutils/9base/patches/patch-ed_ed.c
new file mode 100644
index 00000000000..1ab68b7295e
--- /dev/null
+++ b/sysutils/9base/patches/patch-ed_ed.c
@@ -0,0 +1,33 @@
+$NetBSD: patch-ed_ed.c,v 1.1 2011/10/25 16:28:17 ryoon Exp $
+
+* Support DragonFly
+
+--- ed/ed.c.orig	2010-06-04 10:46:05.000000000 +0000
++++ ed/ed.c
+@@ -121,7 +121,7 @@ void	setnoaddr(void);
+ void	setwide(void);
+ void	squeeze(int);
+ void	substitute(int);
+-char*	_mktemp(char *as);
++char*	my_mktemp(char *as);
+ 
+ Rune La[] = { 'a', 0 };
+ Rune Lr[] = { 'r', 0 };
+@@ -162,7 +162,7 @@ main(int argc, char *argv[])
+ 		globp = Lr;
+ 	}
+ 	zero = malloc((nlall+5)*sizeof(int*));
+-	tfname = _mktemp(tmp);
++	tfname = my_mktemp(tmp);
+ 	init();
+ 	setjmp(savej);
+ 	commands();
+@@ -1584,7 +1584,7 @@ putchr(int ac)
+ }
+ 
+ char*
+-_mktemp(char *as)
++my_mktemp(char *as)
+ {
+ 	char *s;
+ 	unsigned pid;
diff --git a/sysutils/9base/patches/patch-av b/sysutils/9base/patches/patch-lib9_dirread.c
index 73820465d7f..cc163478f08 100644
--- a/sysutils/9base/patches/patch-av
+++ b/sysutils/9base/patches/patch-lib9_dirread.c
@@ -1,17 +1,19 @@
-$NetBSD: patch-av,v 1.1 2006/06/21 19:34:45 joerg Exp $
+$NetBSD: patch-lib9_dirread.c,v 1.1 2011/10/25 16:28:17 ryoon Exp $
 
---- lib9/dirread.c.orig	2006-06-21 17:11:56.000000000 +0000
+* DragonFly support
+
+--- lib9/dirread.c.orig	2010-06-04 10:46:05.000000000 +0000
 +++ lib9/dirread.c
-@@ -18,7 +18,7 @@ mygetdents(int fd, struct dirent *buf, i
- 	nn = getdirentries(fd, (void*)buf, n, &off);
- 	return nn;
+@@ -25,7 +25,7 @@ mygetdents(int fd, struct dirent *buf, i
+ 	long off;
+ 	return getdirentries(fd, (void*)buf, n, &off);
  }
--#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+-#elif defined(__sun__) || defined(__NetBSD__)
++#elif defined(__sun__) || defined(__NetBSD__) || defined(__DragonFly__)
  static int
  mygetdents(int fd, struct dirent *buf, int n)
  {
-@@ -44,14 +44,22 @@ countde(char *p, int n)
+@@ -50,14 +50,22 @@ countde(char *p, int n)
  	m = 0;
  	while(p < e){
  		de = (struct dirent*)p;
@@ -34,7 +36,7 @@ $NetBSD: patch-av,v 1.1 2006/06/21 19:34:45 joerg Exp $
  	}
  	return m;
  }
-@@ -91,7 +99,11 @@ dirpackage(int fd, char *buf, int n, Dir
+@@ -97,7 +105,11 @@ dirpackage(int fd, char *buf, int n, Dir
  				stat(de->d_name, &st);
  			nstr += _p9dir(&lst, &st, de->d_name, nil, nil, nil);
  		}
@@ -46,7 +48,7 @@ $NetBSD: patch-av,v 1.1 2006/06/21 19:34:45 joerg Exp $
  	}
  
  	d = malloc(sizeof(Dir)*n+nstr);
-@@ -113,7 +125,11 @@ dirpackage(int fd, char *buf, int n, Dir
+@@ -119,7 +131,11 @@ dirpackage(int fd, char *buf, int n, Dir
  				stat(de->d_name, &st);
  			_p9dir(&lst, &st, de->d_name, &d[m++], &str, estr);
  		}
diff --git a/sysutils/9base/patches/patch-rc_Makefile b/sysutils/9base/patches/patch-rc_Makefile
new file mode 100644
index 00000000000..870a52626c4
--- /dev/null
+++ b/sysutils/9base/patches/patch-rc_Makefile
@@ -0,0 +1,17 @@
+$NetBSD: patch-rc_Makefile,v 1.1 2011/10/25 16:28:17 ryoon Exp $
+
+* CONF_FILES support
+
+--- rc/Makefile.orig	2010-06-04 10:46:05.000000000 +0000
++++ rc/Makefile
+@@ -33,8 +33,8 @@ install: ${TARG}
+ 	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
+ 	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
+ 	@mkdir -p ${DESTDIR}${PREFIX}/etc
+-	@cp -f rcmain ${DESTDIR}${PREFIX}/etc
+-	@chmod 755 ${DESTDIR}${PREFIX}/etc/rcmain
++	@cp -f rcmain ${DESTDIR}${PREFIX}/share/examples/9base
++	@chmod 755 ${DESTDIR}${PREFIX}/share/examples/9base
+ 
+ uninstall:
+ 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}