CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: dholland Date: Wed Oct 28 06:23:29 UTC 2009 Modified Files: src/games/fortune/datfiles: fortunes.sp.ok fortunes2 Log Message: Ghandi - Gandhi To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/games/fortune/datfiles/fortunes.sp.ok cvs rdiff -u -r1.33 -r1.34 src/games/fortune/datfiles/fortunes2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes.sp.ok diff -u src/games/fortune/datfiles/fortunes.sp.ok:1.5 src/games/fortune/datfiles/fortunes.sp.ok:1.6 --- src/games/fortune/datfiles/fortunes.sp.ok:1.5 Sun Oct 8 20:12:27 2006 +++ src/games/fortune/datfiles/fortunes.sp.ok Wed Oct 28 06:23:29 2009 @@ -449,7 +449,6 @@ Genderplex Gerat Gerrold's -Ghandi Ghostbusters Giddens Gigo Index: src/games/fortune/datfiles/fortunes2 diff -u src/games/fortune/datfiles/fortunes2:1.33 src/games/fortune/datfiles/fortunes2:1.34 --- src/games/fortune/datfiles/fortunes2:1.33 Tue Dec 2 14:21:02 2008 +++ src/games/fortune/datfiles/fortunes2 Wed Oct 28 06:23:29 2009 @@ -51174,7 +51174,7 @@ % Whatever you do will be insignificant, but it is very important that you do it. - -- Ghandi + -- Gandhi % Whatever you do will be insignificant, but it is very important that you do it.
CVS commit: [netbsd-5] src
Module Name:src Committed By: bouyer Date: Wed Oct 28 09:03:42 UTC 2009 Modified Files: src/distrib/sets/lists/man [netbsd-5]: mi src/share/man/man4 [netbsd-5]: Makefile src/sys/arch/amd64/conf [netbsd-5]: GENERIC src/sys/arch/i386/conf [netbsd-5]: ALL GENERIC src/sys/dev/pci [netbsd-5]: files.pci pcidevs Added Files: src/share/man/man4 [netbsd-5]: sdhc.4 src/sys/dev/pci [netbsd-5]: sdhc_pci.c Log Message: Pull up the following revisions, requested by sborrill in ticket #1114: share/man/man4/sdhc.4 1.1-1.2 sys/dev/pci/sdhc_pci.c 1.1-1.3 distrib/sets/lists/man/mi patch share/man/man4/Makefile patch sys/arch/amd64/conf/GENERIC patch sys/arch/i386/conf/ALL patch sys/arch/i386/conf/GENERIC patch sys/dev/pci/files.pci patch sys/dev/pci/pcidevs patch sys/dev/pci/pcidevs.h regen sys/dev/pci/pcidevs_data.h regen Add sdhc(4), a driver for SD controllers following the SD Host Controller Standard Simplified Specification. To generate a diff of this commit: cvs rdiff -u -r1.1109.2.12 -r1.1109.2.13 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.482.2.7 -r1.482.2.8 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/sdhc.4 cvs rdiff -u -r1.231.4.6 -r1.231.4.7 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.183.4.6 -r1.183.4.7 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.915.2.9 -r1.915.2.10 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.308.2.5 -r1.308.2.6 src/sys/dev/pci/files.pci cvs rdiff -u -r1.962.4.5 -r1.962.4.6 src/sys/dev/pci/pcidevs cvs rdiff -u -r0 -r1.3.2.2 src/sys/dev/pci/sdhc_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1109.2.12 src/distrib/sets/lists/man/mi:1.1109.2.13 --- src/distrib/sets/lists/man/mi:1.1109.2.12 Sun Oct 18 16:50:13 2009 +++ src/distrib/sets/lists/man/mi Wed Oct 28 09:03:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1109.2.12 2009/10/18 16:50:13 bouyer Exp $ +# $NetBSD: mi,v 1.1109.2.13 2009/10/28 09:03:41 bouyer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1352,6 +1352,7 @@ ./usr/share/man/cat4/scsi.0 man-sys-catman .cat ./usr/share/man/cat4/scsibus.0 man-sys-catman .cat ./usr/share/man/cat4/sd.0 man-sys-catman .cat +./usr/share/man/cat4/sdhc.0 man-sys-catman .cat ./usr/share/man/cat4/sdmmc.0 man-sys-catman .cat ./usr/share/man/cat4/se.0 man-sys-catman .cat ./usr/share/man/cat4/sea.0 man-sys-catman .cat @@ -3829,6 +3830,7 @@ ./usr/share/man/html4/scsi.html man-sys-htmlman html ./usr/share/man/html4/scsibus.html man-sys-htmlman html ./usr/share/man/html4/sd.html man-sys-htmlman html +./usr/share/man/html4/sdhc.html man-sys-htmlman html ./usr/share/man/html4/sdmmc.html man-sys-htmlman html ./usr/share/man/html4/se.html man-sys-htmlman html ./usr/share/man/html4/sea.html man-sys-htmlman html @@ -6218,6 +6220,7 @@ ./usr/share/man/man4/scsi.4 man-sys-man .man ./usr/share/man/man4/scsibus.4 man-sys-man .man ./usr/share/man/man4/sd.4 man-sys-man .man +./usr/share/man/man4/sdhc.4 man-sys-man .man ./usr/share/man/man4/sdmmc.4 man-sys-man .man ./usr/share/man/man4/se.4 man-sys-man .man ./usr/share/man/man4/sea.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.482.2.7 src/share/man/man4/Makefile:1.482.2.8 --- src/share/man/man4/Makefile:1.482.2.7 Thu Oct 8 09:47:08 2009 +++ src/share/man/man4/Makefile Wed Oct 28 09:03:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.482.2.7 2009/10/08 09:47:08 sborrill Exp $ +# $NetBSD: Makefile,v 1.482.2.8 2009/10/28 09:03:42 bouyer Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \ @@ -46,7 +46,8 @@ qe.4 qec.4 qsphy.4 \ raid.4 ral.4 ray.4 rcons.4 re.4 rgephy.4 rlphy.4 rnd.4 route.4 \ rs5c372rtc.4 rtk.4 rtw.4 rum.4 \ - satalink.4 sbus.4 scc.4 scsi.4 sd.4 sdmmc.4 se.4 seeprom.4 sem.4 \ + satalink.4 sbus.4 scc.4 scsi.4 sd.4 sdhc.4 sdmmc.4 se.4 seeprom.4 \ + sem.4 \ ses.4 sf.4 sfb.4 sgsmix.4 shb.4 \ shpcic.4 siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \ sm.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \ Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.231.4.6 src/sys/arch/amd64/conf/GENERIC:1.231.4.7 --- src/sys/arch/amd64/conf/GENERIC:1.231.4.6 Thu Oct 8 09:47:08 2009 +++ src/sys/arch/amd64/conf/GENERIC Wed Oct 28 09:03:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.231.4.6 2009/10/08 09:47:08 sborrill Exp $ +# $NetBSD: GENERIC,v 1.231.4.7 2009/10/28 09:03:42 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Wed Oct 28 09:06:14 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: pcidevs.h pcidevs_data.h
Log Message:
Regen for ticket 1114
To generate a diff of this commit:
cvs rdiff -u -r1.963.4.5 -r1.963.4.6 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.962.4.5 -r1.962.4.6 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.963.4.5 src/sys/dev/pci/pcidevs.h:1.963.4.6
--- src/sys/dev/pci/pcidevs.h:1.963.4.5 Sat Sep 26 20:06:46 2009
+++ src/sys/dev/pci/pcidevs.h Wed Oct 28 09:06:09 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.963.4.5 2009/09/26 20:06:46 snj Exp $ */
+/* $NetBSD: pcidevs.h,v 1.963.4.6 2009/10/28 09:06:09 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.5 2009/09/26 20:05:43 snj Exp
+ * NetBSD: pcidevs,v 1.962.4.6 2009/10/28 09:03:42 bouyer Exp
*/
/*
@@ -1818,6 +1818,7 @@
/* ENE Technology products */
#define PCI_PRODUCT_ENE_MCR510 0x0510 /* MCR510 PCI Memory Card Reader Controller */
+#define PCI_PRODUCT_ENE_CB712 0x0550 /* CB712/714/810 PCI SD Card Reader Controller */
#define PCI_PRODUCT_ENE_CB1211 0x1211 /* CB1211 CardBus Controller */
#define PCI_PRODUCT_ENE_CB1225 0x1225 /* CB1225 CardBus Controller */
#define PCI_PRODUCT_ENE_CB1410 0x1410 /* CB1410 CardBus Controller */
@@ -3810,6 +3811,7 @@
#define PCI_PRODUCT_TI_PCI72111CB 0x8031 /* PCI7x21/7x11 Cardbus Controller */
#define PCI_PRODUCT_TI_PCI72111FW 0x8032 /* PCI7x21/7x11 IEEE 1394 Host Controller */
#define PCI_PRODUCT_TI_PCI72111FM 0x8033 /* PCI7x21/7x11 Integrated FlashMedia Controller */
+#define PCI_PRODUCT_TI_PCI72111SD 0x8034 /* PCI7x21/7x11 SD Card Controller */
#define PCI_PRODUCT_TI_PCI6515A 0x8036 /* PCI6515A Cardbus Controller */
#define PCI_PRODUCT_TI_PCI6515ASM 0x8038 /* PCI6515A Cardbus Controller (Smart Card mode) */
#define PCI_PRODUCT_TI_ACX100A 0x8400 /* ACX100A 802.11b */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.962.4.5 src/sys/dev/pci/pcidevs_data.h:1.962.4.6
--- src/sys/dev/pci/pcidevs_data.h:1.962.4.5 Sat Sep 26 20:06:47 2009
+++ src/sys/dev/pci/pcidevs_data.h Wed Oct 28 09:06:10 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.962.4.5 2009/09/26 20:06:47 snj Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.962.4.6 2009/10/28 09:06:10 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.5 2009/09/26 20:05:43 snj Exp
+ * NetBSD: pcidevs,v 1.962.4.6 2009/10/28 09:03:42 bouyer Exp
*/
/*
@@ -6360,6 +6360,10 @@
MCR510 PCI Memory Card Reader Controller,
},
{
+ PCI_VENDOR_ENE, PCI_PRODUCT_ENE_CB712,
+ CB712/714/810 PCI SD Card Reader Controller,
+ },
+ {
PCI_VENDOR_ENE, PCI_PRODUCT_ENE_CB1211,
CB1211 CardBus Controller,
},
@@ -13232,6 +13236,10 @@
PCI7x21/7x11 Integrated FlashMedia Controller,
},
{
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI72111SD,
+ PCI7x21/7x11 SD Card Controller,
+ },
+ {
PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI6515A,
PCI6515A Cardbus Controller,
},
@@ -14596,4 +14604,4 @@
Video Controller,
},
};
-const int pci_nproducts = 3048;
+const int pci_nproducts = 3050;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Wed Oct 28 09:08:16 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Ticket 1114 To generate a diff of this commit: cvs rdiff -u -r1.1.2.126 -r1.1.2.127 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.126 src/doc/CHANGES-5.1:1.1.2.127 --- src/doc/CHANGES-5.1:1.1.2.126 Tue Oct 27 22:01:46 2009 +++ src/doc/CHANGES-5.1 Wed Oct 28 09:08:16 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.126 2009/10/27 22:01:46 bouyer Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.127 2009/10/28 09:08:16 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14559,3 +14559,19 @@ mfs or tmpfs /dev prepared after initial mountroot. [tsutsui, ticket #1115] +share/man/man4/sdhc.41.1-1.2 +sys/dev/pci/sdhc_pci.c1.1-1.3 +distrib/sets/lists/man/mi patch +share/man/man4/Makefilepatch +sys/arch/amd64/conf/GENERIC patch +sys/arch/i386/conf/ALLpatch +sys/arch/i386/conf/GENERIC patch +sys/dev/pci/files.pcipatch +sys/dev/pci/pcidevspatch +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + Add sdhc(4), a driver for SD controllers following the SD Host + Controller Standard Simplified Specification. + [sborrill, ticket #1114] +
CVS commit: src/external/bsd/flex/lib
Module Name:src
Committed By: njoly
Date: Wed Oct 28 11:20:08 UTC 2009
Modified Files:
src/external/bsd/flex/lib: Makefile
Log Message:
Debugging libraries require MKDEBUGLIB not MKDEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/lib/Makefile
diff -u src/external/bsd/flex/lib/Makefile:1.1 src/external/bsd/flex/lib/Makefile:1.2
--- src/external/bsd/flex/lib/Makefile:1.1 Mon Oct 26 00:49:04 2009
+++ src/external/bsd/flex/lib/Makefile Wed Oct 28 11:20:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/10/26 00:49:04 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/28 11:20:07 njoly Exp $
NOPIC= # defined
@@ -17,7 +17,7 @@
LINKS+= ${LIBDIR}/libl_p.a ${LIBDIR}/libfl_p.a
.endif
-.if ${MKDEBUG} != no
+.if ${MKDEBUGLIB} != no
LINKS+= ${LIBDIR}/libl_g.a ${LIBDIR}/libfl_g.a
.endif
CVS commit: src/usr.bin/m4/lib
Module Name:src Committed By: christos Date: Wed Oct 28 12:59:24 UTC 2009 Modified Files: src/usr.bin/m4/lib: ohash_int.h Log Message: Handle nbtools build better. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/usr.bin/m4/lib/ohash_int.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/m4/lib/ohash_int.h diff -u src/usr.bin/m4/lib/ohash_int.h:1.1.1.1 src/usr.bin/m4/lib/ohash_int.h:1.2 --- src/usr.bin/m4/lib/ohash_int.h:1.1.1.1 Mon Oct 26 17:08:59 2009 +++ src/usr.bin/m4/lib/ohash_int.h Wed Oct 28 08:59:24 2009 @@ -1,5 +1,9 @@ /* $OpenBSD: ohash_int.h,v 1.3 2006/01/16 15:52:25 espie Exp $ */ +#if HAVE_NBTOOL_CONFIG_H +#include nbtool_config.h +#endif + #include stddef.h #include stdint.h #include stdlib.h
CVS commit: [netbsd-5] src
Module Name:src
Committed By: bouyer
Date: Wed Oct 28 13:06:22 UTC 2009
Modified Files:
src/doc [netbsd-5]: CHANGES-5.1
src/sys/dev/pckbport [netbsd-5]: wskbdmap_mfii.c
Log Message:
Back out ticket #, it breaks the build.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.127 -r1.1.2.128 src/doc/CHANGES-5.1
cvs rdiff -u -r1.15.8.2 -r1.15.8.3 src/sys/dev/pckbport/wskbdmap_mfii.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.1
diff -u src/doc/CHANGES-5.1:1.1.2.127 src/doc/CHANGES-5.1:1.1.2.128
--- src/doc/CHANGES-5.1:1.1.2.127 Wed Oct 28 09:08:16 2009
+++ src/doc/CHANGES-5.1 Wed Oct 28 13:06:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.127 2009/10/28 09:08:16 bouyer Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.128 2009/10/28 13:06:22 bouyer Exp $
A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
release:
@@ -14533,11 +14533,6 @@
Fix problems with SIGWINCH. From Paul Ripke in PR 42161.
[wiz, ticket #1110]
-sys/dev/pckbport/wskbdmap_mfii.c patch
-
- Add hungarian keyboard layout
- [ahoka, ticket #]
-
sys/ufs/ext2fs/ext2fs_extern.h 1.42
sys/ufs/ext2fs/ext2fs_vfsops.c 1.152
sys/ufs/ext2fs/ext2fs_vnops.c 1.91
Index: src/sys/dev/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.2 src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.3
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.2 Tue Oct 27 21:39:21 2009
+++ src/sys/dev/pckbport/wskbdmap_mfii.c Wed Oct 28 13:06:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_mfii.c,v 1.15.8.2 2009/10/27 21:39:21 bouyer Exp $ */
+/* $NetBSD: wskbdmap_mfii.c,v 1.15.8.3 2009/10/28 13:06:22 bouyer Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.2 2009/10/27 21:39:21 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.3 2009/10/28 13:06:22 bouyer Exp $);
#include opt_wskbdmap.h
#include sys/types.h
@@ -443,44 +443,6 @@
KC(184), KS_Mode_switch, KS_Multi_key,
};
-static const keysym_t pckbd_keydesc_hu[] = {
-/* pos normal shifted altgr shift-altgr */
-KC(2), KS_1, KS_apostrophe, KS_asciitilde,
-KC(3), KS_2, KS_quotedbl, KS_dead_caron,
-KC(4), KS_3, KS_plus, KS_asciicircum,
-KC(5), KS_4, KS_exclam, KS_dead_breve,
-KC(6), KS_5, KS_percent, KS_dead_abovering,
-KC(7), KS_6, KS_slash, KS_dead_ogonek,
-KC(8), KS_7, KS_equal, KS_grave,
-KC(9), KS_8, KS_parenleft, KS_dead_dotaccent,
-KC(10), KS_9, KS_parenright, KS_dead_acute,
-KC(11), KS_odiaeresis, KS_Odiaeresis, KS_dead_hungarumlaut,
-KC(12), KS_udiaeresis, KS_Udiaeresis, KS_dead_diaeresis,
-KC(13), KS_oacute, KS_Oacute, KS_dead_cedilla,
-KC(16), KS_q, KS_Q, KS_backslash,
-KC(17), KS_w, KS_W, KS_bar,
-KC(21), KS_z,
-KC(26), KS_odoubleacute, KS_Odoubleacute,KS_division,
-KC(27), KS_uacute, KS_Uacute, KS_multiply,
-KC(33), KS_f, KS_F, KS_bracketleft,
-KC(34), KS_g, KS_G, KS_bracketright,
-KC(39), KS_eacute, KS_Eacute, KS_dollar,
-KC(40), KS_aacute, KS_Aacute, KS_ssharp,
-KC(41), KS_0, KS_section,
-KC(43), KS_udoubleacute, KS_Udoubleacute,KS_currency,
-KC(44), KS_y, KS_Y, KS_greater,
-KC(45), KS_x, KS_X, KS_numbersign,
-KC(46), KS_c, KS_C, KS_ampersand,
-KC(47), KS_v, KS_V, KS_at,
-KC(48), KS_b, KS_B, KS_braceleft,
-KC(49), KS_n, KS_N, KS_braceright,
-KC(51), KS_comma, KS_question, KS_semicolon,
-KC(52), KS_period, KS_colon,
-KC(53), KS_minus, KS_underscore, KS_asterisk,
-KC(86), KS_iacute, KS_Iacute, KS_less,
-KC(184), KS_Mode_switch, KS_Multi_key,
-};
-
static const keysym_t pckbd_keydesc_us_declk[] = {
/* pos normal shifted altgr shift-altgr */
KC(1), KS_grave, KS_asciitilde, /* replace escape */
@@ -670,7 +632,6 @@
KBD_MAP(KB_ES , KB_US, pckbd_keydesc_es),
KBD_MAP(KB_PT, KB_US, pckbd_keydesc_pt),
KBD_MAP(KB_GR, KB_US, pckbd_keydesc_gr),
- KBD_MAP(KB_HU, KB_US, pckbd_keydesc_hu),
#endif /* WSKBD_USONLY */
/* placeholders */
CVS commit: src/external/bsd/am-utils/dist/include
Module Name:src Committed By: christos Date: Wed Oct 28 15:00:26 UTC 2009 Modified Files: src/external/bsd/am-utils/dist/include: am_defs.h Log Message: Bring in the proper fix from upstream. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/include/am_defs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/am-utils/dist/include/am_defs.h diff -u src/external/bsd/am-utils/dist/include/am_defs.h:1.2 src/external/bsd/am-utils/dist/include/am_defs.h:1.3 --- src/external/bsd/am-utils/dist/include/am_defs.h:1.2 Wed Oct 28 09:08:45 2009 +++ src/external/bsd/am-utils/dist/include/am_defs.h Wed Oct 28 11:00:26 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: am_defs.h,v 1.2 2009/10/28 13:08:45 christos Exp $ */ +/* $NetBSD: am_defs.h,v 1.3 2009/10/28 15:00:26 christos Exp $ */ /* * Copyright (c) 1997-2009 Erez Zadok @@ -321,17 +321,6 @@ # include mntent.h #endif /* HAVE_MNTENT_H */ -/* - * Actions to take if sys/errno.h exists. - */ -#ifdef HAVE_SYS_ERRNO_H -# ifdef __NetBSD__ -# include errno.h -# else -# include sys/errno.h -extern int errno; -# endif -#endif /* HAVE_SYS_ERRNO_H */ /* * Actions to take if sys/fsid.h exists. @@ -937,6 +926,14 @@ */ #ifdef HAVE_ERRNO_H # include errno.h +#else +/* + * Actions to take if sys/errno.h exists. + */ +# ifdef HAVE_SYS_ERRNO_H +# include sys/errno.h +extern int errno; +# endif /* HAVE_SYS_ERRNO_H */ #endif /* HAVE_ERRNO_H */ /*
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: snj Date: Wed Oct 28 15:56:26 UTC 2009 Modified Files: src/games/fortune/datfiles: fortunes2 Log Message: Kill two duplicates. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/games/fortune/datfiles/fortunes2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes2 diff -u src/games/fortune/datfiles/fortunes2:1.34 src/games/fortune/datfiles/fortunes2:1.35 --- src/games/fortune/datfiles/fortunes2:1.34 Wed Oct 28 06:23:29 2009 +++ src/games/fortune/datfiles/fortunes2 Wed Oct 28 15:56:26 2009 @@ -851,19 +851,7 @@ It is even in a video game, said the master. And is the Tao in the DOS for a personal computer? The master coughed and shifted his position slightly. The lesson -is over for today., he said. - -- Geoffrey James, The Tao of Programming -% - A master was explaining the nature of the Tao to one of his novices, -The Tao is embodied in all software -- regardless of how insignificant, -said the master. - Is the Tao in a hand-held calculator? asked the novice. - It is, came the reply. - Is the Tao in a video game? continued the novice. - It is even in a video game, said the master. - And is the Tao in the DOS for a personal computer? - The master coughed and shifted his position slightly. The lesson is -over for today, he said. +is over for today, he said. -- Geoffrey James, The Tao of Programming % A MODERN FABLE @@ -51176,10 +51164,6 @@ you do it. -- Gandhi % -Whatever you do will be insignificant, -but it is very important that you do it. - -- Gandhi -% Whatever you may be sure of, be sure of this: that you are dreadfully like other people. -- James Russell Lowell, My Study Windows
CVS commit: src/sbin/veriexecctl
Module Name:src
Committed By: christos
Date: Wed Oct 28 17:25:44 UTC 2009
Modified Files:
src/sbin/veriexecctl: veriexecctl_conf.l
Log Message:
we don't need unput
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sbin/veriexecctl/veriexecctl_conf.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/veriexecctl/veriexecctl_conf.l
diff -u src/sbin/veriexecctl/veriexecctl_conf.l:1.12 src/sbin/veriexecctl/veriexecctl_conf.l:1.13
--- src/sbin/veriexecctl/veriexecctl_conf.l:1.12 Sun Aug 31 19:37:45 2008
+++ src/sbin/veriexecctl/veriexecctl_conf.l Wed Oct 28 13:25:44 2009
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: veriexecctl_conf.l,v 1.12 2008/08/31 23:37:45 dholland Exp $ */
+/* $NetBSD: veriexecctl_conf.l,v 1.13 2009/10/28 17:25:44 christos Exp $ */
/*-
* Copyright 2005 Elad Efrat e...@netbsd.org
@@ -40,6 +40,7 @@
#include veriexecctl_parse.h
+#define YY_NO_UNPUT
int yylex(void);
extern size_t line;
CVS commit: src
Module Name:src
Committed By: njoly
Date: Wed Oct 28 18:24:44 UTC 2009
Modified Files:
src/lib/libc/sys: flock.2
src/sys/kern: sys_descrip.c
Log Message:
Make flock(2) more robust to invalid operation, such as
(LOCK_EX|LOCK_SH).
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/sys/flock.2
cvs rdiff -u -r1.16 -r1.17 src/sys/kern/sys_descrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/sys/flock.2
diff -u src/lib/libc/sys/flock.2:1.19 src/lib/libc/sys/flock.2:1.20
--- src/lib/libc/sys/flock.2:1.19 Thu May 13 10:20:58 2004
+++ src/lib/libc/sys/flock.2 Wed Oct 28 18:24:44 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: flock.2,v 1.19 2004/05/13 10:20:58 wiz Exp $
+.\ $NetBSD: flock.2,v 1.20 2009/10/28 18:24:44 njoly Exp $
.\
.\ Copyright (c) 1983, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)flock.2 8.2 (Berkeley) 12/11/93
.\
-.Dd December 11, 1993
+.Dd October 26, 2009
.Dt FLOCK 2
.Os
.Sh NAME
@@ -136,7 +136,7 @@
.It Bq Er EINVAL
The argument
.Fa operation
-does not include one of
+does not include exactly one of
.Dv LOCK_EX ,
.Dv LOCK_SH
or
Index: src/sys/kern/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.16 src/sys/kern/sys_descrip.c:1.17
--- src/sys/kern/sys_descrip.c:1.16 Wed Jun 10 23:48:10 2009
+++ src/sys/kern/sys_descrip.c Wed Oct 28 18:24:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_descrip.c,v 1.16 2009/06/10 23:48:10 yamt Exp $ */
+/* $NetBSD: sys_descrip.c,v 1.17 2009/10/28 18:24:44 njoly Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_descrip.c,v 1.16 2009/06/10 23:48:10 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_descrip.c,v 1.17 2009/10/28 18:24:44 njoly Exp $);
#include sys/param.h
#include sys/systm.h
@@ -585,21 +585,25 @@
lf.l_whence = SEEK_SET;
lf.l_start = 0;
lf.l_len = 0;
- if (how LOCK_UN) {
+
+ switch (how ~LOCK_NB) {
+ case LOCK_UN:
lf.l_type = F_UNLCK;
atomic_and_uint(fp-f_flag, ~FHASLOCK);
error = VOP_ADVLOCK(vp, fp, F_UNLCK, lf, F_FLOCK);
fd_putfile(fd);
return error;
- }
- if (how LOCK_EX) {
+ case LOCK_EX:
lf.l_type = F_WRLCK;
- } else if (how LOCK_SH) {
+ break;
+ case LOCK_SH:
lf.l_type = F_RDLCK;
- } else {
+ break;
+ default:
fd_putfile(fd);
return EINVAL;
}
+
atomic_or_uint(fp-f_flag, FHASLOCK);
p = curproc;
if (how LOCK_NB) {
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: snj Date: Wed Oct 28 19:18:15 UTC 2009 Modified Files: src/games/fortune/datfiles: fortunes2 Log Message: Fix a bunch of typos and spelling errors. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/games/fortune/datfiles/fortunes2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes2 diff -u src/games/fortune/datfiles/fortunes2:1.35 src/games/fortune/datfiles/fortunes2:1.36 --- src/games/fortune/datfiles/fortunes2:1.35 Wed Oct 28 15:56:26 2009 +++ src/games/fortune/datfiles/fortunes2 Wed Oct 28 19:18:15 2009 @@ -1610,7 +1610,7 @@ She's a women who conks to stupor. Upon reading a story about a man who throttled his mother-in-law, a man commented, Sounds to me like a practical choker. - It's not the inital skirt length, it's the upcreep. + It's not the initial skirt length, it's the upcreep. It's the theory of Jess Birnbaum, of Time magazine, that women with bad legs should stick to long skirts because they cover a multitude of shins. % @@ -1627,7 +1627,7 @@ Congratulations, Herr d'Albert; you have rarely introduced me to so charming a wife. % - Everthing is farther away than it used to be. It is even twice as + Everything is farther away than it used to be. It is even twice as far to the corner and they have added a hill. I have given up running for the bus; it leaves earlier than it used to. It seems to me they are making the stairs steeper than in the old @@ -3616,7 +3616,7 @@ win through and still know where his towel is, is clearly a man to be reckoned with. % - The Hitchiker's Guide to the Galaxy has a few things to say on + The Hitchhiker's Guide to the Galaxy has a few things to say on the subject of towels. A towel, it says, is about the most massively useful thing an interstellar hitchhiker can have. Partly it has great practical value. @@ -3873,7 +3873,7 @@ Suckin' them a leapy type, suckin' them flunkers. Look at them toad suckers, ain't they snappy? -Suckin' them bog frogs sure make's 'em happy! +Suckin' them bog frogs sure makes 'em happy! Them hugger mugger toad suckers, way down south, Stickin' them sucky toads in they mouth! @@ -4009,7 +4009,7 @@ off the tin cans by throwing them against the wall. She was developing a good pitching arm and a new quantum theory. The mathematician had stacked the unopened cans into a surprising -solution to the kissing problem; his dessiccated corpse was propped calmly +solution to the kissing problem; his desiccated corpse was propped calmly against a wall, and this was inscribed on the floor: Theorem: If I can't open these cans, I'll die. Proof: assume the opposite... @@ -4743,7 +4743,7 @@ *** *** * - ** Confucious say: Is stuffy inside fortune cookie. + ** Confucius say: Is stuffy inside fortune cookie. *** *** % @@ -5122,7 +5122,7 @@ diversion renders John a hebetudinous fellow. -- A revolving concretion of earthy or mineral matter accumulates no congeries of small, green bryophytic plant. --- Abstention from any aleatory undertaking precludes a potential escallation +-- Abstention from any aleatory undertaking precludes a potential escalation of a lucrative nature. -- Missiles of ligneous or osteal consistency have the potential of fracturing osseous structure, but appellations will eternally remain innocuous. @@ -5137,7 +5137,7 @@ -- The person presenting the ultimate cachinnation possesses thereby the optimal cachinnation. -- Abstention from any aleatory undertaking precludes a potential - escallation of a lucrative nature. + escalation of a lucrative nature. -- Missiles of ligneous or osteal consistency have the potential of fracturing osseous structure, but appellations will eternally remain innocuous. @@ -5347,7 +5347,7 @@ % 1 + 1 = 3, for large values of 1. % -1. If it doesn't smell like chilli, it probably isn't. +1. If it doesn't smell like chili, it probably isn't. 2. If you catch an exploding manhole cover, you can keep it. 3. Cabs driving on the sidewalk are not permitted to pick up passengers. 4. It's bad manners to lie down inside someone else's chalk body outline. @@ -5492,7 +5492,7 @@ 1/2 oz. gin 1/2 oz. vodka 1/2 oz. rum (preferably dark) -3/4 oz. tequilla +3/4 oz. tequila 1/2 oz. triple sec 1/2 oz. orange juice 3/4 oz. sour mix @@ -5834,7 +5834,7 @@ and a moonlit night. One day he brought to Tortue a piece of string, and asked the same question. In reply, the Grand Tortue grasped the loop between his feet and, with a few simple manipulations, created a complex -string which he proferred wordlessly to the monk. At that moment, the monk +string which he proffered wordlessly to the monk. At that moment, the monk was enlightened. From then on, the monk did not bother Tortue. Instead, he made string after @@
CVS commit: src/usr.bin/m4
Module Name:src
Committed By: christos
Date: Wed Oct 28 21:42:47 UTC 2009
Modified Files:
src/usr.bin/m4: tokenizer.l
Log Message:
more no unput
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/m4/tokenizer.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/m4/tokenizer.l
diff -u src/usr.bin/m4/tokenizer.l:1.2 src/usr.bin/m4/tokenizer.l:1.3
--- src/usr.bin/m4/tokenizer.l:1.2 Mon Oct 26 17:11:28 2009
+++ src/usr.bin/m4/tokenizer.l Wed Oct 28 17:42:47 2009
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: tokenizer.l,v 1.2 2009/10/26 21:11:28 christos Exp $ */
+/* $NetBSD: tokenizer.l,v 1.3 2009/10/28 21:42:47 christos Exp $ */
/* $OpenBSD: tokenizer.l,v 1.6 2008/08/21 21:00:14 espie Exp $ */
/*
* Copyright (c) 2004 Marc Espie es...@cvs.openbsd.org
@@ -20,7 +20,7 @@
#include nbtool_config.h
#endif
#include parser.h
-__RCSID($NetBSD: tokenizer.l,v 1.2 2009/10/26 21:11:28 christos Exp $);
+__RCSID($NetBSD: tokenizer.l,v 1.3 2009/10/28 21:42:47 christos Exp $);
#include stdlib.h
#include errno.h
#include stdint.h
@@ -33,6 +33,8 @@
int32_t number(void);
int32_t parse_radix(void);
+
+#define YY_NO_UNPUT
%}
delim [ \t\n]
CVS commit: src/usr.sbin/envstat
Module Name:src Committed By: christos Date: Wed Oct 28 22:37:50 UTC 2009 Modified Files: src/usr.sbin/envstat: config_lex.l Log Message: no unput To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/envstat/config_lex.l Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/envstat/config_lex.l diff -u src/usr.sbin/envstat/config_lex.l:1.4 src/usr.sbin/envstat/config_lex.l:1.5 --- src/usr.sbin/envstat/config_lex.l:1.4 Fri Aug 22 07:27:50 2008 +++ src/usr.sbin/envstat/config_lex.l Wed Oct 28 18:37:50 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: config_lex.l,v 1.4 2008/08/22 11:27:50 pgoyette Exp $ */ +/* $NetBSD: config_lex.l,v 1.5 2009/10/28 22:37:50 christos Exp $ */ /*- * Copyright (c) 2007 Juan Romero Pardines. @@ -29,7 +29,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: config_lex.l,v 1.4 2008/08/22 11:27:50 pgoyette Exp $); +__RCSID($NetBSD: config_lex.l,v 1.5 2009/10/28 22:37:50 christos Exp $); #endif /* not lint */ #include stdio.h @@ -42,6 +42,8 @@ extern int yyerror(const char *, ...); int yylex(void); +#define YY_NO_UNPUT + %} %option noyywrap
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Oct 29 00:58:07 UTC 2009 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new yacc. To generate a diff of this commit: cvs rdiff -u -r1.729 -r1.730 src/doc/3RDPARTY cvs rdiff -u -r1.1313 -r1.1314 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.729 src/doc/3RDPARTY:1.730 --- src/doc/3RDPARTY:1.729 Mon Oct 26 18:40:50 2009 +++ src/doc/3RDPARTY Wed Oct 28 20:58:06 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.729 2009/10/26 22:40:50 snj Exp $ +# $NetBSD: 3RDPARTY,v 1.730 2009/10/29 00:58:06 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -166,8 +166,8 @@ Notes: Package: byacc -Version: 20080826 -Current Vers: 1.9 +Version: 20091028 +Current Vers: 20091028 Maintainer: Thomas Dickey dic...@invisible-island.net Archive Site: http://www.invisible-island.net/byacc/byacc.html Home Page: http://www.invisible-island.net/byacc/byacc.html @@ -175,9 +175,6 @@ Responsible: christos License: Public Domain Notes: -We haven't had a sync since 1993, the sources have diverged a lot -since then but there are a bunch of bug fixes we probably want to pull -in. Package: bzip2 Version: 1.0.5 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1313 src/doc/CHANGES:1.1314 --- src/doc/CHANGES:1.1313 Mon Oct 26 17:35:51 2009 +++ src/doc/CHANGES Wed Oct 28 20:58:06 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1313 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1314 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -431,3 +431,4 @@ routed(8): Merge 2.32 changes [christos 20091025] m4(1): Import the OpenBSD one since it implements features from gm4 that the new flex wants [christos 20091026] + yacc(1): Import byacc-20091028 [christos 20091028]
CVS commit: src/external/bsd
Module Name:src
Committed By: christos
Date: Thu Oct 29 00:58:50 UTC 2009
Modified Files:
src/external/bsd: Makefile
Log Message:
add yacc
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.16 src/external/bsd/Makefile:1.17
--- src/external/bsd/Makefile:1.16 Mon Oct 26 17:38:32 2009
+++ src/external/bsd/Makefile Wed Oct 28 20:58:50 2009
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2009/10/26 21:38:32 christos Exp $
+# $NetBSD: Makefile,v 1.17 2009/10/29 00:58:50 christos Exp $
.include bsd.own.mk
-SUBDIR+= am-utils bind dhcpcd fetch file flex libarchive mdocml pkg_install top
+SUBDIR+= am-utils bind dhcpcd fetch file flex libarchive mdocml pkg_install \
+ top yacc
.if (${MKATF} != no)
SUBDIR+= atf
.endif
CVS commit: src/usr.bin
Module Name:src
Committed By: christos
Date: Thu Oct 29 01:01:17 UTC 2009
Modified Files:
src/usr.bin: Makefile
Log Message:
unhook yacc
To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/usr.bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/Makefile
diff -u src/usr.bin/Makefile:1.182 src/usr.bin/Makefile:1.183
--- src/usr.bin/Makefile:1.182 Mon Oct 26 17:37:10 2009
+++ src/usr.bin/Makefile Wed Oct 28 21:01:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.182 2009/10/26 21:37:10 christos Exp $
+# $NetBSD: Makefile,v 1.183 2009/10/29 01:01:17 christos Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include bsd.own.mk
@@ -28,7 +28,7 @@
uniq units unvis unzip usbhidaction usbhidctl users utoppya \
uudecode uuencode uuidgen vacation vgrind vis vmstat vndcompress w \
wall wc what whatis whereis who whois window \
- write xargs xinstall xlint xstr yacc yes
+ write xargs xinstall xlint xstr yes
.if (${MKHESIOD} != no)
SUBDIR+= hesinfo
CVS commit: src/tools/yacc
Module Name:src
Committed By: christos
Date: Thu Oct 29 01:01:27 UTC 2009
Modified Files:
src/tools/yacc: Makefile
Log Message:
use new yacc
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tools/yacc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/yacc/Makefile
diff -u src/tools/yacc/Makefile:1.4 src/tools/yacc/Makefile:1.5
--- src/tools/yacc/Makefile:1.4 Sun Dec 8 15:20:06 2002
+++ src/tools/yacc/Makefile Wed Oct 28 21:01:27 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2002/12/08 20:20:06 thorpej Exp $
+# $NetBSD: Makefile,v 1.5 2009/10/29 01:01:27 christos Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}yacc
-HOST_SRCDIR= usr.bin/yacc
+HOST_SRCDIR= external/bsd/byacc/bin
.include ${.CURDIR}/../Makefile.host
CVS commit: src/external/bsd/byacc/dist
Module Name:src
Committed By: christos
Date: Thu Oct 29 01:04:17 UTC 2009
Modified Files:
src/external/bsd/byacc/dist: main.c
Log Message:
fix dangling else
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/byacc/dist/main.c
diff -u src/external/bsd/byacc/dist/main.c:1.2 src/external/bsd/byacc/dist/main.c:1.3
--- src/external/bsd/byacc/dist/main.c:1.2 Wed Oct 28 20:56:20 2009
+++ src/external/bsd/byacc/dist/main.c Wed Oct 28 21:04:17 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: main.c,v 1.2 2009/10/29 00:56:20 christos Exp $ */
+/* $NetBSD: main.c,v 1.3 2009/10/29 01:04:17 christos Exp $ */
/* Id: main.c,v 1.23 2009/10/27 09:06:44 tom Exp */
#include defs.h
#include sys/cdefs.h
-__RCSID($NetBSD: main.c,v 1.2 2009/10/29 00:56:20 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.3 2009/10/29 01:04:17 christos Exp $);
#include signal.h
#include unistd.h /* for _exit() */
@@ -395,9 +395,9 @@
free(defines_file_name);
defines_file_name = 0;
}
+ } else {
+ CREATE_FILE_NAME(defines_file_name, defines_suffix);
}
-} else {
- CREATE_FILE_NAME(defines_file_name, defines_suffix);
}
if (vflag)
CVS commit: src/external/bsd
Module Name:src
Committed By: christos
Date: Thu Oct 29 01:07:00 UTC 2009
Modified Files:
src/external/bsd: Makefile
Log Message:
give yacc's proper name
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.17 src/external/bsd/Makefile:1.18
--- src/external/bsd/Makefile:1.17 Wed Oct 28 20:58:50 2009
+++ src/external/bsd/Makefile Wed Oct 28 21:07:00 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2009/10/29 00:58:50 christos Exp $
+# $NetBSD: Makefile,v 1.18 2009/10/29 01:07:00 christos Exp $
.include bsd.own.mk
SUBDIR+= am-utils bind dhcpcd fetch file flex libarchive mdocml pkg_install \
- top yacc
+ top byacc
.if (${MKATF} != no)
SUBDIR+= atf
.endif
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Thu Oct 29 01:16:51 UTC 2009 Modified Files: src/external/bsd/byacc/dist: skeleton.c Log Message: take care of libc. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/skeleton.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/byacc/dist/skeleton.c diff -u src/external/bsd/byacc/dist/skeleton.c:1.2 src/external/bsd/byacc/dist/skeleton.c:1.3 --- src/external/bsd/byacc/dist/skeleton.c:1.2 Wed Oct 28 20:56:20 2009 +++ src/external/bsd/byacc/dist/skeleton.c Wed Oct 28 21:16:51 2009 @@ -1,10 +1,10 @@ -/* $NetBSD: skeleton.c,v 1.2 2009/10/29 00:56:20 christos Exp $ */ +/* $NetBSD: skeleton.c,v 1.3 2009/10/29 01:16:51 christos Exp $ */ /* Id: skeleton.c,v 1.19 2008/12/24 14:52:28 tom Exp */ #include defs.h #include sys/cdefs.h -__RCSID($NetBSD: skeleton.c,v 1.2 2009/10/29 00:56:20 christos Exp $); +__RCSID($NetBSD: skeleton.c,v 1.3 2009/10/29 01:16:51 christos Exp $); /* The definition of yysccsid in the banner should be replaced with */ /* a #pragma ident directive if the target C compiler supports */ @@ -24,6 +24,9 @@ static const char yysccsid[] = \@(#)yaccpar 1.9 (Berkeley) 02/21/93\;, #endif, , +#ifdef _LIBC, +#include \namespace.h\, +#endif, #include stdlib.h, #include string.h, ,
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Thu Oct 29 01:52:01 UTC 2009 Modified Files: src/lib/libc/sys: flock.2 Log Message: Sort ERRORS. Add comma in enumeration. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/sys/flock.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/flock.2 diff -u src/lib/libc/sys/flock.2:1.20 src/lib/libc/sys/flock.2:1.21 --- src/lib/libc/sys/flock.2:1.20 Wed Oct 28 18:24:44 2009 +++ src/lib/libc/sys/flock.2 Thu Oct 29 01:52:01 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: flock.2,v 1.20 2009/10/28 18:24:44 njoly Exp $ +.\ $NetBSD: flock.2,v 1.21 2009/10/29 01:52:01 wiz Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -129,18 +129,18 @@ The argument .Fa fd is an invalid descriptor. -.It Bq Er EOPNOTSUPP -The argument -.Fa fd -refers to an object other than a file. .It Bq Er EINVAL The argument .Fa operation does not include exactly one of .Dv LOCK_EX , -.Dv LOCK_SH +.Dv LOCK_SH , or .Dv LOCK_UN . +.It Bq Er EOPNOTSUPP +The argument +.Fa fd +refers to an object other than a file. .El .Sh SEE ALSO .Xr close 2 ,
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Thu Oct 29 01:52:40 UTC 2009 Modified Files: src/share/man/man9: callback.9 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/callback.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/callback.9 diff -u src/share/man/man9/callback.9:1.3 src/share/man/man9/callback.9:1.4 --- src/share/man/man9/callback.9:1.3 Wed Oct 28 18:20:41 2009 +++ src/share/man/man9/callback.9 Thu Oct 29 01:52:39 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: callback.9,v 1.3 2009/10/28 18:20:41 njoly Exp $ +.\ $NetBSD: callback.9,v 1.4 2009/10/29 01:52:39 wiz Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 6, 2009 +.Dd October 28, 2009 .Dt CALLBACK 9 .Os .Sh NAME
CVS commit: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Thu Oct 29 02:02:04 UTC 2009 Modified Files: src/external/bsd/byacc/dist: skeleton.c Log Message: move the declaration below the rename defines. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/skeleton.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/byacc/dist/skeleton.c diff -u src/external/bsd/byacc/dist/skeleton.c:1.3 src/external/bsd/byacc/dist/skeleton.c:1.4 --- src/external/bsd/byacc/dist/skeleton.c:1.3 Wed Oct 28 21:16:51 2009 +++ src/external/bsd/byacc/dist/skeleton.c Wed Oct 28 22:02:04 2009 @@ -1,10 +1,10 @@ -/* $NetBSD: skeleton.c,v 1.3 2009/10/29 01:16:51 christos Exp $ */ +/* $NetBSD: skeleton.c,v 1.4 2009/10/29 02:02:04 christos Exp $ */ /* Id: skeleton.c,v 1.19 2008/12/24 14:52:28 tom Exp */ #include defs.h #include sys/cdefs.h -__RCSID($NetBSD: skeleton.c,v 1.3 2009/10/29 01:16:51 christos Exp $); +__RCSID($NetBSD: skeleton.c,v 1.4 2009/10/29 02:02:04 christos Exp $); /* The definition of yysccsid in the banner should be replaced with */ /* a #pragma ident directive if the target C compiler supports */ @@ -55,8 +55,6 @@ #define YYPARSE_DECL() yyparse(void), #endif /* YYPARSE_PARAM */, , -extern int YYPARSE_DECL();, -, static int yygrowstack(void);, 0 }; @@ -86,6 +84,8 @@ #include stdio.h, #endif, , +extern int YYPARSE_DECL();, +, /* define the initial stack-sizes */, #ifdef YYSTACKSIZE, #undef YYMAXDEPTH,
CVS commit: src/external/gpl2/xcvs/lib/libcvs
Module Name:src
Committed By: christos
Date: Thu Oct 29 02:36:48 UTC 2009
Modified Files:
src/external/gpl2/xcvs/lib/libcvs: Makefile
Log Message:
short-circuit yacc. We cannot make %pure-parser
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl2/xcvs/lib/libcvs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/xcvs/lib/libcvs/Makefile
diff -u src/external/gpl2/xcvs/lib/libcvs/Makefile:1.7 src/external/gpl2/xcvs/lib/libcvs/Makefile:1.8
--- src/external/gpl2/xcvs/lib/libcvs/Makefile:1.7 Sun Oct 18 21:24:19 2009
+++ src/external/gpl2/xcvs/lib/libcvs/Makefile Wed Oct 28 22:36:48 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/10/19 01:24:19 christos Exp $
+# $NetBSD: Makefile,v 1.8 2009/10/29 02:36:48 christos Exp $
LIBISPRIVATE= yes
@@ -9,6 +9,8 @@
DIST= ${IDIST}/lib
.PATH: ${DIST}
CPPFLAGS+=-I${DIST}
+.y.c .y.h:
+ @true
SRCS= __fpending.c asnprintf.c basename.c canon-host.c canonicalize.c \
chdir-long.c closeout.c cycle-check.c dirname.c dup-safer.c exitfail.c \
CVS commit: src/doc
Module Name:src Committed By: macallan Date: Thu Oct 29 03:38:11 UTC 2009 Modified Files: src/doc: CHANGES Log Message: mention pm2fb To generate a diff of this commit: cvs rdiff -u -r1.1314 -r1.1315 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1314 src/doc/CHANGES:1.1315 --- src/doc/CHANGES:1.1314 Thu Oct 29 00:58:06 2009 +++ src/doc/CHANGES Thu Oct 29 03:38:11 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1314 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1315 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -432,3 +432,5 @@ m4(1): Import the OpenBSD one since it implements features from gm4 that the new flex wants [christos 20091026] yacc(1): Import byacc-20091028 [christos 20091028] + pm2fb: A driver for Permedia2-based graphics cards like Sun's PGX32 + [macallan 20091028]
