summaryrefslogtreecommitdiff
path: root/sysutils/9base
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-12-06 18:50:36 +0000
committerrillig <rillig@pkgsrc.org>2005-12-06 18:50:36 +0000
commita7ed3fe9b6c2f6f5772373321be27a8027fa4969 (patch)
tree3a6f8540b39bce4526dea4fabef010e4bbeab282 /sysutils/9base
parent83988aa027a38f30452b33f2efcab9a2116dc3ad (diff)
downloadpkgsrc-a7ed3fe9b6c2f6f5772373321be27a8027fa4969.tar.gz
Updated to 20051114. Patch provided by Leonard Schmidt in PR 32095.
I added patch-b{a,b,c} that are needed for NetBSD 1.6.2.
Diffstat (limited to 'sysutils/9base')
-rw-r--r--sysutils/9base/DESCR2
-rw-r--r--sysutils/9base/Makefile4
-rw-r--r--sysutils/9base/PLIST7
-rw-r--r--sysutils/9base/distinfo48
-rw-r--r--sysutils/9base/patches/patch-aa10
-rw-r--r--sysutils/9base/patches/patch-ab30
-rw-r--r--sysutils/9base/patches/patch-ac8
-rw-r--r--sysutils/9base/patches/patch-ad10
-rw-r--r--sysutils/9base/patches/patch-ae10
-rw-r--r--sysutils/9base/patches/patch-af10
-rw-r--r--sysutils/9base/patches/patch-ag10
-rw-r--r--sysutils/9base/patches/patch-ah8
-rw-r--r--sysutils/9base/patches/patch-ai10
-rw-r--r--sysutils/9base/patches/patch-aj10
-rw-r--r--sysutils/9base/patches/patch-ak10
-rw-r--r--sysutils/9base/patches/patch-al10
-rw-r--r--sysutils/9base/patches/patch-am10
-rw-r--r--sysutils/9base/patches/patch-an10
-rw-r--r--sysutils/9base/patches/patch-ao29
-rw-r--r--sysutils/9base/patches/patch-ap10
-rw-r--r--sysutils/9base/patches/patch-aq10
-rw-r--r--sysutils/9base/patches/patch-ar8
-rw-r--r--sysutils/9base/patches/patch-as21
-rw-r--r--sysutils/9base/patches/patch-ba13
-rw-r--r--sysutils/9base/patches/patch-bb13
-rw-r--r--sysutils/9base/patches/patch-bc13
26 files changed, 203 insertions, 131 deletions
diff --git a/sysutils/9base/DESCR b/sysutils/9base/DESCR
index 3b547acaee4..6a8fb8682c7 100644
--- a/sysutils/9base/DESCR
+++ b/sysutils/9base/DESCR
@@ -3,4 +3,4 @@ plan9ports [1], mk-with-libs.tgz [2] and wmii [3].
[1] http://www.swtch.com/plan9port/
[2] http://swtch.com/plan9port/unix/
-[3] http://www.wmii.net
+[3] http://wmii.de/index.php/WMII/9base
diff --git a/sysutils/9base/Makefile b/sysutils/9base/Makefile
index 01d8cb9e7b0..f445fd7810c 100644
--- a/sysutils/9base/Makefile
+++ b/sysutils/9base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/06 18:50:36 rillig Exp $
#
-DISTNAME= 9base-20051028
+DISTNAME= 9base-20051114
CATEGORIES= sysutils shells
MASTER_SITES= http://wmii.de/snaps/
diff --git a/sysutils/9base/PLIST b/sysutils/9base/PLIST
index 5e5c36e4107..da71b1f249b 100644
--- a/sysutils/9base/PLIST
+++ b/sysutils/9base/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/12/06 18:50:36 rillig Exp $
bin/awk
bin/basename
+bin/bc
bin/cat
bin/cleanname
+bin/date
bin/echo
bin/grep
bin/rc
@@ -18,8 +20,10 @@ bin/uniq
lib/rcmain
man/man1/awk.1
man/man1/basename.1
+man/man1/bc.1
man/man1/cat.1
man/man1/cleanname.1
+man/man1/date.1
man/man1/echo.1
man/man1/grep.1
man/man1/rc.1
@@ -32,3 +36,4 @@ man/man1/test.1
man/man1/touch.1
man/man1/tr.1
man/man1/uniq.1
+man/man7/regexp.7
diff --git a/sysutils/9base/distinfo b/sysutils/9base/distinfo
index 424cddf218b..c4ee3e220b7 100644
--- a/sysutils/9base/distinfo
+++ b/sysutils/9base/distinfo
@@ -1,23 +1,27 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: distinfo,v 1.2 2005/12/06 18:50:36 rillig Exp $
-SHA1 (9base-20051028.tar.gz) = 852725d9047b78912e788d4437f4062c9652b7d7
-RMD160 (9base-20051028.tar.gz) = 5fc10ee56d339320617949a2947645d821fdfd62
-Size (9base-20051028.tar.gz) = 218077 bytes
-SHA1 (patch-aa) = 62e63e9045a18208ffc9e607df30b35e2825db6a
-SHA1 (patch-ab) = f42ba9c8825b9898ce0278f1c7db2fdacce58af8
-SHA1 (patch-ac) = 4f8b1476e73a2517b1de193b3cf640bda4d16a82
-SHA1 (patch-ad) = 59109d872d40a63163b37e76d5b0b76515d17f5a
-SHA1 (patch-ae) = d0fedcd2fc6e689020d8791f53744d85339be91c
-SHA1 (patch-af) = 4c06e44b4e351f1ad4c781afbedd7b2c5e9427e8
-SHA1 (patch-ag) = 254dc9517dbb48c6047cfc504b4ef64fa97e3b18
-SHA1 (patch-ah) = 0598d123ecd680ceec8d01c501237a6d371e9a94
-SHA1 (patch-ai) = 014db6ae8aab5c5c86fb7cc60e498f0f8afbb390
-SHA1 (patch-aj) = 4a4a934aa96283cb5dbc4108551f8c80793c1c3a
-SHA1 (patch-ak) = f0a3215be3141d104fd0e8d199c849b1f5a69317
-SHA1 (patch-al) = 482bd6c7af9a6ce6453818df3831a1de8e481b92
-SHA1 (patch-am) = 7f2deafef23e55a1e793674d53602c5f8a04955d
-SHA1 (patch-an) = 3eca6202e34dae9303edf8c5140b3d2ff3557d91
-SHA1 (patch-ao) = 7936547140cc7e9cdcd5dbadd9fef9267705d923
-SHA1 (patch-ap) = 6669724caa674d62abf3b98e86581fa25232d57f
-SHA1 (patch-aq) = 7e70edd4ee046119fda9e0cc5cdecccbcb424d04
-SHA1 (patch-ar) = 17aa0d4e877af1b99bb83cbe95625ca436b19931
+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-ao) = b764a9176a4d3db3f73718a831b88074b34e3974
+SHA1 (patch-ap) = 4e8a870d23dfcdb799558f61e5902db19d8cf6a9
+SHA1 (patch-aq) = 9e9d82027b2063fc6217c9a6cbd96e5d18ff84bf
+SHA1 (patch-ar) = 6ff8cf1c7e7e82a43131b0af7f54aab9ad33a9ec
+SHA1 (patch-as) = 39697a50cc5e9ff0ffc335e062432f626975edc1
+SHA1 (patch-ba) = 97aff6df9b6971ee5ddfeb9a88fcaf383a9a9bbb
+SHA1 (patch-bb) = a7b5b80ed7125f66d845c74d21d8de41b10d112a
+SHA1 (patch-bc) = 46debf24eab8dcef0768aef88aee0029b2f316ec
diff --git a/sysutils/9base/patches/patch-aa b/sysutils/9base/patches/patch-aa
index e43acc33f1c..d72092cddf8 100644
--- a/sysutils/9base/patches/patch-aa
+++ b/sysutils/9base/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- config.mk.orig 2005-10-28 18:59:21.000000000 +0000
+--- config.mk.orig 2005-11-14 10:22:41.000000000 +0000
+++ config.mk
@@ -1,16 +1,16 @@
# Customize to fit your system
@@ -9,10 +9,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
-PREFIX = /usr/local/9
-MANPREFIX = ${PREFIX}/share/man
+#PREFIX = /usr/local/9
-+MANPREFIX = ${PREFIX}/man
++MANPREFIX = ${PREFIX}/${PKGMANDIR}
# flags
- VERSION = 20051028
+ VERSION = 20051114
-CFLAGS = -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -Os -c -I. -DPREFIX="\"${PREFIX}\""
-LDFLAGS =
+CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\""
@@ -23,4 +23,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
AR = ar rc
-CC = cc
+#CC = cc
- YACC = yacc
+ YACC = ../yacc/9yacc
diff --git a/sysutils/9base/patches/patch-ab b/sysutils/9base/patches/patch-ab
index 4663284c03a..04497ee9249 100644
--- a/sysutils/9base/patches/patch-ab
+++ b/sysutils/9base/patches/patch-ab
@@ -1,13 +1,21 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- lib9/libc.h.orig 2005-08-23 21:38:52.000000000 +0000
-+++ lib9/libc.h
-@@ -832,7 +832,7 @@ extern int post9pservice(int, char*);
- # endif
- #endif
+--- bc/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
++++ bc/Makefile
+@@ -23,12 +23,10 @@ depend:
+ @${YACC} -d ${YFILES}
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #define sched_yield() \
- do { \
- struct timespec ts; \
+ 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}
diff --git a/sysutils/9base/patches/patch-ac b/sysutils/9base/patches/patch-ac
index 085cc1e6d18..c53c3236f68 100644
--- a/sysutils/9base/patches/patch-ac
+++ b/sysutils/9base/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- rc/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- rc/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ rc/Makefile
-@@ -30,15 +30,12 @@ depend:
+@@ -27,15 +27,12 @@ depend:
@${YACC} -d ${YFILES}
install: ${TARG}
@@ -23,4 +23,4 @@ $NetBSD: patch-ac,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-ad b/sysutils/9base/patches/patch-ad
index 56cda79ef42..4e01ab11a47 100644
--- a/sysutils/9base/patches/patch-ad
+++ b/sysutils/9base/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- basename/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- basename/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ basename/Makefile
-@@ -12,12 +12,10 @@ MANFILES = basename.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-ad,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-ae b/sysutils/9base/patches/patch-ae
index 6df9e07a975..9c9331aa79b 100644
--- a/sysutils/9base/patches/patch-ae
+++ b/sysutils/9base/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- cat/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- cat/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ cat/Makefile
-@@ -12,12 +12,10 @@ MANFILES = cat.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-ae,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-af b/sysutils/9base/patches/patch-af
index c15acee9071..11f675679ec 100644
--- a/sysutils/9base/patches/patch-af
+++ b/sysutils/9base/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-af,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- cleanname/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- cleanname/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ cleanname/Makefile
-@@ -12,12 +12,10 @@ MANFILES = cleanname.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-af,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-ag b/sysutils/9base/patches/patch-ag
index 9e5374914bd..794b8642246 100644
--- a/sysutils/9base/patches/patch-ag
+++ b/sysutils/9base/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ag,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- echo/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- echo/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ echo/Makefile
-@@ -12,12 +12,10 @@ MANFILES = echo.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-ag,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-ah b/sysutils/9base/patches/patch-ah
index 0efacb57cb1..29ba4ef745f 100644
--- a/sysutils/9base/patches/patch-ah
+++ b/sysutils/9base/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ah,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- grep/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- grep/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ grep/Makefile
-@@ -26,12 +26,10 @@ depend:
+@@ -23,12 +23,10 @@ depend:
@${YACC} -d ${YFILES}
install: ${TARG}
@@ -18,4 +18,4 @@ $NetBSD: patch-ah,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-ai b/sysutils/9base/patches/patch-ai
index 368edf8b895..e621248913b 100644
--- a/sysutils/9base/patches/patch-ai
+++ b/sysutils/9base/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ai,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- sed/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- sed/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ sed/Makefile
-@@ -12,12 +12,10 @@ MANFILES = sed.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-ai,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-aj b/sysutils/9base/patches/patch-aj
index 571a17ff813..b6a5e192974 100644
--- a/sysutils/9base/patches/patch-aj
+++ b/sysutils/9base/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-aj,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- seq/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- seq/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ seq/Makefile
-@@ -12,12 +12,10 @@ MANFILES = seq.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-aj,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-ak b/sysutils/9base/patches/patch-ak
index af66f2f9747..73c52780943 100644
--- a/sysutils/9base/patches/patch-ak
+++ b/sysutils/9base/patches/patch-ak
@@ -1,9 +1,9 @@
-$NetBSD: patch-ak,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ak,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- sleep/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- sleep/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ sleep/Makefile
-@@ -12,12 +12,10 @@ MANFILES = sleep.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-ak,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-al b/sysutils/9base/patches/patch-al
index 6812693a380..0a0a58e6d44 100644
--- a/sysutils/9base/patches/patch-al
+++ b/sysutils/9base/patches/patch-al
@@ -1,9 +1,9 @@
-$NetBSD: patch-al,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-al,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- sort/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- sort/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ sort/Makefile
-@@ -12,12 +12,10 @@ MANFILES = sort.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-al,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-am b/sysutils/9base/patches/patch-am
index 2eada85c3e9..eb952792dda 100644
--- a/sysutils/9base/patches/patch-am
+++ b/sysutils/9base/patches/patch-am
@@ -1,9 +1,9 @@
-$NetBSD: patch-am,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-am,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- tee/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- tee/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ tee/Makefile
-@@ -12,12 +12,10 @@ MANFILES = tee.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-am,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-an b/sysutils/9base/patches/patch-an
index d43982bb191..68891104439 100644
--- a/sysutils/9base/patches/patch-an
+++ b/sysutils/9base/patches/patch-an
@@ -1,9 +1,9 @@
-$NetBSD: patch-an,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-an,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- test/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- test/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ test/Makefile
-@@ -12,12 +12,10 @@ MANFILES = test.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-an,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-ao b/sysutils/9base/patches/patch-ao
index 22663ecd95d..14bb2fb968c 100644
--- a/sysutils/9base/patches/patch-ao
+++ b/sysutils/9base/patches/patch-ao
@@ -1,21 +1,16 @@
-$NetBSD: patch-ao,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ao,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- touch/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
-+++ touch/Makefile
-@@ -12,12 +12,10 @@ MANFILES = touch.1
- all: ${TARG}
+--- lib9/Makefile.orig 2005-11-14 10:22:41.000000000 +0000
++++ lib9/Makefile
+@@ -189,9 +189,8 @@ all: ${LIB}
+ @echo built lib9
- 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
+ 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}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${MANPREFIX}/man7/regexp.7
diff --git a/sysutils/9base/patches/patch-ap b/sysutils/9base/patches/patch-ap
index 813394e31c8..f6c7711a87f 100644
--- a/sysutils/9base/patches/patch-ap
+++ b/sysutils/9base/patches/patch-ap
@@ -1,9 +1,9 @@
-$NetBSD: patch-ap,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ap,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- tr/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- tr/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ tr/Makefile
-@@ -12,12 +12,10 @@ MANFILES = tr.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-ap,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-aq b/sysutils/9base/patches/patch-aq
index d28817a86f3..3af9e9160ff 100644
--- a/sysutils/9base/patches/patch-aq
+++ b/sysutils/9base/patches/patch-aq
@@ -1,9 +1,9 @@
-$NetBSD: patch-aq,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-aq,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- uniq/Makefile.orig 2005-10-17 12:08:07.000000000 +0000
+--- uniq/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ uniq/Makefile
-@@ -12,12 +12,10 @@ MANFILES = uniq.1
- all: ${TARG}
+@@ -13,12 +13,10 @@ all: ${TARG}
+ @echo built ${TARG}
install: ${TARG}
- @mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -18,4 +18,4 @@ $NetBSD: patch-aq,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-ar b/sysutils/9base/patches/patch-ar
index 22c86eb4615..1497235c087 100644
--- a/sysutils/9base/patches/patch-ar
+++ b/sysutils/9base/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+$NetBSD: patch-ar,v 1.2 2005/12/06 18:50:36 rillig Exp $
---- awk/Makefile.orig 2005-10-28 18:59:20.000000000 +0000
+--- awk/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
+++ awk/Makefile
-@@ -26,12 +26,10 @@ depend:
+@@ -24,12 +24,10 @@ depend:
@${YACC} -d ${YFILES}
install: ${TARG}
@@ -18,4 +18,4 @@ $NetBSD: patch-ar,v 1.1.1.1 2005/10/29 16:04:38 minskim Exp $
+ @${BSD_INSTALL_MAN} ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
+ rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff --git a/sysutils/9base/patches/patch-as b/sysutils/9base/patches/patch-as
new file mode 100644
index 00000000000..e4bcef697d5
--- /dev/null
+++ b/sysutils/9base/patches/patch-as
@@ -0,0 +1,21 @@
+$NetBSD: patch-as,v 1.1 2005/12/06 18:50:36 rillig Exp $
+
+--- date/Makefile.orig 2005-11-14 10:22:40.000000000 +0000
++++ 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}
diff --git a/sysutils/9base/patches/patch-ba b/sysutils/9base/patches/patch-ba
new file mode 100644
index 00000000000..108604c2401
--- /dev/null
+++ b/sysutils/9base/patches/patch-ba
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..bd045a82d7d
--- /dev/null
+++ b/sysutils/9base/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2005/12/06 18:50:36 rillig Exp $
+
+--- lib9/dirfwstat.c.orig Mon Nov 14 11:22:41 2005
++++ lib9/dirfwstat.c Tue Dec 6 19:43:49 2005
+@@ -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__)
+ /* 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
new file mode 100644
index 00000000000..02e4ebe147b
--- /dev/null
+++ b/sysutils/9base/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2005/12/06 18:50:36 rillig 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" {
+ #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__)
+ # define _XOPEN_SOURCE 1000
+ # define _XOPEN_SOURCE_EXTENDED 1
+ #endif