Make this build on Darwin. Fix PR 32796.

21 files changed, 186 insertions, 53 deletions

diff --git a/sysutils/9base/Makefile b/sysutils/9base/Makefile
index a88e6d5e499..e39949b6fa4 100644
--- a/sysutils/9base/Makefile
+++ b/sysutils/9base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/03 00:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/14 16:26:38 yyamano Exp $
 #
 
 DISTNAME=	9base-20051114
@@ -15,6 +15,12 @@ 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"
+LDFLAGS+= -static
+.endif
+
 .if ${GNU_PROGRAM_PREFIX} == ""
 CONFLICTS+=		coreutils-[0-9]*
 CONFLICTS+=		grep-[0-9]*
diff --git a/sysutils/9base/distinfo b/sysutils/9base/distinfo
index c4ee3e220b7..f889045648a 100644
--- a/sysutils/9base/distinfo
+++ b/sysutils/9base/distinfo
@@ -1,27 +1,29 @@
-$NetBSD: distinfo,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: distinfo,v 1.3 2006/02/14 16:26:38 yyamano 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) = d33de61fbe8b19a29969c6f9edac0fdd58f2db03
-SHA1 (patch-ac) = e91a2787b0a090976a9bcb9d7faf4b68fac0267c
-SHA1 (patch-ad) = 9a1d3fe2c4e574c2167d28b77698cf780ae850b7
-SHA1 (patch-ae) = 15e0a479c140fc0c57fe9eadf34f61fabfa89864
-SHA1 (patch-af) = a2f5c95e8e99134e12b80120233a952f8df158a1
-SHA1 (patch-ag) = aa9249c3b5922bd18cc584f7792784fdd39a0d27
-SHA1 (patch-ah) = 2b6e08bc954e1c275fc863d9980f5f195af96509
-SHA1 (patch-ai) = 63fb5440b56000fb02f85a2126104aead77cfae4
-SHA1 (patch-aj) = ec0b42888ea5d1b532f57ec93dc321e09a491288
-SHA1 (patch-ak) = e0166f1b432500aef333889c36fe01b608704c29
-SHA1 (patch-al) = 9c0b7eb6a109aee689f82eaf5f005e98d7d5bf40
-SHA1 (patch-am) = 3500abd2befbce43d1271fe2b436593d9977e637
-SHA1 (patch-an) = e271c65f2139a302b61c5cfa860b683cbd928155
+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) = 4e8a870d23dfcdb799558f61e5902db19d8cf6a9
-SHA1 (patch-aq) = 9e9d82027b2063fc6217c9a6cbd96e5d18ff84bf
-SHA1 (patch-ar) = 6ff8cf1c7e7e82a43131b0af7f54aab9ad33a9ec
-SHA1 (patch-as) = 39697a50cc5e9ff0ffc335e062432f626975edc1
+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-ba) = 97aff6df9b6971ee5ddfeb9a88fcaf383a9a9bbb
 SHA1 (patch-bb) = a7b5b80ed7125f66d845c74d21d8de41b10d112a
 SHA1 (patch-bc) = 46debf24eab8dcef0768aef88aee0029b2f316ec
diff --git a/sysutils/9base/patches/patch-ab b/sysutils/9base/patches/patch-ab
index 04497ee9249..fda0e0b4c6d 100644
--- a/sysutils/9base/patches/patch-ab
+++ b/sysutils/9base/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ab,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- bc/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- bc/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ bc/Makefile
 @@ -23,12 +23,10 @@ depend:
  	@${YACC} -d ${YFILES}
@@ -19,3 +19,9 @@ $NetBSD: patch-ab,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index c53c3236f68..4e56d55cc9d 100644
--- a/sysutils/9base/patches/patch-ac
+++ b/sysutils/9base/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ac,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- rc/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- rc/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ rc/Makefile
 @@ -27,15 +27,12 @@ depend:
  	@${YACC} -d ${YFILES}
