CVS commit: src/share/mk

2015-09-07 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Mon Sep  7 06:42:07 UTC 2015

Modified Files:
src/share/mk: bsd.lib.mk

Log Message:
Order object build alphabetically.


To generate a diff of this commit:
cvs rdiff -u -r1.360 -r1.361 src/share/mk/bsd.lib.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.360 src/share/mk/bsd.lib.mk:1.361
--- src/share/mk/bsd.lib.mk:1.360	Wed Jul 29 14:35:04 2015
+++ src/share/mk/bsd.lib.mk	Mon Sep  7 06:42:07 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.360 2015/07/29 14:35:04 tsutsui Exp $
+#	$NetBSD: bsd.lib.mk,v 1.361 2015/09/07 06:42:07 uebayasi Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include 
@@ -559,15 +559,15 @@ __archivesymlinkpic: .USE
 DPSRCS+=	${_YLSRCS}
 CLEANFILES+=	${_YLSRCS}
 
-${STOBJS} ${POBJS} ${GOBJS} ${SOBJS} ${LOBJS}: ${DPSRCS}
+${STOBJS} ${POBJS} ${GOBJS} ${SOBJS} ${LOBJS}: ${DPSRCS:O}
 
-${_LIB.a}:: ${STOBJS} __archivebuild
+${_LIB.a}:: ${STOBJS:O} __archivebuild
 
-${_LIB_p.a}:: ${POBJS} __archivebuild
+${_LIB_p.a}:: ${POBJS:O} __archivebuild
 
-${_LIB_pic.a}:: ${SOBJS} __archivebuild
+${_LIB_pic.a}:: ${SOBJS:O} __archivebuild
 
-${_LIB_g.a}:: ${GOBJS} __archivebuild
+${_LIB_g.a}:: ${GOBJS:O} __archivebuild
 
 
 _LIBLDOPTS=



CVS commit: src/doc

2015-09-07 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Mon Sep  7 10:35:10 UTC 2015

Modified Files:
src/doc: 3RDPARTY

Log Message:
postfix-3.0.2 out.


To generate a diff of this commit:
cvs rdiff -u -r1.1251 -r1.1252 src/doc/3RDPARTY

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.1251 src/doc/3RDPARTY:1.1252
--- src/doc/3RDPARTY:1.1251	Fri Sep  4 12:27:36 2015
+++ src/doc/3RDPARTY	Mon Sep  7 10:35:10 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1251 2015/09/04 12:27:36 roy Exp $
+#	$NetBSD: 3RDPARTY,v 1.1252 2015/09/07 10:35:10 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1141,7 +1141,7 @@ now to do a new import.
 
 Package:	Postfix
 Version:	2.11.4
-Current Vers:	3.0
+Current Vers:	3.0.2
 Maintainer:	Wietse Venema 
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/



CVS commit: src/usr.bin/calendar/calendars

2015-09-07 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Mon Sep  7 12:20:32 UTC 2015

Modified Files:
src/usr.bin/calendar/calendars: calendar.netbsd

Log Message:
Add pkgsrc/Bitrig


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/calendar/calendars/calendar.netbsd

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/calendar/calendars/calendar.netbsd
diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.33 src/usr.bin/calendar/calendars/calendar.netbsd:1.34
--- src/usr.bin/calendar/calendars/calendar.netbsd:1.33	Fri Aug 21 02:32:24 2015
+++ src/usr.bin/calendar/calendars/calendar.netbsd	Mon Sep  7 12:20:32 2015
@@ -50,6 +50,7 @@
 05/28   NetBSD/ofppc port started, 1998
 05/29   NetBSD 1.3.2 released, 1998
 05/31   NetBSD/pmppc port started, 2002
+06/04   pkgsrc/Bitrig support added, 2015
 06/05   NetBSD gets its own package system, 1997
 06/06   NetBSD/hp700 port started, 2002
 06/09   NetBSD/netwinder port started, 2001



CVS commit: src/sys/dev/pci

2015-09-07 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Mon Sep  7 15:19:05 UTC 2015

Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h

Log Message:
- Check iNVM's image version and print it.
- Update TODO.


To generate a diff of this commit:
cvs rdiff -u -r1.346 -r1.347 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/if_wmreg.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.346 src/sys/dev/pci/if_wm.c:1.347
--- src/sys/dev/pci/if_wm.c:1.346	Mon Aug 17 06:16:03 2015
+++ src/sys/dev/pci/if_wm.c	Mon Sep  7 15:19:05 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.346 2015/08/17 06:16:03 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.347 2015/09/07 15:19:05 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -74,14 +74,16 @@
  *
  *	- Check XXX'ed comments
  *	- EEE (Energy Efficiency Ethernet)