@@ -24,3 +24,9 @@ $NetBSD: patch-ac,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 4e01ab11a47..93bc11b6462 100644
--- a/sysutils/9base/patches/patch-ad
+++ b/sysutils/9base/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ad,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- basename/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- basename/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ basename/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-ad,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 9c9331aa79b..1f55f1da09b 100644
--- a/sysutils/9base/patches/patch-ae
+++ b/sysutils/9base/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ae,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- cat/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- cat/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ cat/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-ae,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 11f675679ec..5ea7eaaff3c 100644
--- a/sysutils/9base/patches/patch-af
+++ b/sysutils/9base/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-af,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- cleanname/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- cleanname/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ cleanname/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-af,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 794b8642246..cf17af45969 100644
--- a/sysutils/9base/patches/patch-ag
+++ b/sysutils/9base/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ag,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- echo/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- echo/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ echo/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-ag,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 29ba4ef745f..9a2494fe571 100644
--- a/sysutils/9base/patches/patch-ah
+++ b/sysutils/9base/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ah,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- grep/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- grep/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ grep/Makefile
 @@ -23,12 +23,10 @@ depend:
  	@${YACC} -d ${YFILES}
@@ -19,3 +19,9 @@ $NetBSD: patch-ah,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index e621248913b..514080df078 100644
--- a/sysutils/9base/patches/patch-ai
+++ b/sysutils/9base/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ai,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- sed/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- sed/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ sed/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-ai,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index b6a5e192974..cac9b44eaef 100644
--- a/sysutils/9base/patches/patch-aj
+++ b/sysutils/9base/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-aj,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- seq/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- seq/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ seq/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-aj,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 73c52780943..7e401405fe2 100644
--- a/sysutils/9base/patches/patch-ak
+++ b/sysutils/9base/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ak,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- sleep/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- sleep/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ sleep/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-ak,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 0a0a58e6d44..a92494bd1aa 100644
--- a/sysutils/9base/patches/patch-al
+++ b/sysutils/9base/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-al,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- sort/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- sort/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ sort/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-al,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index eb952792dda..9c28e66aa32 100644
--- a/sysutils/9base/patches/patch-am
+++ b/sysutils/9base/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-am,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- tee/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- tee/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ tee/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-am,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 68891104439..b5666f4f98a 100644
--- a/sysutils/9base/patches/patch-an
+++ b/sysutils/9base/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-an,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- test/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- test/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ test/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-an,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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-ap b/sysutils/9base/patches/patch-ap
index f6c7711a87f..e37438eef13 100644
--- a/sysutils/9base/patches/patch-ap
+++ b/sysutils/9base/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ap,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- tr/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- tr/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ tr/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-ap,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 3af9e9160ff..87efe8ff439 100644
--- a/sysutils/9base/patches/patch-aq
+++ b/sysutils/9base/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-aq,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- uniq/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- uniq/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ uniq/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-aq,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index 1497235c087..6945f19fce5 100644
--- a/sysutils/9base/patches/patch-ar
+++ b/sysutils/9base/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.2 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-ar,v 1.3 2006/02/14 16:26:38 yyamano Exp $
 
---- awk/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- awk/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ awk/Makefile
 @@ -24,12 +24,10 @@ depend:
  	@${YACC} -d ${YFILES}
@@ -19,3 +19,9 @@ $NetBSD: patch-ar,v 1.2 2005/12/06 18:50:36 rillig Exp $
  
  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
index e4bcef697d5..3f6d29476d0 100644
--- a/sysutils/9base/patches/patch-as
+++ b/sysutils/9base/patches/patch-as
@@ -1,6 +1,6 @@
-$NetBSD: patch-as,v 1.1 2005/12/06 18:50:36 rillig Exp $
+$NetBSD: patch-as,v 1.2 2006/02/14 16:26:38 yyamano Exp $
 
---- date/Makefile.orig	2005-11-14 10:22:40.000000000 +0000
+--- date/Makefile.orig	2005-11-14 19:22:40.000000000 +0900
 +++ date/Makefile
 @@ -13,12 +13,10 @@ all: ${TARG}
  	@echo built ${TARG}
@@ -19,3 +19,9 @@ $NetBSD: patch-as,v 1.1 2005/12/06 18:50:36 rillig Exp $
  
  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
new file mode 100644
index 00000000000..f213a41cf78
--- /dev/null
+++ b/sysutils/9base/patches/patch-at
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..7d93812e069
--- /dev/null
+++ b/sysutils/9base/patches/patch-au
@@ -0,0 +1,10 @@
+$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