- *	- MSI/MSI-X
+ *	- Multi queue
+ *	- Image Unique ID
+ *	- LPLU other than PCH*
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.346 2015/08/17 06:16:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.347 2015/09/07 15:19:05 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -723,6 +725,7 @@ static void	wm_nvm_release(struct wm_sof
 static int	wm_nvm_is_onboard_eeprom(struct wm_softc *);
 static int	wm_nvm_get_flash_presence_i210(struct wm_softc *);
 static int	wm_nvm_validate_checksum(struct wm_softc *);
+static void	wm_nvm_version_invm(struct wm_softc *);
 static void	wm_nvm_version(struct wm_softc *);
 static int	wm_nvm_read(struct wm_softc *, int, int, uint16_t *);
 
@@ -9753,6 +9756,26 @@ wm_nvm_validate_checksum(struct wm_softc
 }
 
 static void
+wm_nvm_version_invm(struct wm_softc *sc)
+{
+	uint32_t dword;
+
+	/*
+	 * Linux's code to decode version is very strange, so we don't
+	 * obey that algorithm and just use word 61 as the document.
+	 * Perhaps it's not perfect though...
+	 *
+	 * Example:
+	 *
+	 *   Word61: 00800030 -> Version 0.6 (I211 spec update notes about 0.6)
+	 */
+	dword = CSR_READ(sc, WM_INVM_DATA_REG(61));
+	dword = __SHIFTOUT(dword, INVM_VER_1);
+	sc->sc_nvm_ver_major = __SHIFTOUT(dword, INVM_MAJOR);
+	sc->sc_nvm_ver_minor = __SHIFTOUT(dword, INVM_MINOR);
+}
+
+static void
 wm_nvm_version(struct wm_softc *sc)
 {
 	uint16_t major, minor, build, patch;
@@ -9796,12 +9819,12 @@ wm_nvm_version(struct wm_softc *sc)
 			check_version = true;
 		break;
 	case WM_T_I211:
-		/* XXX wm_nvm_version_invm(sc); */
-		return;
+		wm_nvm_version_invm(sc);
+		goto printver;
 	case WM_T_I210:
 		if (!wm_nvm_get_flash_presence_i210(sc)) {
-			/* XXX wm_nvm_version_invm(sc); */
-			return;
+			wm_nvm_version_invm(sc);
+			goto printver;
 		}
 		/* FALLTHROUGH */
 	case WM_T_I350:
@@ -9824,12 +9847,14 @@ wm_nvm_version(struct wm_softc *sc)
 
 		/* Decimal */
 		minor = (minor / 16) * 10 + (minor % 16);
+		sc->sc_nvm_ver_major = major;
+		sc->sc_nvm_ver_minor = minor;
 
-		aprint_verbose(", version %d.%d", major, minor);
+printver:
+		aprint_verbose(", version %d.%d", sc->sc_nvm_ver_major,
+		sc->sc_nvm_ver_minor);
 		if (have_build)
 			aprint_verbose(".%d", build);
-		sc->sc_nvm_ver_major = major;
-		sc->sc_nvm_ver_minor = minor;
 	}
 	if (check_optionrom) {
 		wm_nvm_read(sc, NVM_OFF_COMB_VER_PTR, 1, );

Index: src/sys/dev/pci/if_wmreg.h
diff -u src/sys/dev/pci/if_wmreg.h:1.78 src/sys/dev/pci/if_wmreg.h:1.79
--- src/sys/dev/pci/if_wmreg.h:1.78	Sat Jun 13 15:47:58 2015
+++ src/sys/dev/pci/if_wmreg.h	Mon Sep  7 15:19:05 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wmreg.h,v 1.78 2015/06/13 15:47:58 msaitoh Exp $	*/
+/*	$NetBSD: if_wmreg.h,v 1.79 2015/09/07 15:19:05 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -1114,6 +1114,13 @@ struct livengood_tcpip_ctxdesc {
 #define INVM_AUTOLOAD		0x0a
 #define INVM_PLL_WO_VAL		0x0010
 
+/* Version and Image Type field */
+#define INVM_VER_1	__BITS(12,3)
+#define INVM_VER_2	__BITS(22,13)
+#define INVM_IMGTYPE	__BITS(28,23)
+#define INVM_MINOR	__BITS(3,0)
+#define INVM_MAJOR	__BITS(9,4)
+
 /* Word definitions for ID LED Settings */
 #define ID_LED_RESERVED_ 0x
 



CVS commit: src/sys/conf

2015-09-07 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Mon Sep  7 15:55:06 UTC 2015

Modified Files:
src/sys/conf: Makefile.kern.inc

Log Message:
Preserve the order of files in ${ALLFILES} -> ${OBJS} conversion.


To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 src/sys/conf/Makefile.kern.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.243 src/sys/conf/Makefile.kern.inc:1.244
--- src/sys/conf/Makefile.kern.inc:1.243	Sun Sep  6 15:20:59 2015
+++ src/sys/conf/Makefile.kern.inc	Mon Sep  7 15:55:06 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.243 2015/09/06 15:20:59 uebayasi Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.244 2015/09/07 15:55:06 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -265,34 +265,30 @@ SYSTEM_LD_TAIL_STAGE2+=	${SYSTEM_LD_TAIL
 ## (6) port independent targets and dependencies: assym.h, vers.o
 ##
 
+.if !defined(___USE_SUFFIX_RULES___)
+
+# Generate list of *.o files to pass to ${LD}, preserving order.
+#	x/y/z/a.[csS] -> a.[csS]
+#	a.[csS] -> a.o
+OBJS=	${ALLFILES:C|^.*/([^/]*\.[csS])$$|\1|:C|^(.*)\.[csS]$$|\1.o|}
+
 CFILES=	${ALLFILES:M*.c}
 SFILES=	${ALLFILES:M*.[sS]}
 OFILES=	${ALLFILES:M*.o}
-
-.if !defined(___USE_SUFFIX_RULES___)
-COBJS=	${CFILES:T:R:C|$|.o|}
-SOBJS=	${SFILES:T:R:C|$|.o|}
-OOBJS=	${OFILES}
 # absolute, generated (build directory), relative (under $S)
 _CFILES=${CFILES:M/*} ${CFILES:N/*:N*/*} ${CFILES:N/*:M*/*:C|^|$S/|}
 _SFILES=${SFILES:M/*} ${SFILES:N/*:N*/*} ${SFILES:N/*:M*/*:C|^|$S/|}
 _MD_CFILES=${MD_CFILES}
 _MD_SFILES=${MD_SFILES}
-.else
-COBJS=	${CFILES:R:C|$|.o|}
-SOBJS=	${SFILES:R:C|$|.o|}
-OOBJS=	${OFILES}
-_CFILES=${CFILES}
-_SFILES=${SFILES}
-_MD_CFILES=${MD_CFILES:C|^$S/||}
-_MD_SFILES=${MD_SFILES:C|^$S/||}
-.endif # ___USE_SUFFIX_RULES___
-
-OBJS=	${COBJS} ${SOBJS} ${OOBJS}
 CSRCS=	${_MD_CFILES} ${_CFILES}
 SSRCS=	${_MD_SFILES} ${_SFILES}
 SRCS=	${CSRCS} ${SSRCS}
 
+.else # ___USE_SUFFIX_RULES___
+OBJS=	${ALLFILES:C|\.[csS]$$|.o|}
+SRCS=	${ALLFILES:M*.[csS]}
+.endif # ___USE_SUFFIX_RULES___
+
 .if !defined(___USE_SUFFIX_RULES___)
 .for _s in ${_CFILES}
 .if !commands(${_s:T:R}.o)
@@ -354,9 +350,9 @@ dependall: depend .WAIT all
 MKDEP_AFLAGS?=	${AFLAGS}
 MKDEP_CFLAGS?=	${CFLAGS}
 .if !defined(___USE_SUFFIX_RULES___)
-DEPS=	${SRCS:T:u:R:S/$/.d/g}
+DEPS=	${SRCS:T:R:S/$/.d/g}
 .else
-DEPS=	${SRCS:u:R:S/$/.d/g}
+DEPS=	${SRCS:R:S/$/.d/g}
 .endif
 
 .if !defined(___USE_SUFFIX_RULES___)



CVS commit: src/lib/libform

2015-09-07 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Mon Sep  7 15:50:50 UTC 2015

Modified Files:
src/lib/libform: field.c form.h

Log Message:
Constify set_field_buffer.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libform/field.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libform/form.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libform/field.c
diff -u src/lib/libform/field.c:1.28 src/lib/libform/field.c:1.29
--- src/lib/libform/field.c:1.28	Sat Oct 18 08:33:23 2014
+++ src/lib/libform/field.c	Mon Sep  7 15:50:49 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: field.c,v 1.28 2014/10/18 08:33:23 snj Exp $	*/
+/*	$NetBSD: field.c,v 1.29 2015/09/07 15:50:49 joerg Exp $	*/
 /*-
  * Copyright (c) 1998-1999 Brett Lymn
  * (bl...@baea.com.au, brett_l...@yahoo.com.au)
@@ -29,7 +29,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: field.c,v 1.28 2014/10/18 08:33:23 snj Exp $");
+__RCSID("$NetBSD: field.c,v 1.29 2015/09/07 15:50:49 joerg Exp $");
 
 #include 
 #include 
@@ -409,7 +409,7 @@ set_field_printf(FIELD *field, int buffe
  */
 
 int
-set_field_buffer(FIELD *field, int buffer, char *value)
+set_field_buffer(FIELD *field, int buffer, const char *value)
 {
 	unsigned int len;
 	int status;

Index: src/lib/libform/form.h
diff -u src/lib/libform/form.h:1.22 src/lib/libform/form.h:1.23
--- src/lib/libform/form.h:1.22	Tue Nov 26 01:17:00 2013
+++ src/lib/libform/form.h	Mon Sep  7 15:50:49 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: form.h,v 1.22 2013/11/26 01:17:00 christos Exp $	*/
+/*	$NetBSD: form.h,v 1.23 2015/09/07 15:50:49 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1998-1999 Brett Lymn
@@ -349,7 +349,7 @@ int  post_form(FORM *);
 int  scale_form(FORM *, int *, int *);
 int  set_current_field(FORM *, FIELD *);
 int  set_field_back(FIELD *, chtype);
-int  set_field_buffer(FIELD *, int, char *);
+int  set_field_buffer(FIELD *, int, const char *);
 int  set_field_fore(FIELD *, chtype);
 int  set_field_init(FORM *, Form_Hook);
 int  set_field_just(FIELD *, int);



CVS commit: othersrc/external/bsd/netdiff/dist

2015-09-07 Thread Alistair G. Crooks
Module Name:othersrc
Committed By:   agc
Date:   Mon Sep  7 22:39:54 UTC 2015

Modified Files:
othersrc/external/bsd/netdiff/dist: diffreg.c

Log Message:
fgetpos(3) and fsetpos(3) may work on opaque types, so don't rely on
being able to set individual fields in the fpos_t struct. Instead, just
use the and ftell(3) and fseek(3) components.

Also define __UNCONST() if it's not already been defined. Just in case.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 othersrc/external/bsd/netdiff/dist/diffreg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/external/bsd/netdiff/dist/diffreg.c
diff -u othersrc/external/bsd/netdiff/dist/diffreg.c:1.11 othersrc/external/bsd/netdiff/dist/diffreg.c:1.12
--- othersrc/external/bsd/netdiff/dist/diffreg.c:1.11	Wed Jan 16 01:50:19 2013
+++ othersrc/external/bsd/netdiff/dist/diffreg.c	Mon Sep  7 22:39:54 2015
@@ -120,6 +120,10 @@ __FBSDID("$FreeBSD$");
 #define USE_ARG(x)		/*LINTED*/(void)&(x)
 #endif
 
+#ifndef __UNCONST
+#define __UNCONST(a)		((void *)(unsigned long)(const void *)(a))
+#endif
+
 #ifdef ST_MTIM_NSEC
 # define TIMESPEC_NS(timespec) ((timespec).ST_MTIM_NSEC)
 #else
@@ -398,28 +402,6 @@ diff_getc(diff_t *diff, file_t *f)
 	return DIFF_GET_FLAG(diff, 'i') ? tolower(ch) : ch;
 }
 
-static int
-diff_fgetpos(file_t *f, fpos_t *pos)
-{
-	if (f->mapped) {
-		pos->_pos = f->curpos;
-		return 0;
-	} else {
-		return fgetpos(f->fp, pos);
-	}
-}
-
-static int
-diff_fsetpos(file_t *f, const fpos_t *pos)
-{
-	if (f->mapped) {
-		f->curpos = pos->_pos;
-		return 0;
-	} else {
-		return fsetpos(f->fp, pos);
-	}
-}
-
 /*
  * Check to see if the given files differ.
  * Returns 0 if they are the same, 1 if different, and -1 on error.
@@ -771,7 +753,7 @@ check(diff_t *diff, stone_t *s, file_t *
 {
 	int	i, j, jackpot, c, d, spacecount;
 	int64_t	ct[2];
-	fpos_t position;
+	off_t	position;
 		
 	diff_fseek([0], 0, SEEK_SET);
 	diff_fseek([1], 0, SEEK_SET);
@@ -850,14 +832,14 @@ check(diff_t *diff, stone_t *s, file_t *
 			 * Checks if file1 has 8 consecutive spaces, which is 
 			 * equal to 1 tab.
 			 */
-			diff_fgetpos([0], );
+			position = diff_ftell([0]);
 			for (spacecount = 1; spacecount <= 8; spacecount++) {
 c = diff_getc(diff, [0]);
 if (c != ' ') {
 	break;
 }
 			}
-			diff_fsetpos([0], );
+			diff_fseek([0], position, SEEK_SET);
 			while (c == ' ' && spacecount == 9) {
 c = diff_getc(diff, [0]);
 ct[0]++;
@@ -868,14 +850,14 @@ check(diff_t *diff, stone_t *s, file_t *
 			 * Checks if file2 has 8 consecutive spaces, which is 
 			 * equal to 1 tab.
 			 */
-			diff_fgetpos([1], );
+			position = diff_ftell([1]);
 			for (spacecount = 1; spacecount <= 8; spacecount++) {
 d = diff_getc(diff, [1]);
 if (d != ' ') {
 	break;
 }
 			}
-			diff_fsetpos([1], );
+			diff_fseek([1], position, SEEK_SET);
 			while (d == ' ' && spacecount == 9) {
 d = diff_getc(diff, [1]);
 ct[1]++;



CVS commit: src/usr.bin/config

2015-09-07 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Tue Sep  8 00:53:39 UTC 2015

Modified Files:
src/usr.bin/config: TODO

Log Message:
${LD} input files and library (*.a) support.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/config/TODO

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/config/TODO
diff -u src/usr.bin/config/TODO:1.26 src/usr.bin/config/TODO:1.27
--- src/usr.bin/config/TODO:1.26	Thu Sep  3 05:45:16 2015
+++ src/usr.bin/config/TODO	Tue Sep  8 00:53:39 2015
@@ -221,6 +221,18 @@ o Always use explicit kernel linker scri
   because these have no constraints about page boundary; they map and access
   kernel .text/.data in the same way.
 
+o Pass input files to ${LD} via linker script.
+
+  Instead of passing input files on command-line, output "INPUT(xxx.o)"
+  commands, and include it from generated linker scripts.
+
+o Generate `*.d' files.
+
+  Output source/object files in raw texts instead of `Makefile'.  Generate
+  `*.d' (make(1) depend) files.  make(1) knows which object files are to be
+  compiled.  With "INPUT(xxx.o)" linker scripts, either generated `Makefile'
+  or `Makefile.kern.inc' don't need to keep source/object files in variables.
+
 o Control ELF sections using linker script.
 
   Now kernel is linked and built directly from object files (*.o).  Each port
@@ -420,3 +432,11 @@ o Define genassym(1) symbols per file.
   When one header is updated, only related *.assym.h files are regenerated,
   instead of rebuilding all MD/*.S files that depend on the global, single
   assym.h.
+
+o Support library.
+
+  Provide a consistent way to build library either as .o or .a.
+
+o Accept `.a' suffix.
+
+  Make "file" command accept `.a' suffix.  Handle it the same way as `.o'.



CVS commit: src/etc/etc.sandpoint

2015-09-07 Thread Frank Wille
Module Name:src
Committed By:   phx
Date:   Mon Sep  7 23:02:07 UTC 2015

Modified Files:
src/etc/etc.sandpoint: MAKEDEV.conf

Log Message:
Create /dev/flashN device nodes for all_md.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/etc/etc.sandpoint/MAKEDEV.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/etc.sandpoint/MAKEDEV.conf
diff -u src/etc/etc.sandpoint/MAKEDEV.conf:1.16 src/etc/etc.sandpoint/MAKEDEV.conf:1.17
--- src/etc/etc.sandpoint/MAKEDEV.conf:1.16	Thu Aug 16 13:31:26 2012
+++ src/etc/etc.sandpoint/MAKEDEV.conf	Mon Sep  7 23:02:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.16 2012/08/16 13:31:26 abs Exp $
+# $NetBSD: MAKEDEV.conf,v 1.17 2015/09/07 23:02:07 phx Exp $
 
 init)
 	makedev std bpf tty00 tty01 opty ptm pty0
@@ -14,6 +14,7 @@ all_md)
 	makedev	usbs
 	makedev scsibus0 scsibus1
 	makedev pci0 altq sysmon kttcp cfs satmgr
+	makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7
 	;;
 
 ramdisk|floppy)



CVS commit: src/tests/lib/libm

2015-09-07 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Tue Sep  8 05:24:27 UTC 2015

Modified Files:
src/tests/lib/libm: t_pow.c

Log Message:
Clear the XFAIL from PR 45391.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libm/t_pow.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libm/t_pow.c
diff -u src/tests/lib/libm/t_pow.c:1.3 src/tests/lib/libm/t_pow.c:1.4
--- src/tests/lib/libm/t_pow.c:1.3	Mon Mar  3 10:39:08 2014
+++ src/tests/lib/libm/t_pow.c	Tue Sep  8 05:24:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pow.c,v 1.3 2014/03/03 10:39:08 martin Exp $ */
+/* $NetBSD: t_pow.c,v 1.4 2015/09/08 05:24:27 dholland Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__RCSID("$NetBSD: t_pow.c,v 1.3 2014/03/03 10:39:08 martin Exp $");
+__RCSID("$NetBSD: t_pow.c,v 1.4 2015/09/08 05:24:27 dholland Exp $");
 
 #include 
 #include 
@@ -280,21 +280,18 @@ ATF_TC_BODY(pow_zero_x, tc)
 	z = pow(+0.0, -4.0);
 
 	if (z != HUGE_VAL) {
-		atf_tc_expect_fail("PR port-amd64/45391");
 		atf_tc_fail_nonfatal("pow(+0.0, -4.0) != HUGE_VAL");
 	}
 
 	z = pow(-0.0, -4.0);
 
 	if (z != HUGE_VAL) {
-		atf_tc_expect_fail("PR port-amd64/45391");
 		atf_tc_fail_nonfatal("pow(-0.0, -4.0) != HUGE_VAL");
 	}
 
 	z = pow(+0.0, -5.0);
 
 	if (z != HUGE_VAL) {
-		atf_tc_expect_fail("PR port-amd64/45391");
 		atf_tc_fail_nonfatal("pow(+0.0, -5.0) != HUGE_VAL");
 	}
 



CVS commit: src/lib/libm/src

2015-09-07 Thread David A. Holland
Module Name:src
Committed By:   dholland
Date:   Tue Sep  8 05:23:31 UTC 2015

Modified Files:
src/lib/libm/src: k_standard.c

Log Message:
Apply patch in PR 45391 from Yui NARUSE: generate HUGE_VAL rather than
-HUGE_VAL for 0^negative. No objection after asking nearly two years
ago if I shouldn't just commit it.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libm/src/k_standard.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/libm/src/k_standard.c
diff -u src/lib/libm/src/k_standard.c:1.19 src/lib/libm/src/k_standard.c:1.20
--- src/lib/libm/src/k_standard.c:1.19	Tue Nov 19 19:24:34 2013
+++ src/lib/libm/src/k_standard.c	Tue Sep  8 05:23:31 2015
@@ -12,7 +12,7 @@
 
 #include 
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: k_standard.c,v 1.19 2013/11/19 19:24:34 joerg Exp $");
+__RCSID("$NetBSD: k_standard.c,v 1.20 2015/09/08 05:23:31 dholland Exp $");
 #endif
 
 #include "math.h"
@@ -469,7 +469,7 @@ __kernel_standard(double x, double y, in
 		if (_LIB_VERSION == _SVID_)
 		  exc.retval = zero;
 		else
-		  exc.retval = -HUGE_VAL;
+		  exc.retval = HUGE_VAL;
 		if (_LIB_VERSION == _POSIX_)
 		  errno = EDOM;
 		else if (!matherr()) {



CVS commit: src/sys/arch/sandpoint/sandpoint

2015-09-07 Thread Frank Wille
Module Name:src
Committed By:   phx
Date:   Mon Sep  7 23:00:08 UTC 2015

Modified Files:
src/sys/arch/sandpoint/sandpoint: flash_cfi.c machdep.c mainbus.c

Log Message:
Fix nor-flash bus space: extent limit should not be zero and bus space is
definitely big-endian. Reading the flash via /dev/flash0 works now.
Writing is untested.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/sandpoint/flash_cfi.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sandpoint/sandpoint/machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sandpoint/sandpoint/mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sandpoint/sandpoint/flash_cfi.c
diff -u src/sys/arch/sandpoint/sandpoint/flash_cfi.c:1.3 src/sys/arch/sandpoint/sandpoint/flash_cfi.c:1.4
--- src/sys/arch/sandpoint/sandpoint/flash_cfi.c:1.3	Mon Jan 30 15:47:01 2012
+++ src/sys/arch/sandpoint/sandpoint/flash_cfi.c	Mon Sep  7 23:00:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_cfi.c,v 1.3 2012/01/30 15:47:01 phx Exp $ */
+/* $NetBSD: flash_cfi.c,v 1.4 2015/09/07 23:00:08 phx Exp $ */
 
 /*-
  * Copyright (c) 2011 Frank Wille.
@@ -32,7 +32,7 @@
  * NOR CFI driver support for sandpoint
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: flash_cfi.c,v 1.3 2012/01/30 15:47:01 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_cfi.c,v 1.4 2015/09/07 23:00:08 phx Exp $");
 
 #include 
 #include 
@@ -63,7 +63,7 @@ sandpointcfi_probe(device_t parent, cfda
 {
 	extern struct cfdriver cfi_cd;
 	struct mainbus_attach_args *ma = aux;
-	const bus_size_t tmpsize = CFI_QRY_MIN_MAP_SIZE;
+	const bus_size_t qrysize = CFI_QRY_MIN_MAP_SIZE;
 	struct cfi cfi;
 	int error, rv;
 
@@ -74,11 +74,12 @@ sandpointcfi_probe(device_t parent, cfda
 
 	cfi.cfi_bst = ma->ma_bst;
 
-	error = bus_space_map(cfi.cfi_bst, ma->ma_addr, tmpsize, 0,
+	/* flash should be at least 2 MiB in size at 0xffe0 */
+	error = bus_space_map(cfi.cfi_bst, 0xffe0, qrysize, 0,
 	_bsh);
 	if (error != 0) {
 		aprint_error("%s: cannot map %d at offset %#x, error %d\n",
-		__func__, tmpsize, ma->ma_addr, error);
+		__func__, qrysize, ma->ma_addr, error);
 		return 0;
 	}
 
@@ -90,7 +91,7 @@ sandpointcfi_probe(device_t parent, cfda
 	} else
 		rv = 1;
 
-	bus_space_unmap(cfi.cfi_bst, cfi.cfi_bsh, tmpsize);
+	bus_space_unmap(cfi.cfi_bst, cfi.cfi_bsh, qrysize);
 	return rv;
 }
 
@@ -99,7 +100,7 @@ sandpointcfi_attach(device_t parent, dev
 {
 	struct mainbus_attach_args *ma = aux;
 	struct sandpointcfi_softc *sc;
-	const bus_size_t tmpsize = CFI_QRY_MIN_MAP_SIZE;
+	const bus_size_t qrysize = CFI_QRY_MIN_MAP_SIZE;
 	bus_addr_t addr;
 	bool found;
 	int error;
@@ -112,7 +113,7 @@ sandpointcfi_attach(device_t parent, dev
 	sc->sc_cfi.cfi_bst = ma->ma_bst;
 
 	/* map enough to identify, remap later when size is known */
-	error = bus_space_map(sc->sc_cfi.cfi_bst, ma->ma_addr, tmpsize, 0,
+	error = bus_space_map(sc->sc_cfi.cfi_bst, 0xffe0, qrysize, 0,
 	>sc_cfi.cfi_bsh);
 	if (error != 0) {
 		aprint_error_dev(self, "could not map error %d\n", error);
@@ -122,7 +123,7 @@ sandpointcfi_attach(device_t parent, dev
 	/* identify the NOR flash */
 	found = cfi_identify(>sc_cfi);
 
-	bus_space_unmap(sc->sc_cfi.cfi_bst, sc->sc_cfi.cfi_bsh, tmpsize);
+	bus_space_unmap(sc->sc_cfi.cfi_bst, sc->sc_cfi.cfi_bsh, qrysize);
 	if (!found) {
 		/* should not happen, we already probed OK in match */
 		aprint_error_dev(self, "could not map error %d\n", error);
@@ -132,7 +133,7 @@ sandpointcfi_attach(device_t parent, dev
 	/* get size of flash in bytes */
 	sc->sc_size = 1 << sc->sc_cfi.cfi_qry_data.device_size;
 
-	/* real base address */
+	/* determine real base address */
 	addr = (0x - sc->sc_size) + 1;
 
 	sc->sc_nor_if = nor_interface_cfi;

Index: src/sys/arch/sandpoint/sandpoint/machdep.c
diff -u src/sys/arch/sandpoint/sandpoint/machdep.c:1.63 src/sys/arch/sandpoint/sandpoint/machdep.c:1.64
--- src/sys/arch/sandpoint/sandpoint/machdep.c:1.63	Sun Apr 21 15:42:12 2013
+++ src/sys/arch/sandpoint/sandpoint/machdep.c	Mon Sep  7 23:00:08 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.63 2013/04/21 15:42:12 kiyohara Exp $	*/
+/*	$NetBSD: machdep.c,v 1.64 2015/09/07 23:00:08 phx Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.63 2013/04/21 15:42:12 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.64 2015/09/07 23:00:08 phx Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -450,8 +450,8 @@ struct powerpc_bus_space sandpoint_eumb_
 	0xfc00, 0x, 0x0010,
 };
 struct powerpc_bus_space sandpoint_flash_space_tag = {
-	_BUS_SPACE_LITTLE_ENDIAN|_BUS_SPACE_MEM_TYPE,
-	0x, 0xff00, 0x,
+	_BUS_SPACE_BIG_ENDIAN|_BUS_SPACE_MEM_TYPE,
+	0x, 0xff00, 0x,
 };
 struct powerpc_bus_space sandpoint_nhgpio_space_tag = {
 	

CVS commit: src/sys/arch/sparc64/dev

2015-09-07 Thread Palle Lyckegaard
Module Name:src
Committed By:   palle
Date:   Tue Sep  8 04:04:33 UTC 2015

Modified Files:
src/sys/arch/sparc64/dev: vpci.c

Log Message:
Improve printout duing autoconfiguration


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/dev/vpci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/dev/vpci.c
diff -u src/sys/arch/sparc64/dev/vpci.c:1.3 src/sys/arch/sparc64/dev/vpci.c:1.4
--- src/sys/arch/sparc64/dev/vpci.c:1.3	Sun Sep  6 23:48:39 2015
+++ src/sys/arch/sparc64/dev/vpci.c	Tue Sep  8 04:04:33 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: vpci.c,v 1.3 2015/09/06 23:48:39 nakayama Exp $	*/
+/*	$NetBSD: vpci.c,v 1.4 2015/09/08 04:04:33 palle Exp $	*/
 /*
  * Copyright (c) 2015 Palle Lyckegaard
  * All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.3 2015/09/06 23:48:39 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.4 2015/09/08 04:04:33 palle Exp $");
 
 #include 
 #include 
@@ -233,6 +233,8 @@ FiXME	
 	for (int range = 0; range < nranges; range++)
 		DPRINTF(VDB_PROM, ("\nvpci_attach: bus-range %d %08x", range, busranges[range]));
 
+ 	aprint_normal(": bus %d to %d", busranges[0], busranges[1]);
+	
 	vpci_init_iommu(sc, pbm);
 
 	pbm->vp_memt = vpci_alloc_mem_tag(pbm);
@@ -304,6 +306,8 @@ vpci_init_iommu(struct vpci_softc *sc, s
 		free(vdma, M_DEVBUF);
 	} else
 		panic("vpci_init_iommu: getprop virtual-dma failed");
+
+ 	aprint_normal(" vdma %x length %x\n", iobase, iolen);
 	
 	/* We have no STC.  */
 	is->is_sb[0] = NULL;



CVS commit: src/sys/arch/sandpoint/conf

2015-09-07 Thread Frank Wille
Module Name:src
Committed By:   phx
Date:   Mon Sep  7 23:01:08 UTC 2015

Modified Files:
src/sys/arch/sandpoint/conf: GENERIC

Log Message:
Enable cfi/nor/flash devices as reading from flash seems to work now.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sandpoint/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.88 src/sys/arch/sandpoint/conf/GENERIC:1.89
--- src/sys/arch/sandpoint/conf/GENERIC:1.88	Sun Nov 16 16:01:42 2014
+++ src/sys/arch/sandpoint/conf/GENERIC	Mon Sep  7 23:01:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.88 2014/11/16 16:01:42 manu Exp $
+# $NetBSD: GENERIC,v 1.89 2015/09/07 23:01:08 phx Exp $
 #
 # machine description file for GENERIC NAS
 # 
@@ -22,7 +22,7 @@ include 	"arch/sandpoint/conf/std.sandpo
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.88 $"
+#ident 		"GENERIC-$Revision: 1.89 $"
 
 maxusers	32
 
@@ -173,9 +173,9 @@ config		netbsd	root on ? type ?
 mainbus0	at root
 cpu*		at mainbus0
 
-#cfi0		at mainbus0
-#nor*		at cfi?
-#flash*		at nor?
+cfi0		at mainbus0
+nor*		at cfi?
+flash*		at nor?
 
 nhpow0		at mainbus0			# NH230/231 power,LED,buttons
 



CVS commit: src/usr.bin/config

2015-09-07 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Tue Sep  8 02:23:34 UTC 2015

Modified Files:
src/usr.bin/config: TODO

Log Message:
${MD_OBJS} and friends.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/config/TODO

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/config/TODO
diff -u src/usr.bin/config/TODO:1.27 src/usr.bin/config/TODO:1.28
--- src/usr.bin/config/TODO:1.27	Tue Sep  8 00:53:39 2015
+++ src/usr.bin/config/TODO	Tue Sep  8 02:23:34 2015
@@ -440,3 +440,13 @@ o Support library.
 o Accept `.a' suffix.
 
   Make "file" command accept `.a' suffix.  Handle it the same way as `.o'.
+
+o Clean up ${MD_OBJS} and friends in Makefile.${MACHINE}.
+
+  Don't use ${MD_OBJS}, ${MD_LIBS}, ${MD_SFILES}, and ${MD_CFILES}.
+
+  List files in config(5)'s "file".  Override build rules only when neccesary.
+
+  Rely on the fact that config(1) parses files.${MACHINE} first, outputs
+  files in the order it parses files.* (actually include depth), and
+  `Makefile.kern.inc' preserve file order to pass to ${LD}.



CVS commit: src/usr.bin/config

2015-09-07 Thread Masao Uebayashi
Module Name:src
Committed By:   uebayasi
Date:   Tue Sep  8 05:48:07 UTC 2015

Modified Files:
src/usr.bin/config: TODO

Log Message:
About ${CTFCONVERT}.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/config/TODO

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/config/TODO
diff -u src/usr.bin/config/TODO:1.28 src/usr.bin/config/TODO:1.29
--- src/usr.bin/config/TODO:1.28	Tue Sep  8 02:23:34 2015
+++ src/usr.bin/config/TODO	Tue Sep  8 05:48:07 2015
@@ -450,3 +450,9 @@ o Clean up ${MD_OBJS} and friends in Mak
   Rely on the fact that config(1) parses files.${MACHINE} first, outputs
   files in the order it parses files.* (actually include depth), and
   `Makefile.kern.inc' preserve file order to pass to ${LD}.
+
+o Clean up CTF-related rules.
+
+  Don't overwrite compile/link rules conditionally by existence of
+  ${CTFCONVERT}/${CTFMERGE}.  Give a separate suffix (*.ctfo) and define its
+  rules (.c -> .ctfo).



CVS commit: src/sys/arch/sparc64/include

2015-09-07 Thread Palle Lyckegaard
Module Name:src
Committed By:   palle
Date:   Mon Sep  7 20:00:49 UTC 2015

Modified Files:
src/sys/arch/sparc64/include: cpu.h

Log Message:
Move function prototypes for cpu_ecache_associativity() and cpu_ecache_size() 
outside the MULTIPROCESSOR block so a GENERIC.UP kernel will build again


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/sparc64/include/cpu.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/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.117 src/sys/arch/sparc64/include/cpu.h:1.118
--- src/sys/arch/sparc64/include/cpu.h:1.117	Sun Sep  6 23:48:39 2015
+++ src/sys/arch/sparc64/include/cpu.h	Mon Sep  7 20:00:49 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.117 2015/09/06 23:48:39 nakayama Exp $ */
+/*	$NetBSD: cpu.h,v 1.118 2015/09/07 20:00:49 palle Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -263,6 +263,10 @@ void	cpu_pmap_init(struct cpu_info *);
 /* run upfront to prepare the cpu_info */
 void	cpu_pmap_prepare(struct cpu_info *, bool);
 
+/* Helper functions to retrieve cache info */
+int	cpu_ecache_associativity(int node);
+int	cpu_ecache_size(int node);
+
 #if defined(MULTIPROCESSOR)
 extern vaddr_t cpu_spinup_trampoline;
 
@@ -275,10 +279,6 @@ extern  u_long  mp_tramp_ci;
 void	cpu_hatch(void);
 void	cpu_boot_secondary_processors(void);
 
-/* Helper functions to retrieve cache info */
-int	cpu_ecache_associativity(int node);
-int	cpu_ecache_size(int node);
-
 /*
  * Call a function on other cpus:
  *	multicast - send to everyone in the sparc64_cpuset_t



CVS commit: src/usr.bin/calendar/calendars

2015-09-07 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Mon Sep  7 12:29:19 UTC 2015

Modified Files:
src/usr.bin/calendar/calendars: calendar.netbsd

Log Message:
Switch from a mixture of tabs & 3 spaces to a single style, 3 spaces


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/calendar/calendars/calendar.netbsd

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/calendar/calendars/calendar.netbsd
diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.34 src/usr.bin/calendar/calendars/calendar.netbsd:1.35
--- src/usr.bin/calendar/calendars/calendar.netbsd:1.34	Mon Sep  7 12:20:32 2015
+++ src/usr.bin/calendar/calendars/calendar.netbsd	Mon Sep  7 12:29:19 2015
@@ -8,10 +8,10 @@
 01/27   NetBSD 6.0.4 released, 2014
 01/27   NetBSD 6.1.3 released, 2014
 01/31   NetBSD/shark port started, 1996
-02/02	NetBSD 5.1.2 released, 2012
+02/02   NetBSD 5.1.2 released, 2012
 02/06   NetBSD/evbsh3 port started, 2001
 02/11   NetBSD/sandpoint port started, 2001
-02/12	NetBSD 5.0.2 released, 2010
+02/12   NetBSD 5.0.2 released, 2010
 02/13   NetBSD/alpha port started, 1995
 02/18   NetBSD/newsmips port started, 1998
 02/20   NetBSD/hpcarm port started, 2001
@@ -64,9 +64,9 @@
 07/05   NetBSD/evbsh5 port started, 2002
 07/11   NetBSD 1.5.1 released, 2001
 07/22   NetBSD 1.5.3 released, 2002
-07/24	NetBSD 3.0.1 released, 2006
+07/24   NetBSD 3.0.1 released, 2006
 07/25   NetBSD/mvme68k port started, 1995
-08/02	NetBSD 5.0.1 released, 2009
+08/02   NetBSD 5.0.1 released, 2009
 08/02   NetBSD/vax port started, 1994
 08/12   NetBSD/mipsco port started, 2000
 08/20   pkgsrc forked from FreeBSD Ports, 1997
@@ -78,34 +78,34 @@
 09/09   NetBSD/pc532 port started, 1993
 09/13   NetBSD 1.5.2 released, 2001
 09/14   NetBSD 1.6 released, 2002
-09/22	NetBSD 6.0.6 released, 2014
-09/22	NetBSD 6.1.5 released, 2014
+09/22   NetBSD 6.0.6 released, 2014
+09/22   NetBSD 6.1.5 released, 2014
 09/25   NetBSD/hpcmips port started, 1999
-09/28	NetBSD 5.1.3 released, 2013
-09/28	NetBSD 5.2.1 released, 2013
+09/28   NetBSD 5.1.3 released, 2013
+09/28   NetBSD 5.2.1 released, 2013
 09/29   NetBSD/mac68k port started, 1993
-09/30	NetBSD 6.0.3 released, 2013
-09/30	NetBSD 6.1.2 released, 2013
+09/30   NetBSD 6.0.3 released, 2013
+09/30   NetBSD 6.1.2 released, 2013
 10/02   NetBSD/sparc port started, 1993
 10/04   NetBSD 1.2 released, 1996
 10/05   NetBSD/cats port started, 1998
 10/12   NetBSD/pmax port started, 1993
 10/13   NetBSD/iyonix port started, 2004
-10/14	NetBSD 4.0.1 released, 2008
+10/14   NetBSD 4.0.1 released, 2008
 10/14   NetBSD/bebox port started, 1997
 10/16   NetBSD/playstation2 port started, 2001
 10/17   NetBSD 6.0 released, 2012
 10/26   NetBSD 1.0 released, 1994
 10/30   pkgsrc/Darwin support added, 2001
-10/31	NetBSD 2.0.3 released, 2005
+10/31   NetBSD 2.0.3 released, 2005
 11/02   NetBSD 2.1 released, 2005
-11/04	NetBSD 3.0.2 released, 2006
+11/04   NetBSD 3.0.2 released, 2006
 11/04   NetBSD 3.1 released, 2006
-11/15	NetBSD 5.1.5 released, 2014
-11/15	NetBSD 5.2.3 released, 2014
+11/15   NetBSD 5.1.5 released, 2014
+11/15   NetBSD 5.2.3 released, 2014
 11/17   pkgsrc/FreeBSD support added, 2002
 11/18   NetBSD/acorn32 port started, 2001
-11/19	NetBSD 5.1 released, 2010
+11/19   NetBSD 5.1 released, 2010
 11/20   pkgsrc/OSF1 support added, 2004
 11/25   NetBSD 1.4.3 released, 2000
 11/26   NetBSD 1.1 released, 1995
@@ -113,7 +113,7 @@
 12/02   pkgsrc/IRIX support added, 2002
 12/03   pkgsrc/AIX support added, 2003
 12/03   pkgsrc/BSDI support added, 2003
-12/03	NetBSD 5.2 released, 2012
+12/03   NetBSD 5.2 released, 2012
 12/06   NetBSD 1.5 released, 2000
 12/09   NetBSD 2.0 released, 2004
 12/09   NetBSD/news68k port started, 1999
@@ -122,5 +122,5 @@
 12/19   NetBSD 4.0 released, 2007
 12/23   NetBSD 1.3.3 released, 1998
 12/23   NetBSD 3.0 released, 2005
-12/26	NetBSD 6.0.1 released, 2012
+12/26   NetBSD 6.0.1 released, 2012
 12/29   NetBSD/ews4800mips port started, 2005