CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Wed Jan 13 08:05:58 UTC 2016 Modified Files: src/sys/arch/x86/x86: procfs_machdep.c Log Message: Use CPUID_TO_*() macros. This change fix a bug that /proc/cpuinfo's CPU model was incorrect on many newer CPUs and CPU family was incorrect on some AMD machines. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/x86/procfs_machdep.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/x86/x86/procfs_machdep.c diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.8 src/sys/arch/x86/x86/procfs_machdep.c:1.9 --- src/sys/arch/x86/x86/procfs_machdep.c:1.8 Wed Jan 13 07:28:56 2016 +++ src/sys/arch/x86/x86/procfs_machdep.c Wed Jan 13 08:05:58 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_machdep.c,v 1.8 2016/01/13 07:28:56 msaitoh Exp $ */ +/* $NetBSD: procfs_machdep.c,v 1.9 2016/01/13 08:05:58 msaitoh Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.8 2016/01/13 07:28:56 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.9 2016/01/13 08:05:58 msaitoh Exp $"); #include #include @@ -267,8 +267,8 @@ procfs_getonecpu(int xcpu, struct cpu_in "stepping\t: ", xcpu, (char *)ci->ci_vendor, - cpuid_level >= 0 ? ((ci->ci_signature >> 8) & 15) : cpu_class + 3, - cpuid_level >= 0 ? ((ci->ci_signature >> 4) & 15) : 0, + CPUID_TO_FAMILY(ci->ci_signature), + CPUID_TO_MODEL(ci->ci_signature), cpu_brand_string ); size += l; @@ -279,7 +279,8 @@ procfs_getonecpu(int xcpu, struct cpu_in left = 0; if (cpuid_level >= 0) - l = snprintf(p, left, "%d\n", ci->ci_signature & 15); + l = snprintf(p, left, "%d\n", + CPUID_TO_STEPPING(ci->ci_signature)); else l = snprintf(p, left, "unknown\n");
CVS commit: src/tests/fs/vfs
Module Name:src
Committed By: pooka
Date: Wed Jan 13 12:05:49 UTC 2016
Modified Files:
src/tests/fs/vfs: t_vnops.c
Log Message:
create_many: remove PR kern/50607 xfail
Seems to have been fixed by ext2fs_lookup.c 1.79
(thanks, riastradh)
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/tests/fs/vfs/t_vnops.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/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.52 src/tests/fs/vfs/t_vnops.c:1.53
--- src/tests/fs/vfs/t_vnops.c:1.52 Sat Jan 2 12:11:30 2016
+++ src/tests/fs/vfs/t_vnops.c Wed Jan 13 12:05:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.52 2016/01/02 12:11:30 pooka Exp $ */
+/* $NetBSD: t_vnops.c,v 1.53 2016/01/13 12:05:49 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -438,6 +438,7 @@ rename_reg_nodir(const atf_tc_t *tc, con
rump_sys_chdir("/");
}
+/* PR kern/50607 */
static void
create_many(const atf_tc_t *tc, const char *mp)
{
@@ -445,9 +446,6 @@ create_many(const atf_tc_t *tc, const ch
int nfiles = 2324; /* #Nancy */
int i;
- if (FSTYPE_EXT2FS(tc))
- atf_tc_expect_fail("PR kern/50607");
-
if (FSTYPE_UDF(tc))
atf_tc_expect_fail("PR kern/50608");
CVS commit: src/external/gpl2/gettext
Module Name:src
Committed By: christos
Date: Wed Jan 13 12:48:51 UTC 2016
Modified Files:
src/external/gpl2/gettext/bin/msgmerge: Makefile
src/external/gpl2/gettext/lib/libnlspr: Makefile
src/external/gpl2/gettext/lib/libnlsut: Makefile
Log Message:
fix for sun2; require libm only with msgmerge by linking fsearch with it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/gettext/bin/msgmerge/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/gettext/lib/libnlspr/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/gettext/lib/libnlsut/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/gettext/bin/msgmerge/Makefile
diff -u src/external/gpl2/gettext/bin/msgmerge/Makefile:1.1 src/external/gpl2/gettext/bin/msgmerge/Makefile:1.2
--- src/external/gpl2/gettext/bin/msgmerge/Makefile:1.1 Tue Jan 12 17:58:02 2016
+++ src/external/gpl2/gettext/bin/msgmerge/Makefile Wed Jan 13 07:48:51 2016
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2016/01/12 22:58:02 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/13 12:48:51 christos Exp $
PROG= msgmerge
+SRCS=msgmerge.c msgl-fsearch.c
LDADD+= -lm
DPADD+= ${LIBM}
Index: src/external/gpl2/gettext/lib/libnlspr/Makefile
diff -u src/external/gpl2/gettext/lib/libnlspr/Makefile:1.1 src/external/gpl2/gettext/lib/libnlspr/Makefile:1.2
--- src/external/gpl2/gettext/lib/libnlspr/Makefile:1.1 Tue Jan 12 17:58:03 2016
+++ src/external/gpl2/gettext/lib/libnlspr/Makefile Wed Jan 13 07:48:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/01/12 22:58:03 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/13 12:48:51 christos Exp $
LIBISPRIVATE= yes
@@ -6,10 +6,11 @@ LIBISPRIVATE= yes
LIB= nlspr
SRCS= \
+clean-temp.c \
dir-list.c \
file-list.c \
-format.c \
format-awk.c \
+format-boost.c \
format-c.c \
format-csharp.c \
format-elisp.c \
@@ -19,7 +20,6 @@ format-librep.c \
format-lisp.c \
format-pascal.c \
format-perl-brace.c \
-format-boost.c \
format-perl.c \
format-php.c \
format-python.c \
@@ -28,52 +28,50 @@ format-scheme.c \
format-sh.c \
format-tcl.c \
format-ycp.c \
-localcharset.c \
+format.c \
+gettext-po.c \
hash-string.c \
lang-table.c \
+localcharset.c \
message.c \
msgl-ascii.c \
msgl-cat.c \
msgl-charset.c \
+msgl-check.c \
msgl-english.c \
msgl-equal.c \
msgl-iconv.c \
-msgl-fsearch.c \
-plural.c \
-plural-exp.c \
-plural-eval.c \
+open-catalog.c \
plural-count.c \
+plural-eval.c \
+plural-exp.c \
plural-table.c \
-read-catalog-abstract.c \
po-charset.c \
po-error.c \
po-gram-gen.c \
po-lex.c \
po-time.c \
po-xerror.c \
-open-catalog.c \
+read-catalog-abstract.c \
+read-catalog.c \
read-csharp.c \
read-java.c \
read-mo.c \
read-po.c \
-read-catalog.c \
read-properties.c \
read-resources.c \
read-stringtable.c \
read-tcl.c \
str-list.c \
+write-catalog.c \
write-csharp.c \
write-java.c \
write-mo.c \
write-po.c \
-write-catalog.c \
write-properties.c \
write-qt.c \
write-resources.c \
write-stringtable.c \
-msgl-check.c \
-gettext-po.c \
-clean-temp.c \
write-tcl.c
.include "${.CURDIR}/../../Makefile.inc"
Index: src/external/gpl2/gettext/lib/libnlsut/Makefile
diff -u src/external/gpl2/gettext/lib/libnlsut/Makefile:1.1 src/external/gpl2/gettext/lib/libnlsut/Makefile:1.2
--- src/external/gpl2/gettext/lib/libnlsut/Makefile:1.1 Tue Jan 12 17:58:03 2016
+++ src/external/gpl2/gettext/lib/libnlsut/Makefile Wed Jan 13 07:48:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/01/12 22:58:03 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/13 12:48:51 christos Exp $
LIBISPRIVATE= yes
@@ -12,9 +12,9 @@ argmatch.c \
backupfile.c \
basename.c \
c-ctype.c \
-c-strstr.c \
c-strcasecmp.c \
c-strncasecmp.c \
+c-strstr.c \
classpath.c \
closeout.c \
concatpath.c \
@@ -28,19 +28,20 @@ exitfail.c \
fatal-signal.c \
findprog.c \
fstrcmp.c \
-fwriteerror.c \
full-write.c \
-gl_linkedhash_list.c \
+fwriteerror.c \
gcd.c \
getline.c \
+gl_linkedhash_list.c \
hash.c \
-lock.c \
javacomp.c \
javaexec.c \
+javaversion.c \
linebreak.c \
+localcharset.c \
+lock.c \
mbchar.c \
mbswidth.c \
-strnlen1.c \
obstack.c \
pipe.c \
progname.c \
@@ -49,23 +50,20 @@ quote.c \
quotearg.c \
safe-read.c \
safe-write.c \
-strstr.c \
sh-quote.c \
+striconv.c \
+strnlen1.c \
+strstr.c \
tmpdir.c \
-localcharset.c \
wait-process.c \
xallocsa.c \
-xvasprintf.c \
xasprintf.c \
xerror.c \
-striconv.c \
-xstriconv.c \
xmalloc.c \
xsetenv.c \
-javaversion.c \
-xstrdup.c
-
-# xgetcwd.c \
+xstrdup.c \
+xstriconv.c \
+xvasprintf.c
.include "${.CURDIR}/../../Makefile.inc"
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: macallan
Date: Wed Jan 13 13:29:51 UTC 2016
Modified Files:
src/sys/arch/arm/allwinner: awin_tcon.c
Log Message:
add OUTPUT_VGA in order to shut down the right output(s) when blanking etc.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/allwinner/awin_tcon.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/arm/allwinner/awin_tcon.c
diff -u src/sys/arch/arm/allwinner/awin_tcon.c:1.11 src/sys/arch/arm/allwinner/awin_tcon.c:1.12
--- src/sys/arch/arm/allwinner/awin_tcon.c:1.11 Fri Nov 20 18:32:13 2015
+++ src/sys/arch/arm/allwinner/awin_tcon.c Wed Jan 13 13:29:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_tcon.c,v 1.11 2015/11/20 18:32:13 bouyer Exp $ */
+/* $NetBSD: awin_tcon.c,v 1.12 2016/01/13 13:29:51 macallan Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill
@@ -29,7 +29,7 @@
#include "opt_allwinner.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: awin_tcon.c,v 1.11 2015/11/20 18:32:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_tcon.c,v 1.12 2016/01/13 13:29:51 macallan Exp $");
#include
#include
@@ -67,6 +67,7 @@ struct awin_tcon_softc {
unsigned int sc_output_type;
#define OUTPUT_HDMI 0
#define OUTPUT_LVDS 1
+#define OUTPUT_VGA 2
const char *sc_lcdpwr_pin_name;
struct awin_gpio_pindata sc_lcdpwr_pin;
const char *sc_lcdblk_pin_name;
@@ -159,6 +160,8 @@ awin_tcon_attach(device_t parent, device
sc->sc_output_type = OUTPUT_HDMI;
} else if (strcmp(output, "lvds") == 0) {
sc->sc_output_type = OUTPUT_LVDS;
+ } else if (strcmp(output, "vga") == 0) {
+ sc->sc_output_type = OUTPUT_VGA;
} else {
panic("tcon: wrong mode %s", output);
}
@@ -254,7 +257,8 @@ awin_tcon_set_pll(struct awin_tcon_softc
switch(sc->sc_clk_pll) {
case 3:
awin_pll3_set_rate(n * 300);
- if (sc->sc_output_type == OUTPUT_HDMI) {
+ if ((sc->sc_output_type == OUTPUT_HDMI) ||
+ (sc->sc_output_type == OUTPUT_VGA)) {
awin_reg_set_clear(sc->sc_bst, sc->sc_ch1clk_bsh, 0,
AWIN_CLK_OUT_ENABLE |
AWIN_LCDx_CH1_SCLK1_GATING |
@@ -286,7 +290,8 @@ awin_tcon_set_pll(struct awin_tcon_softc
break;
case 7:
awin_pll7_set_rate(n * 300);
- if (sc->sc_output_type == OUTPUT_HDMI) {
+ if ((sc->sc_output_type == OUTPUT_HDMI) ||
+ (sc->sc_output_type == OUTPUT_VGA)) {
awin_reg_set_clear(sc->sc_bst, sc->sc_ch1clk_bsh, 0,
AWIN_CLK_OUT_ENABLE |
AWIN_LCDx_CH1_SCLK1_GATING |
@@ -593,7 +598,8 @@ awin_tcon1_enable(int unit, bool enable)
return;
}
sc = device_private(dev);
- KASSERT(sc->sc_output_type == OUTPUT_HDMI);
+ KASSERT((sc->sc_output_type == OUTPUT_HDMI) ||
+ (sc->sc_output_type == OUTPUT_VGA));
awin_debe_enable(device_unit(sc->sc_dev), enable);
delay(2);
@@ -604,7 +610,10 @@ awin_tcon1_enable(int unit, bool enable)
val = TCON_READ(sc, AWIN_TCON1_CTL_REG);
val |= AWIN_TCONx_CTL_EN;
TCON_WRITE(sc, AWIN_TCON1_CTL_REG, val);
- TCON_WRITE(sc, AWIN_TCON1_IO_TRI_REG, 0);
+ if (sc->sc_output_type == OUTPUT_VGA) {
+ TCON_WRITE(sc, AWIN_TCON1_IO_TRI_REG, 0x0cff);
+ } else
+ TCON_WRITE(sc, AWIN_TCON1_IO_TRI_REG, 0);
} else {
TCON_WRITE(sc, AWIN_TCON1_IO_TRI_REG, 0x);
val = TCON_READ(sc, AWIN_TCON1_CTL_REG);
@@ -618,7 +627,7 @@ awin_tcon1_enable(int unit, bool enable)
KASSERT(tcon_mux_inited);
val = bus_space_read_4(sc->sc_bst, tcon_mux_bsh, 0);
#ifdef AWIN_TCON_DEBUG
- printf("awin_tcon1_enable(%d) val 0x%x", unit, val);
+ printf("awin_tcon1_enable(%d) %d val 0x%x", unit, enable, val);
#endif
val &= ~ AWIN_TCON_MUX_CTL_HDMI_OUTPUT_SRC;
if (unit == 0) {
@@ -652,7 +661,8 @@ awin_tcon1_set_videomode(int unit, const
return;
}
sc = device_private(dev);
- KASSERT(sc->sc_output_type == OUTPUT_HDMI);
+ KASSERT((sc->sc_output_type == OUTPUT_HDMI) ||
+ (sc->sc_output_type == OUTPUT_VGA));
awin_debe_set_videomode(device_unit(sc->sc_dev), mode);
if (mode) {
@@ -660,9 +670,9 @@ awin_tcon1_set_videomode(int unit, const
const u_int phsync_p = !!(mode->flags & VID_PHSYNC);
const u_int pvsync_p = !!(mode->flags & VID_PVSYNC);
const u_int hspw = mode->hsync_end - mode->hsync_start;
- const u_int hbp = mode->htotal - mode->hsync_start;
+ const u_int hbp = mode->htotal - mode->hsync_end;
const u_int vspw = mode->vsync_end - mode->vsync_start;
- const u_int vbp = mode->vtotal - mode->vsync_start;
+ const u_int vbp = mode->vtotal - mode->vsync_end;
const u_int vblank_len =
((mode->vtotal << interlace_p) >> 1) - mode->vdisplay - 2;
const u_int start_delay =
@@ -801,9 +811,15 @@ awin_tcon_setvideo(int unit, bool enable
}
sc = device_private(dev);
- if (sc->sc_output_type == OUTPUT_HDMI) {
- awin_hdmi_poweron(enable);
- } else {
- awin_tcon0_enable(sc, enable);
+ switch (sc->sc_output_type) {
+ case OUTPUT_HDMI:
+ awin_hdmi_poweron(enable);
+ break;
+ case OUTPUT_LV
CVS commit: src/sys/dev/pci/voyager
Module Name:src
Committed By: macallan
Date: Wed Jan 13 15:56:05 UTC 2016
Modified Files:
src/sys/dev/pci/voyager: voyagerfb.c
Log Message:
some trivial fixes:
- rearrange dmesg output so all values are printed properly
- use aprint_*
- support WSDISPLAYIO_GET_FBINFO
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/voyager/voyagerfb.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/dev/pci/voyager/voyagerfb.c
diff -u src/sys/dev/pci/voyager/voyagerfb.c:1.27 src/sys/dev/pci/voyager/voyagerfb.c:1.28
--- src/sys/dev/pci/voyager/voyagerfb.c:1.27 Tue Mar 11 08:19:45 2014
+++ src/sys/dev/pci/voyager/voyagerfb.c Wed Jan 13 15:56:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: voyagerfb.c,v 1.27 2014/03/11 08:19:45 mrg Exp $ */
+/* $NetBSD: voyagerfb.c,v 1.28 2016/01/13 15:56:05 macallan Exp $ */
/*
* Copyright (c) 2009, 2011 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.27 2014/03/11 08:19:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyagerfb.c,v 1.28 2016/01/13 15:56:05 macallan Exp $");
#include
#include
@@ -269,19 +269,19 @@ voyagerfb_attach(device_t parent, device
sc->sc_depth = 8;
#endif
- printf("%s: %d x %d, %d bit, stride %d\n", device_xname(self),
- sc->sc_width, sc->sc_height, sc->sc_depth, sc->sc_stride);
-
/*
* XXX yeah, casting the fb address to uint32_t is formally wrong
* but as far as I know there are no SM502 with 64bit BARs
*/
- aprint_normal("%s: %d MB video memory at 0x%08x\n", device_xname(self),
+ aprint_normal_dev(self, "%d MB video memory at 0x%08x\n",
(int)(sc->sc_fbsize >> 20), (uint32_t)sc->sc_fb);
/* init engine here */
voyagerfb_init(sc);
+ aprint_normal_dev(self, "%d x %d, %d bit, stride %d\n",
+ sc->sc_width, sc->sc_height, sc->sc_depth, sc->sc_stride);
+
sc->sc_defaultscreen_descr = (struct wsscreen_descr){
"default",
0, 0,
@@ -515,6 +515,12 @@ voyagerfb_ioctl(void *v, void *vs, u_lon
cu = (struct wsdisplay_cursor *)data;
return voyagerfb_scursor(sc, cu);
}
+
+ case WSDISPLAYIO_GET_FBINFO:
+ {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
}
return EPASSTHROUGH;
}
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: macallan Date: Wed Jan 13 17:07:52 UTC 2016 Modified Files: src/sys/arch/arm/allwinner: awin_tcon.c Log Message: revert accidentially committed changes in awin_tcon1_set_videomode() To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/allwinner/awin_tcon.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/arm/allwinner/awin_tcon.c diff -u src/sys/arch/arm/allwinner/awin_tcon.c:1.12 src/sys/arch/arm/allwinner/awin_tcon.c:1.13 --- src/sys/arch/arm/allwinner/awin_tcon.c:1.12 Wed Jan 13 13:29:51 2016 +++ src/sys/arch/arm/allwinner/awin_tcon.c Wed Jan 13 17:07:51 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_tcon.c,v 1.12 2016/01/13 13:29:51 macallan Exp $ */ +/* $NetBSD: awin_tcon.c,v 1.13 2016/01/13 17:07:51 macallan Exp $ */ /*- * Copyright (c) 2014 Jared D. McNeill @@ -29,7 +29,7 @@ #include "opt_allwinner.h" #include -__KERNEL_RCSID(0, "$NetBSD: awin_tcon.c,v 1.12 2016/01/13 13:29:51 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awin_tcon.c,v 1.13 2016/01/13 17:07:51 macallan Exp $"); #include #include @@ -670,9 +670,9 @@ awin_tcon1_set_videomode(int unit, const const u_int phsync_p = !!(mode->flags & VID_PHSYNC); const u_int pvsync_p = !!(mode->flags & VID_PVSYNC); const u_int hspw = mode->hsync_end - mode->hsync_start; - const u_int hbp = mode->htotal - mode->hsync_end; + const u_int hbp = mode->htotal - mode->hsync_start; const u_int vspw = mode->vsync_end - mode->vsync_start; - const u_int vbp = mode->vtotal - mode->vsync_end; + const u_int vbp = mode->vtotal - mode->vsync_start; const u_int vblank_len = ((mode->vtotal << interlace_p) >> 1) - mode->vdisplay - 2; const u_int start_delay =
CVS import: src/external/gpl2/groff/dist
Module Name:src Committed By: christos Date: Wed Jan 13 18:41:50 UTC 2016 Update of /cvsroot/src/external/gpl2/groff/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22775 Log Message: Import groff 1.19.2 Status: Vendor Tag: FSF Release Tags: groff-1-19-2 N src/external/gpl2/groff/dist/ChangeLog.115 N src/external/gpl2/groff/dist/BUG-REPORT N src/external/gpl2/groff/dist/COPYING N src/external/gpl2/groff/dist/ChangeLog N src/external/gpl2/groff/dist/INSTALL N src/external/gpl2/groff/dist/FDL N src/external/gpl2/groff/dist/ChangeLog.116 N src/external/gpl2/groff/dist/ChangeLog.117 N src/external/gpl2/groff/dist/ChangeLog.118 N src/external/gpl2/groff/dist/Makefile.ccpg N src/external/gpl2/groff/dist/INSTALL.gen N src/external/gpl2/groff/dist/LICENSE N src/external/gpl2/groff/dist/MANIFEST N src/external/gpl2/groff/dist/MORE.STUFF N src/external/gpl2/groff/dist/Makefile N src/external/gpl2/groff/dist/Makefile.comm N src/external/gpl2/groff/dist/Makefile.cpg N src/external/gpl2/groff/dist/Makefile.dev N src/external/gpl2/groff/dist/Makefile.in N src/external/gpl2/groff/dist/Makefile.init N src/external/gpl2/groff/dist/Makefile.lib N src/external/gpl2/groff/dist/Makefile.man N src/external/gpl2/groff/dist/Makefile.sub N src/external/gpl2/groff/dist/NEWS N src/external/gpl2/groff/dist/PROBLEMS N src/external/gpl2/groff/dist/PROJECTS N src/external/gpl2/groff/dist/README N src/external/gpl2/groff/dist/README.MinGW N src/external/gpl2/groff/dist/REVISION N src/external/gpl2/groff/dist/TODO N src/external/gpl2/groff/dist/VERSION N src/external/gpl2/groff/dist/aclocal.m4 N src/external/gpl2/groff/dist/configure N src/external/gpl2/groff/dist/configure.ac N src/external/gpl2/groff/dist/gendef.sh N src/external/gpl2/groff/dist/install-sh N src/external/gpl2/groff/dist/mkinstalldirs N src/external/gpl2/groff/dist/mdate.sh N src/external/gpl2/groff/dist/test-groff.in N src/external/gpl2/groff/dist/stamp-h.in N src/external/gpl2/groff/dist/arch/misc/Makefile.sub N src/external/gpl2/groff/dist/arch/misc/shdeps.sh N src/external/gpl2/groff/dist/arch/djgpp/config.bat N src/external/gpl2/groff/dist/arch/djgpp/config.sed N src/external/gpl2/groff/dist/arch/djgpp/config.site N src/external/gpl2/groff/dist/arch/djgpp/README N src/external/gpl2/groff/dist/arch/djgpp/t-groff.bat N src/external/gpl2/groff/dist/contrib/mm/groff_mmse.man N src/external/gpl2/groff/dist/contrib/mm/groff_mm.man N src/external/gpl2/groff/dist/contrib/mm/ChangeLog N src/external/gpl2/groff/dist/contrib/mm/Makefile.sim N src/external/gpl2/groff/dist/contrib/mm/Makefile.sub N src/external/gpl2/groff/dist/contrib/mm/mmroff.man N src/external/gpl2/groff/dist/contrib/mm/mse.tmac N src/external/gpl2/groff/dist/contrib/mm/mmroff.pl N src/external/gpl2/groff/dist/contrib/mm/mmse.tmac N src/external/gpl2/groff/dist/contrib/mm/mm.tmac N src/external/gpl2/groff/dist/contrib/mm/m.tmac N src/external/gpl2/groff/dist/contrib/mm/NOTES N src/external/gpl2/groff/dist/contrib/mm/README N src/external/gpl2/groff/dist/contrib/mm/examples/References N src/external/gpl2/groff/dist/contrib/mm/examples/COVER N src/external/gpl2/groff/dist/contrib/mm/examples/APP N src/external/gpl2/groff/dist/contrib/mm/examples/B1B2 N src/external/gpl2/groff/dist/contrib/mm/examples/LT.se N src/external/gpl2/groff/dist/contrib/mm/examples/IND N src/external/gpl2/groff/dist/contrib/mm/examples/LT N src/external/gpl2/groff/dist/contrib/mm/examples/README N src/external/gpl2/groff/dist/contrib/mm/examples/ML N src/external/gpl2/groff/dist/contrib/mm/examples/MOVE N src/external/gpl2/groff/dist/contrib/mm/examples/MUL N src/external/gpl2/groff/dist/contrib/mm/examples/NCOL N src/external/gpl2/groff/dist/contrib/mm/examples/ND N src/external/gpl2/groff/dist/contrib/mm/examples/SETR N src/external/gpl2/groff/dist/contrib/mm/mm/se_ms.cov N src/external/gpl2/groff/dist/contrib/mm/mm/ms.cov N src/external/gpl2/groff/dist/contrib/mm/mm/0.MT N src/external/gpl2/groff/dist/contrib/mm/mm/4.MT N src/external/gpl2/groff/dist/contrib/mm/mm/5.MT N src/external/gpl2/groff/dist/contrib/pic2graph/pic2graph.man N src/external/gpl2/groff/dist/contrib/pic2graph/pic2graph.sh N src/external/gpl2/groff/dist/contrib/pic2graph/Makefile.sub N src/external/gpl2/groff/dist/contrib/eqn2graph/eqn2graph.man N src/external/gpl2/groff/dist/contrib/eqn2graph/eqn2graph.sh N src/external/gpl2/groff/dist/contrib/eqn2graph/Makefile.sub N src/external/gpl2/groff/dist/contrib/grap2graph/grap2graph.man N src/external/gpl2/groff/dist/contrib/grap2graph/grap2graph.sh N src/external/gpl2/groff/dist/contrib/grap2graph/Makefile.sub N src/external/gpl2/groff/dist/contrib/groffer/ChangeLog N src/external/gpl2/groff/dist/contrib/groffer/groffer2.sh N src/external/gpl2/groff/dist/contrib/groffer/groffer.man N src/external/gpl2/groff/dist/contrib/groffer/groffer.sh N src/external/gpl2/groff/dist/contrib/groffer/Makefile.sub N src/external/gpl2/groff/dist/contrib/groffer/README N src/external/gpl2/groff
CVS commit: src/external/gpl2
Module Name:src
Committed By: christos
Date: Wed Jan 13 19:02:29 UTC 2016
Modified Files:
src/external/gpl2: Makefile
Log Message:
add groff
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl2/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/Makefile
diff -u src/external/gpl2/Makefile:1.9 src/external/gpl2/Makefile:1.10
--- src/external/gpl2/Makefile:1.9 Tue Jan 12 22:40:11 2016
+++ src/external/gpl2/Makefile Wed Jan 13 14:02:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/01/13 03:40:11 christos Exp $
+# $NetBSD: Makefile,v 1.10 2016/01/13 19:02:29 christos Exp $
.include
@@ -13,6 +13,10 @@ SUBDIR+= lvm2
SUBDIR+= grep
.endif
+.if ${MKGROFF} != "no"
+SUBDIR+=groff
+.endif
+
SUBDIR+= gettext diffutils
.include
CVS commit: src/gnu/usr.bin
Module Name:src Committed By: christos Date: Wed Jan 13 19:03:15 UTC 2016 Modified Files: src/gnu/usr.bin: Makefile Removed Files: src/gnu/usr.bin/groff: Makefile Makefile.inc src/gnu/usr.bin/groff/contrib: Makefile Makefile.inc src/gnu/usr.bin/groff/contrib/gdiffmk: Makefile src/gnu/usr.bin/groff/contrib/groffer: Makefile src/gnu/usr.bin/groff/contrib/mm: Makefile src/gnu/usr.bin/groff/contrib/mom: Makefile Makefile.inc src/gnu/usr.bin/groff/contrib/mom/examples: Makefile src/gnu/usr.bin/groff/contrib/mom/momdoc: Makefile src/gnu/usr.bin/groff/doc: Makefile src/gnu/usr.bin/groff/font: Makefile Makefile.dev Makefile.inc Makefile.tty src/gnu/usr.bin/groff/font/devX100: Makefile src/gnu/usr.bin/groff/font/devX100-12: Makefile src/gnu/usr.bin/groff/font/devX75: Makefile src/gnu/usr.bin/groff/font/devX75-12: Makefile src/gnu/usr.bin/groff/font/devascii: Makefile src/gnu/usr.bin/groff/font/devcp1047: Makefile src/gnu/usr.bin/groff/font/devdvi: Makefile src/gnu/usr.bin/groff/font/devhtml: Makefile src/gnu/usr.bin/groff/font/devkoi8-r: DESC.proto Makefile R.proto src/gnu/usr.bin/groff/font/devlatin1: Makefile src/gnu/usr.bin/groff/font/devlbp: Makefile src/gnu/usr.bin/groff/font/devlj4: Makefile src/gnu/usr.bin/groff/font/devps: Makefile src/gnu/usr.bin/groff/font/devutf8: Makefile src/gnu/usr.bin/groff/man: Makefile src/gnu/usr.bin/groff/src: Makefile src/gnu/usr.bin/groff/src/devices: Makefile Makefile.inc src/gnu/usr.bin/groff/src/devices/grodvi: Makefile src/gnu/usr.bin/groff/src/devices/grohtml: Makefile src/gnu/usr.bin/groff/src/devices/grolbp: Makefile src/gnu/usr.bin/groff/src/devices/grolj4: Makefile src/gnu/usr.bin/groff/src/devices/grops: Makefile src/gnu/usr.bin/groff/src/devices/grotty: Makefile src/gnu/usr.bin/groff/src/include: config.h defs.h src/gnu/usr.bin/groff/src/libs: Makefile Makefile.inc src/gnu/usr.bin/groff/src/libs/libbib: Makefile src/gnu/usr.bin/groff/src/libs/libdriver: Makefile src/gnu/usr.bin/groff/src/libs/libgroff: Makefile src/gnu/usr.bin/groff/src/preproc: Makefile Makefile.inc src/gnu/usr.bin/groff/src/preproc/eqn: Makefile src/gnu/usr.bin/groff/src/preproc/grn: Makefile src/gnu/usr.bin/groff/src/preproc/html: Makefile src/gnu/usr.bin/groff/src/preproc/pic: Makefile src/gnu/usr.bin/groff/src/preproc/refer: Makefile src/gnu/usr.bin/groff/src/preproc/soelim: Makefile src/gnu/usr.bin/groff/src/preproc/tbl: Makefile src/gnu/usr.bin/groff/src/roff: Makefile Makefile.inc src/gnu/usr.bin/groff/src/roff/groff: Makefile src/gnu/usr.bin/groff/src/roff/grog: Makefile src/gnu/usr.bin/groff/src/roff/nroff: Makefile src/gnu/usr.bin/groff/src/roff/troff: Makefile src/gnu/usr.bin/groff/src/utils: Makefile Makefile.inc src/gnu/usr.bin/groff/src/utils/addftinfo: Makefile src/gnu/usr.bin/groff/src/utils/afmtodit: Makefile src/gnu/usr.bin/groff/src/utils/hpftodit: Makefile src/gnu/usr.bin/groff/src/utils/indxbib: Makefile src/gnu/usr.bin/groff/src/utils/lkbib: Makefile src/gnu/usr.bin/groff/src/utils/lookbib: Makefile src/gnu/usr.bin/groff/src/utils/pfbtops: Makefile src/gnu/usr.bin/groff/src/utils/tfmtodit: Makefile src/gnu/usr.bin/groff/tmac: Makefile fr.ISO8859-1 hyphen.ru koi8-r.tmac man.local mdoc.local ru.KOI8-R src/gnu/usr.bin/groff/tmac/man: Makefile Log Message: unhook groff To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.143 src/gnu/usr.bin/Makefile cvs rdiff -u -r1.14 -r0 src/gnu/usr.bin/groff/Makefile cvs rdiff -u -r1.21 -r0 src/gnu/usr.bin/groff/Makefile.inc cvs rdiff -u -r1.5 -r0 src/gnu/usr.bin/groff/contrib/Makefile cvs rdiff -u -r1.3 -r0 src/gnu/usr.bin/groff/contrib/Makefile.inc cvs rdiff -u -r1.1 -r0 src/gnu/usr.bin/groff/contrib/gdiffmk/Makefile cvs rdiff -u -r1.2 -r0 src/gnu/usr.bin/groff/contrib/groffer/Makefile cvs rdiff -u -r1.8 -r0 src/gnu/usr.bin/groff/contrib/mm/Makefile cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/groff/contrib/mom/Makefile \ src/gnu/usr.bin/groff/contrib/mom/Makefile.inc cvs rdiff -u -r1.9 -r0 src/gnu/usr.bin/groff/contrib/mom/examples/Makefile cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/groff/contrib/mom/momdoc/Makefile cvs rdiff -u -r1.7 -r0 src/gnu/usr.bin/groff/doc/Makefile cvs rdiff -u -r1.3 -r0 src/gnu/usr.bin/groff/font/Makefile \ src/gnu/usr.bin/groff/font/Makefile.inc cvs rdiff -u -r1.5 -r0 src/gnu/usr.bin/groff/font/Makefile.dev cvs rdiff -u -r1.9 -r0 src/gnu/usr.bin/groff/font/Makefile.tty cvs rdiff -u -r1.3 -r0 src/gnu/usr.bin/groff/font/devX100/Makefile cvs rdiff -u -r1.3 -r0 src/gnu/usr.bin/
CVS commit: src/gnu/dist/groff
Module Name:src Committed By: christos Date: Wed Jan 13 19:25:07 UTC 2016 Removed Files: src/gnu/dist/groff: BUG-REPORT COPYING ChangeLog ChangeLog.115 ChangeLog.116 ChangeLog.117 ChangeLog.118 FDL INSTALL INSTALL.gen LICENSE MANIFEST MORE.STUFF Makefile Makefile.ccpg Makefile.comm Makefile.cpg Makefile.dev Makefile.in Makefile.init Makefile.lib Makefile.man Makefile.sub NEWS PROBLEMS PROJECTS README README.MinGW REVISION TODO VERSION aclocal.m4 configure configure.ac gendef.sh groff2netbsd install-sh mdate.sh mkinstalldirs stamp-h.in test-groff.in src/gnu/dist/groff/arch/djgpp: README config.bat config.sed config.site t-groff.bat src/gnu/dist/groff/arch/misc: Makefile.sub shdeps.sh src/gnu/dist/groff/contrib/eqn2graph: Makefile.sub eqn2graph.man eqn2graph.sh src/gnu/dist/groff/contrib/gdiffmk: ChangeLog Makefile.sub README gdiffmk.man gdiffmk.sh src/gnu/dist/groff/contrib/gdiffmk/tests: file1 file2 runtests.in test_baseline test_baseline10 test_baseline6 test_baseline7 test_baseline8 test_baseline9 src/gnu/dist/groff/contrib/grap2graph: Makefile.sub grap2graph.man grap2graph.sh src/gnu/dist/groff/contrib/groffer: ChangeLog Makefile.sub README README_SH TODO groffer.man groffer.sh groffer2.sh src/gnu/dist/groff/contrib/mm: ChangeLog Makefile.sim Makefile.sub NOTES README groff_mm.man groff_mmse.man m.tmac mm.tmac mmroff.man mmroff.pl mmse.tmac mse.tmac src/gnu/dist/groff/contrib/mm/examples: APP B1B2 COVER IND LT LT.se ML MOVE MUL NCOL ND README References SETR src/gnu/dist/groff/contrib/mm/mm: 0.MT 4.MT 5.MT ms.cov se_ms.cov src/gnu/dist/groff/contrib/mom: BUGS ChangeLog Makefile.sub NEWS TODO copyright groff_mom.man mom.tmac om.tmac src/gnu/dist/groff/contrib/mom/examples: README.txt elvis_syntax elvis_syntax.new letter.mom penguin.ps sample_docs.mom typesetting.mom src/gnu/dist/groff/contrib/mom/momdoc: appendices.html color.html cover.html definitions.html docelement.html docprocessing.html goodies.html headfootpage.html inlines.html intro.html letters.html macrolist.html rectoverso.html refer.html reserved.html toc.html typemacdoc.html typesetting.html using.html src/gnu/dist/groff/contrib/pdfmark: ChangeLog Makefile.sub PROBLEMS README TODO cover.ms pdfmark.ms pdfmark.tmac pdfroff.man pdfroff.sh spdf.tmac src/gnu/dist/groff/contrib/pic2graph: Makefile.sub pic2graph.man pic2graph.sh src/gnu/dist/groff/doc: Makefile.in Makefile.sub fdl.texi fixinfo.sh gnu.eps gnu.png gnu.xpm grnexmpl.g grnexmpl.me groff groff-1 groff-2 groff-3 groff.css groff.texinfo meintro.me meref.me pic.ms texinfo.tex webpage.ms src/gnu/dist/groff/font/devX100: CB CBI CI CR DESC HB HBI HI HR Makefile.sub NB NBI NI NR S TB TBI TI TR src/gnu/dist/groff/font/devX100-12: CB CBI CI CR DESC HB HBI HI HR Makefile.sub NB NBI NI NR S TB TBI TI TR src/gnu/dist/groff/font/devX75: CB CBI CI CR DESC HB HBI HI HR Makefile.sub NB NBI NI NR S TB TBI TI TR src/gnu/dist/groff/font/devX75-12: CB CBI CI CR DESC HB HBI HI HR Makefile.sub NB NBI NI NR S TB TBI TI TR src/gnu/dist/groff/font/devascii: DESC.proto Makefile.sub R.proto src/gnu/dist/groff/font/devcp1047: DESC.proto Makefile.sub R.proto src/gnu/dist/groff/font/devdvi: CW CWEC CWI CWIEC CWITC CWTC DESC.in EX HB HBEC HBI HBIEC HBITC HBTC HI HIEC HITC HR HREC HRTC MI Makefile.sub S SA SB SC TB TBEC TBI TBIEC TBITC TBTC TI TIEC TITC TR TREC TRTC src/gnu/dist/groff/font/devdvi/generate: CompileFonts Makefile ec.map msam.map msbm.map tc.map texb.map texex.map texi.map texmi.map texr.map texsy.map textex.map textt.map src/gnu/dist/groff/font/devhtml: DESC.proto Makefile.sub R.proto src/gnu/dist/groff/font/devlatin1: DESC.proto Makefile.sub R.proto src/gnu/dist/groff/font/devlbp: CB CI CR DESC.in EB EI ER HB HBI HI HNB HNBI HNI HNR HR Makefile.sub TB TBI TI TR src/gnu/dist/groff/font/devlj4: AB ABI AI ALBB ALBR AOB AOI AOR AR CB CBI CI CLARENDON CORONET CR DESC.in GB GBI GI GR LGB LGI LGR MARIGOLD Makefile.sub OB OBI OI OR S SYMBOL TB TBI TI TNRB TNRBI TNRI TNRR TR UB UBI UCB UCBI UCI UCR UI UR WINGDINGS src/gnu/dist/groff/font/devlj4/generate: Makefile special.awk special.map symbol.map text.map wingdings.map src/gnu/dist/groff/font/devps: AB ABI AI AR BMB BMBI BMI BMR CB CBI CI CR DESC.in EURO HB HBI HI HNB HN
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Jan 13 19:27:26 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: groff has moved. To generate a diff of this commit: cvs rdiff -u -r1.1294 -r1.1295 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.1294 src/doc/3RDPARTY:1.1295 --- src/doc/3RDPARTY:1.1294 Tue Jan 12 23:41:01 2016 +++ src/doc/3RDPARTY Wed Jan 13 14:27:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1294 2016/01/13 04:41:01 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.1295 2016/01/13 19:27:26 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -504,9 +504,9 @@ Home Page: http://www.gnu.org/software/g Mailing List: bug-gnu-ut...@gnu.org Responsible: simonb License: GPLv2+ (2.5.1a), GPLv3+ (2.5.3 and later) -Location: gnu/dist/grep +Location: external/gpl2/grep Notes: -Use src/gnu/dist/grep/grep2netbsd for preparing the source tree +Use external/gpl2/grep//grep2netbsd for preparing the source tree for the import. On 2 Jan 2004, a non-GNU grep (FreeGrep, https://github.com/howardjp/freegrep; see also http://www.monkey.org/openbsd/archive/tech/0306/msg00129.html) @@ -523,11 +523,11 @@ Archive Site: ftp://ftp.gnu.org/gnu/grof Home Page: http://www.gnu.org/software/groff/ Mailing List: bug-gr...@gnu.org Responsible: -License: GPLv2 -Location: gnu/dist/groff +License: GPLv2+ (1.19.2), GPLv3+ (1.20 and later) +Location: external/gpl2/groff Notes: -Use groff2netbsd from src/gnu/dist/groff to prepare the distribution -for import. +Use groff2netbsd from external/gpl2/groff/groff2netbsd to prepare the +distribution for import. Package: heimdal Version: 1.5.3
CVS commit: src/tools/groff
Module Name:src
Committed By: christos
Date: Wed Jan 13 19:29:26 UTC 2016
Modified Files:
src/tools/groff: Makefile
Log Message:
groff has moved
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/tools/groff/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/groff/Makefile
diff -u src/tools/groff/Makefile:1.30 src/tools/groff/Makefile:1.31
--- src/tools/groff/Makefile:1.30 Sun Dec 2 07:48:32 2012
+++ src/tools/groff/Makefile Wed Jan 13 14:29:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/12/02 12:48:32 apb Exp $
+# $NetBSD: Makefile,v 1.31 2016/01/13 19:29:26 christos Exp $
MODULE= groff
@@ -61,7 +61,7 @@ ${SITETMACDIR}/${F}: ${F}-s _installtmac
.ORDER: realinstall ${SITETMACDIR}/${F}
CLEANFILES+=${F}-s
${F}-s: ${F}
- ${TOOL_SED} -f ${.CURDIR}/../../gnu/dist/groff/tmac/strip.sed \
+ ${TOOL_SED} -f ${.CURDIR}/../../external/gpl2/groff/dist/tmac/strip.sed \
${.ALLSRC} > ${.TARGET}
.endfor
CVS import: src/external/gpl2/libmalloc/dist
Module Name:src Committed By: christos Date: Wed Jan 13 21:42:18 UTC 2016 Update of /cvsroot/src/external/gpl2/libmalloc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26855 Log Message: import the latest standalone libmalloc. Status: Vendor Tag: FSF Release Tags: v1995-01-15 N src/external/gpl2/libmalloc/dist/getpagesize.h N src/external/gpl2/libmalloc/dist/COPYING.LIB N src/external/gpl2/libmalloc/dist/ChangeLog N src/external/gpl2/libmalloc/dist/Makefile N src/external/gpl2/libmalloc/dist/OChangeLog N src/external/gpl2/libmalloc/dist/README N src/external/gpl2/libmalloc/dist/calloc.c N src/external/gpl2/libmalloc/dist/cfree.c N src/external/gpl2/libmalloc/dist/free.c N src/external/gpl2/libmalloc/dist/gmalloc-head.c N src/external/gpl2/libmalloc/dist/gmalloc.c N src/external/gpl2/libmalloc/dist/malloc-find.c N src/external/gpl2/libmalloc/dist/malloc.c N src/external/gpl2/libmalloc/dist/malloc.h N src/external/gpl2/libmalloc/dist/mcheck.c N src/external/gpl2/libmalloc/dist/mem-limits.h N src/external/gpl2/libmalloc/dist/memalign.c N src/external/gpl2/libmalloc/dist/morecore.c N src/external/gpl2/libmalloc/dist/mstats.c N src/external/gpl2/libmalloc/dist/mtrace.c N src/external/gpl2/libmalloc/dist/mtrace.awk N src/external/gpl2/libmalloc/dist/ralloc.c N src/external/gpl2/libmalloc/dist/realloc.c N src/external/gpl2/libmalloc/dist/valloc.c N src/external/gpl2/libmalloc/dist/vm-limit.c No conflicts created by this import
CVS commit: src/external/gpl2/libmalloc
Module Name:src
Committed By: christos
Date: Wed Jan 13 21:56:38 UTC 2016
Modified Files:
src/external/gpl2/libmalloc/dist: getpagesize.h malloc.h mcheck.c
mem-limits.h morecore.c mtrace.c ralloc.c valloc.c
Added Files:
src/external/gpl2/libmalloc: Makefile Makefile.inc libmalloc2netbsd
src/external/gpl2/libmalloc/lib: Makefile combined.c shlib_version
Log Message:
merge changes, add build glue.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl2/libmalloc/Makefile \
src/external/gpl2/libmalloc/Makefile.inc \
src/external/gpl2/libmalloc/libmalloc2netbsd
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/libmalloc/dist/getpagesize.h \
src/external/gpl2/libmalloc/dist/malloc.h \
src/external/gpl2/libmalloc/dist/mcheck.c \
src/external/gpl2/libmalloc/dist/mem-limits.h \
src/external/gpl2/libmalloc/dist/morecore.c \
src/external/gpl2/libmalloc/dist/mtrace.c \
src/external/gpl2/libmalloc/dist/ralloc.c \
src/external/gpl2/libmalloc/dist/valloc.c
cvs rdiff -u -r0 -r1.1 src/external/gpl2/libmalloc/lib/Makefile \
src/external/gpl2/libmalloc/lib/combined.c \
src/external/gpl2/libmalloc/lib/shlib_version
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/libmalloc/dist/getpagesize.h
diff -u src/external/gpl2/libmalloc/dist/getpagesize.h:1.1.1.1 src/external/gpl2/libmalloc/dist/getpagesize.h:1.2
--- src/external/gpl2/libmalloc/dist/getpagesize.h:1.1.1.1 Wed Jan 13 16:42:18 2016
+++ src/external/gpl2/libmalloc/dist/getpagesize.h Wed Jan 13 16:56:38 2016
@@ -1,4 +1,5 @@
-/* $NetBSD: getpagesize.h,v 1.1.1.1 2016/01/13 21:42:18 christos Exp $ */
+#include
+/* $NetBSD: getpagesize.h,v 1.2 2016/01/13 21:56:38 christos Exp $ */
/* Emulate getpagesize on systems that lack it. */
Index: src/external/gpl2/libmalloc/dist/malloc.h
diff -u src/external/gpl2/libmalloc/dist/malloc.h:1.1.1.1 src/external/gpl2/libmalloc/dist/malloc.h:1.2
--- src/external/gpl2/libmalloc/dist/malloc.h:1.1.1.1 Wed Jan 13 16:42:18 2016
+++ src/external/gpl2/libmalloc/dist/malloc.h Wed Jan 13 16:56:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: malloc.h,v 1.1.1.1 2016/01/13 21:42:18 christos Exp $ */
+/* $NetBSD: malloc.h,v 1.2 2016/01/13 21:56:38 christos Exp $ */
/* Declarations for `malloc' and friends.
Copyright 1990, 1991, 1992, 1993, 1995 Free Software Foundation, Inc.
@@ -64,8 +64,12 @@ extern "C"
#endif
#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
+#ifndef __NetBSD__
#undef __P
#define __P(args) args
+#else
+#include
+#endif
#undef __ptr_t
#define __ptr_t void *
#else /* Not C++ or ANSI C. */
Index: src/external/gpl2/libmalloc/dist/mcheck.c
diff -u src/external/gpl2/libmalloc/dist/mcheck.c:1.1.1.1 src/external/gpl2/libmalloc/dist/mcheck.c:1.2
--- src/external/gpl2/libmalloc/dist/mcheck.c:1.1.1.1 Wed Jan 13 16:42:18 2016
+++ src/external/gpl2/libmalloc/dist/mcheck.c Wed Jan 13 16:56:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mcheck.c,v 1.1.1.1 2016/01/13 21:42:18 christos Exp $ */
+/* $NetBSD: mcheck.c,v 1.2 2016/01/13 21:56:38 christos Exp $ */
/* Standard debugging hooks for `malloc'.
Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
@@ -25,6 +25,7 @@ Cambridge, MA 02139, USA.
#ifndef _MALLOC_INTERNAL
#define _MALLOC_INTERNAL
#include
+#include
#include
#endif
Index: src/external/gpl2/libmalloc/dist/mem-limits.h
diff -u src/external/gpl2/libmalloc/dist/mem-limits.h:1.1.1.1 src/external/gpl2/libmalloc/dist/mem-limits.h:1.2
--- src/external/gpl2/libmalloc/dist/mem-limits.h:1.1.1.1 Wed Jan 13 16:42:18 2016
+++ src/external/gpl2/libmalloc/dist/mem-limits.h Wed Jan 13 16:56:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mem-limits.h,v 1.1.1.1 2016/01/13 21:42:18 christos Exp $ */
+/* $NetBSD: mem-limits.h,v 1.2 2016/01/13 21:56:38 christos Exp $ */
/* Includes for memory limit warnings.
Copyright (C) 1990, 1993, 1994 Free Software Foundation, Inc.
@@ -41,7 +41,7 @@ Cambridge, MA 02139, USA. */
#include
#endif
-#ifdef __bsdi__
+#if defined(__bsdi__) || defined(__NetBSD__)
#define BSD4_2
#endif
@@ -173,7 +173,8 @@ get_lim_data ()
{
struct rlimit XXrlimit;
- getrlimit (RLIMIT_DATA, &XXrlimit);
+ if (getrlimit (RLIMIT_DATA, &XXrlimit) == -1)
+ XXrlimit.rlim_cur = -1;
#ifdef RLIM_INFINITY
lim_data = XXrlimit.rlim_cur & RLIM_INFINITY; /* soft limit */
#else
Index: src/external/gpl2/libmalloc/dist/morecore.c
diff -u src/external/gpl2/libmalloc/dist/morecore.c:1.1.1.1 src/external/gpl2/libmalloc/dist/morecore.c:1.2
--- src/external/gpl2/libmalloc/dist/morecore.c:1.1.1.1 Wed Jan 13 16:42:18 2016
+++ src/external/gpl2/libmalloc/dist/morecore.c Wed Jan 13 16:56:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: morecore.c,v 1.1.1.1 2016/01/13 21:42:18 christos Exp $ */
+/* $NetBSD: morecore.c,v 1.2 2016/01/13 21:56:38 christos Exp $ */
/* Copyright (C) 1991, 1992, 1993, 1
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Wed Jan 13 21:57:26 UTC 2016
Modified Files:
src/lib: Makefile
Log Message:
switch to the external version of libmalloc
To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/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/lib/Makefile
diff -u src/lib/Makefile:1.237 src/lib/Makefile:1.238
--- src/lib/Makefile:1.237 Thu Dec 31 15:11:32 2015
+++ src/lib/Makefile Wed Jan 13 16:57:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.237 2015/12/31 20:11:32 christos Exp $
+# $NetBSD: Makefile,v 1.238 2016/01/13 21:57:26 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -75,7 +75,7 @@ SUBDIR+= ../external/mit/expat/lib
SUBDIR+= ../external/public-domain/sqlite/lib
-SUBDIR+= ../gnu/lib/libmalloc
+SUBDIR+= ../external/gpl2/libmalloc
.if (${MKGCC} != "no")
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libobjc
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Jan 13 22:01:15 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: Document archeological digs for our gnumalloc. To generate a diff of this commit: cvs rdiff -u -r1.1295 -r1.1296 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.1295 src/doc/3RDPARTY:1.1296 --- src/doc/3RDPARTY:1.1295 Wed Jan 13 14:27:26 2016 +++ src/doc/3RDPARTY Wed Jan 13 17:01:15 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1295 2016/01/13 19:27:26 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1296 2016/01/13 22:01:15 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1298,6 +1298,29 @@ Notes: Use src/gnu/dist/texinfo/texinfo2netbsd for preparing the source tree for the import. +Package: malloc +Version: 1995-01-15 +Current Vers: 1995-01-15 +Maintainer: FSF +Archive Site: ftp://prep.ai.mit.edu/old-gnu/malloc.tar.gz +Home Page: +Mailing List: +Responsible: christos +License: GPLv2+ +Location: external/gpl2/libmalloc +Notes: +The original version of gnumalloc was added (not imported) from +prep.ai.mit.edu in src/gnu/lib/libmalloc in 1993. This is the newest +version from 1995. It is written by Mike Haertel, and was distributed +both standalone and as part of glibc. At some point glibc switched +to use Doug Lea's ptmalloc which is now tightly bound with glibc +and cannot be separated. The Doug Lea version of malloc is also +distributed in a standalone form by Wolfram Gloger in +http://www.malloc.de/en/. We can consider switching to ptmalloc +at some point since it will provide an alternative MT malloc, but +perhaps this implementation should be kept anyway for historical +purposes. + Package: tmux Version: 2.1 Current Vers: 2.1
CVS commit: src/gnu/lib/libmalloc
Module Name:src Committed By: christos Date: Wed Jan 13 22:02:48 UTC 2016 Removed Files: src/gnu/lib/libmalloc: COPYING.LIB ChangeLog Makefile Makefile.gnu OChangeLog README VERSION calloc.c cfree.c combined.c free.c getpagesize.h gmalloc-head.c malloc.c malloc.h mcheck.c mem-limits.h memalign.c morecore.c mstats.c mtrace.awk mtrace.c ralloc.c realloc.c shlib_version valloc.c vm-limit.c Log Message: libmalloc has moved to external To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/gnu/lib/libmalloc/COPYING.LIB \ src/gnu/lib/libmalloc/ChangeLog src/gnu/lib/libmalloc/Makefile.gnu \ src/gnu/lib/libmalloc/OChangeLog src/gnu/lib/libmalloc/README \ src/gnu/lib/libmalloc/VERSION src/gnu/lib/libmalloc/calloc.c \ src/gnu/lib/libmalloc/cfree.c src/gnu/lib/libmalloc/combined.c \ src/gnu/lib/libmalloc/free.c src/gnu/lib/libmalloc/gmalloc-head.c \ src/gnu/lib/libmalloc/malloc.c src/gnu/lib/libmalloc/mcheck.c \ src/gnu/lib/libmalloc/memalign.c src/gnu/lib/libmalloc/morecore.c \ src/gnu/lib/libmalloc/mstats.c src/gnu/lib/libmalloc/mtrace.awk \ src/gnu/lib/libmalloc/realloc.c src/gnu/lib/libmalloc/vm-limit.c cvs rdiff -u -r1.8 -r0 src/gnu/lib/libmalloc/Makefile cvs rdiff -u -r1.2 -r0 src/gnu/lib/libmalloc/getpagesize.h \ src/gnu/lib/libmalloc/malloc.h src/gnu/lib/libmalloc/mtrace.c \ src/gnu/lib/libmalloc/valloc.c cvs rdiff -u -r1.4 -r0 src/gnu/lib/libmalloc/mem-limits.h \ src/gnu/lib/libmalloc/shlib_version cvs rdiff -u -r1.3 -r0 src/gnu/lib/libmalloc/ralloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/gnu
Module Name:src Committed By: christos Date: Wed Jan 13 22:03:38 UTC 2016 Modified Files: src/gnu: README Log Message: there is no more lib To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/gnu/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/README diff -u src/gnu/README:1.5 src/gnu/README:1.6 --- src/gnu/README:1.5 Thu Dec 4 18:32:37 2003 +++ src/gnu/README Wed Jan 13 17:03:38 2016 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.5 2003/12/04 23:32:37 keihan Exp $ +$NetBSD: README,v 1.6 2016/01/13 22:03:38 christos Exp $ Organization of Sources: @@ -11,7 +11,6 @@ the standard GNU source tree layout unde The build infrastructure uses the normal BSD way under: - lib/* usr.bin/* The makefiles in the above hierarchy will "reach over" into
CVS commit: src/tools
Module Name:src
Committed By: christos
Date: Wed Jan 13 23:01:15 UTC 2016
Modified Files:
src/tools: Makefile.gnuhost
Log Message:
look in external first.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/tools/Makefile.gnuhost
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile.gnuhost
diff -u src/tools/Makefile.gnuhost:1.42 src/tools/Makefile.gnuhost:1.43
--- src/tools/Makefile.gnuhost:1.42 Tue Aug 13 16:41:25 2013
+++ src/tools/Makefile.gnuhost Wed Jan 13 18:01:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gnuhost,v 1.42 2013/08/13 20:41:25 drochner Exp $
+# $NetBSD: Makefile.gnuhost,v 1.43 2016/01/13 23:01:15 christos Exp $
#
# Rules used when building a GNU host package. Expects MODULE to be set.
#
@@ -24,7 +24,11 @@ HOST_CFLAGS+=-O2 -no-cpp-precomp
.endif
MAKE_PROGRAM?= ${MAKE}
+.if exists(${.CURDIR}/../../external/gpl2/${MODULE}/dist)
+GNUHOSTDIST?= ${.CURDIR}/../../external/gpl2/${MODULE}/dist
+.else
GNUHOSTDIST?= ${.CURDIR}/../../gnu/dist/${MODULE}
+.endif
FIND_ARGS+= \! \( -type d \( \
-name 'CVS' -o \
CVS import: src/external/gpl2/texinfo/dist
Module Name:src Committed By: christos Date: Thu Jan 14 00:11:30 UTC 2016 Update of /cvsroot/src/external/gpl2/texinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5593 Log Message: import texinfo-4.8a Status: Vendor Tag: FSF Release Tags: texinfo-4-8a N src/external/gpl2/texinfo/dist/README N src/external/gpl2/texinfo/dist/configure.ac N src/external/gpl2/texinfo/dist/AUTHORS N src/external/gpl2/texinfo/dist/aclocal.m4 N src/external/gpl2/texinfo/dist/Makefile.am N src/external/gpl2/texinfo/dist/Makefile.in N src/external/gpl2/texinfo/dist/config.in N src/external/gpl2/texinfo/dist/configure N src/external/gpl2/texinfo/dist/ABOUT-NLS N src/external/gpl2/texinfo/dist/INSTALL N src/external/gpl2/texinfo/dist/COPYING N src/external/gpl2/texinfo/dist/ChangeLog N src/external/gpl2/texinfo/dist/NEWS N src/external/gpl2/texinfo/dist/TODO N src/external/gpl2/texinfo/dist/config.guess N src/external/gpl2/texinfo/dist/config.rpath N src/external/gpl2/texinfo/dist/config.sub N src/external/gpl2/texinfo/dist/depcomp N src/external/gpl2/texinfo/dist/install-sh N src/external/gpl2/texinfo/dist/missing N src/external/gpl2/texinfo/dist/INSTALL.generic N src/external/gpl2/texinfo/dist/ChangeLog.46 N src/external/gpl2/texinfo/dist/mkinstalldirs N src/external/gpl2/texinfo/dist/INTRODUCTION N src/external/gpl2/texinfo/dist/README.dev N src/external/gpl2/texinfo/dist/intl/config.charset N src/external/gpl2/texinfo/dist/intl/Makefile.in N src/external/gpl2/texinfo/dist/intl/ChangeLog N src/external/gpl2/texinfo/dist/intl/hash-string.h N src/external/gpl2/texinfo/dist/intl/locale.alias N src/external/gpl2/texinfo/dist/intl/ref-add.sin N src/external/gpl2/texinfo/dist/intl/ref-del.sin N src/external/gpl2/texinfo/dist/intl/gmo.h N src/external/gpl2/texinfo/dist/intl/gettextP.h N src/external/gpl2/texinfo/dist/intl/eval-plural.h N src/external/gpl2/texinfo/dist/intl/loadinfo.h N src/external/gpl2/texinfo/dist/intl/plural-exp.h N src/external/gpl2/texinfo/dist/intl/localcharset.h N src/external/gpl2/texinfo/dist/intl/relocatable.h N src/external/gpl2/texinfo/dist/intl/xsize.h N src/external/gpl2/texinfo/dist/intl/printf-args.h N src/external/gpl2/texinfo/dist/intl/printf-args.c N src/external/gpl2/texinfo/dist/intl/printf-parse.h N src/external/gpl2/texinfo/dist/intl/wprintf-parse.h N src/external/gpl2/texinfo/dist/intl/printf-parse.c N src/external/gpl2/texinfo/dist/intl/vasnprintf.h N src/external/gpl2/texinfo/dist/intl/log.c N src/external/gpl2/texinfo/dist/intl/vasnwprintf.h N src/external/gpl2/texinfo/dist/intl/vasnprintf.c N src/external/gpl2/texinfo/dist/intl/os2compat.h N src/external/gpl2/texinfo/dist/intl/bindtextdom.c N src/external/gpl2/texinfo/dist/intl/libgnuintl.h.in N src/external/gpl2/texinfo/dist/intl/dcgettext.c N src/external/gpl2/texinfo/dist/intl/dgettext.c N src/external/gpl2/texinfo/dist/intl/gettext.c N src/external/gpl2/texinfo/dist/intl/finddomain.c N src/external/gpl2/texinfo/dist/intl/loadmsgcat.c N src/external/gpl2/texinfo/dist/intl/localealias.c N src/external/gpl2/texinfo/dist/intl/textdomain.c N src/external/gpl2/texinfo/dist/intl/l10nflist.c N src/external/gpl2/texinfo/dist/intl/explodename.c N src/external/gpl2/texinfo/dist/intl/dcigettext.c N src/external/gpl2/texinfo/dist/intl/dcngettext.c N src/external/gpl2/texinfo/dist/intl/dngettext.c N src/external/gpl2/texinfo/dist/intl/ngettext.c N src/external/gpl2/texinfo/dist/intl/plural.y N src/external/gpl2/texinfo/dist/intl/plural-exp.c N src/external/gpl2/texinfo/dist/intl/localcharset.c N src/external/gpl2/texinfo/dist/intl/relocatable.c N src/external/gpl2/texinfo/dist/intl/osdep.c N src/external/gpl2/texinfo/dist/intl/localename.c N src/external/gpl2/texinfo/dist/intl/printf.c N src/external/gpl2/texinfo/dist/intl/os2compat.c N src/external/gpl2/texinfo/dist/intl/intl-compat.c N src/external/gpl2/texinfo/dist/intl/plural.c N src/external/gpl2/texinfo/dist/intl/VERSION N src/external/gpl2/texinfo/dist/m4/inttypes-pri.m4 N src/external/gpl2/texinfo/dist/m4/codeset.m4 N src/external/gpl2/texinfo/dist/m4/gettext.m4 N src/external/gpl2/texinfo/dist/m4/glibc21.m4 N src/external/gpl2/texinfo/dist/m4/iconv.m4 N src/external/gpl2/texinfo/dist/m4/intdiv0.m4 N src/external/gpl2/texinfo/dist/m4/intmax.m4 N src/external/gpl2/texinfo/dist/m4/inttypes_h.m4 N src/external/gpl2/texinfo/dist/m4/inttypes.m4 N src/external/gpl2/texinfo/dist/m4/lib-prefix.m4 N src/external/gpl2/texinfo/dist/m4/lcmessage.m4 N src/external/gpl2/texinfo/dist/m4/lib-ld.m4 N src/external/gpl2/texinfo/dist/m4/lib-link.m4 N src/external/gpl2/texinfo/dist/m4/longdouble.m4 N src/external/gpl2/texinfo/dist/m4/longlong.m4 N src/external/gpl2/texinfo/dist/m4/mkstemp.m4 N src/external/gpl2/texinfo/dist/m4/nls.m4 N src/external/gpl2/texinfo/dist/m4/onceonly_2_57.m4 N src/external/gpl2/texinfo/dist/m4/po.m4 N src/external/gpl2/texinfo/dist/m4/printf-posix.m4 N src/external/gpl2/texinfo/dist/m4/progtest.m4 N src/external/gpl2/texinfo/dist/m4/signed.
CVS commit: src/external/gpl2/texinfo
Module Name:src Committed By: christos Date: Thu Jan 14 00:34:53 UTC 2016 Modified Files: src/external/gpl2/texinfo/dist: Makefile.in config.guess configure src/external/gpl2/texinfo/dist/doc: makeinfo.1 texindex.1 texinfo.txi src/external/gpl2/texinfo/dist/info: echo-area.c info.c infokey.c nodes.c session.c terminal.c src/external/gpl2/texinfo/dist/intl: Makefile.in src/external/gpl2/texinfo/dist/lib: getopt.c system.h src/external/gpl2/texinfo/dist/makeinfo: cmds.c files.c files.h makeinfo.c makeinfo.h node.c sectioning.c xml.c src/external/gpl2/texinfo/dist/po: Makefile.in.in src/external/gpl2/texinfo/dist/util: install-info.c texi2dvi texindex.c Added Files: src/external/gpl2/texinfo: Makefile Makefile.inc texinfo2netbsd src/external/gpl2/texinfo/bin: Makefile Makefile.inc src/external/gpl2/texinfo/bin/info: Makefile src/external/gpl2/texinfo/bin/infokey: Makefile src/external/gpl2/texinfo/bin/install-info: Makefile src/external/gpl2/texinfo/bin/makeinfo: Makefile src/external/gpl2/texinfo/bin/texi2dvi: Makefile src/external/gpl2/texinfo/bin/texindex: Makefile src/external/gpl2/texinfo/include: config.h src/external/gpl2/texinfo/lib: Makefile src/external/gpl2/texinfo/makedoc: Makefile Log Message: Apply our patches and add build glue. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/Makefile \ src/external/gpl2/texinfo/Makefile.inc \ src/external/gpl2/texinfo/texinfo2netbsd cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/bin/Makefile \ src/external/gpl2/texinfo/bin/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/bin/info/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/bin/infokey/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/bin/install-info/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/bin/makeinfo/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/bin/texi2dvi/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/bin/texindex/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/Makefile.in \ src/external/gpl2/texinfo/dist/config.guess \ src/external/gpl2/texinfo/dist/configure cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/doc/makeinfo.1 \ src/external/gpl2/texinfo/dist/doc/texindex.1 \ src/external/gpl2/texinfo/dist/doc/texinfo.txi cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/info/echo-area.c \ src/external/gpl2/texinfo/dist/info/info.c \ src/external/gpl2/texinfo/dist/info/infokey.c \ src/external/gpl2/texinfo/dist/info/nodes.c \ src/external/gpl2/texinfo/dist/info/session.c \ src/external/gpl2/texinfo/dist/info/terminal.c cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/intl/Makefile.in cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/lib/getopt.c \ src/external/gpl2/texinfo/dist/lib/system.h cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/makeinfo/cmds.c \ src/external/gpl2/texinfo/dist/makeinfo/files.c \ src/external/gpl2/texinfo/dist/makeinfo/files.h \ src/external/gpl2/texinfo/dist/makeinfo/makeinfo.c \ src/external/gpl2/texinfo/dist/makeinfo/makeinfo.h \ src/external/gpl2/texinfo/dist/makeinfo/node.c \ src/external/gpl2/texinfo/dist/makeinfo/sectioning.c \ src/external/gpl2/texinfo/dist/makeinfo/xml.c cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/po/Makefile.in.in cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl2/texinfo/dist/util/install-info.c \ src/external/gpl2/texinfo/dist/util/texi2dvi \ src/external/gpl2/texinfo/dist/util/texindex.c cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/include/config.h cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/lib/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/texinfo/makedoc/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/texinfo/dist/Makefile.in diff -u src/external/gpl2/texinfo/dist/Makefile.in:1.1.1.1 src/external/gpl2/texinfo/dist/Makefile.in:1.2 --- src/external/gpl2/texinfo/dist/Makefile.in:1.1.1.1 Wed Jan 13 19:11:27 2016 +++ src/external/gpl2/texinfo/dist/Makefile.in Wed Jan 13 19:34:52 2016 @@ -230,7 +230,7 @@ EXTRA_DIST = ChangeLog.46 INSTALL.generi # This is to prevent texinfo.tex from being included in the top-level # distribution directory. TEXINFO_TEX = doc/texinfo.tex -@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) intl m4 lib info makeinfo po util doc +@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) intl m4 lib makeinfo po util doc @TOOLS_ONLY_TRUE@SUBDIRS = lib info makeinfo util # for gettext. Index: src/external/gpl2/texinfo/dist/config.guess diff -u src/external/gpl2/texinfo/dist/config.guess:1.1.1.1 src/external/gpl2/texinfo/dist/config.guess:1.
CVS commit: src/external/gpl2/texinfo
Module Name:src
Committed By: christos
Date: Thu Jan 14 00:38:19 UTC 2016
Modified Files:
src/external/gpl2/texinfo: Makefile.inc
Log Message:
install in /usr/bin
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/texinfo/Makefile.inc
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/texinfo/Makefile.inc
diff -u src/external/gpl2/texinfo/Makefile.inc:1.1 src/external/gpl2/texinfo/Makefile.inc:1.2
--- src/external/gpl2/texinfo/Makefile.inc:1.1 Wed Jan 13 19:34:52 2016
+++ src/external/gpl2/texinfo/Makefile.inc Wed Jan 13 19:38:19 2016
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.1 2016/01/14 00:34:52 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/14 00:38:19 christos Exp $
+BINDIR= /usr/bin
DIST= ${NETBSDSRCDIR}/external/gpl2/texinfo
IDIST= ${DIST}/dist
CVS commit: src/external/gpl2
Module Name:src Committed By: christos Date: Thu Jan 14 00:38:30 UTC 2016 Modified Files: src/external/gpl2: Makefile Log Message: hook texinfo To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/gpl2/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/Makefile diff -u src/external/gpl2/Makefile:1.10 src/external/gpl2/Makefile:1.11 --- src/external/gpl2/Makefile:1.10 Wed Jan 13 14:02:29 2016 +++ src/external/gpl2/Makefile Wed Jan 13 19:38:30 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2016/01/13 19:02:29 christos Exp $ +# $NetBSD: Makefile,v 1.11 2016/01/14 00:38:30 christos Exp $ .include @@ -17,6 +17,6 @@ SUBDIR+= grep SUBDIR+=groff .endif -SUBDIR+= gettext diffutils +SUBDIR+= gettext diffutils texinfo .include
CVS commit: src/gnu/usr.bin/texinfo
Module Name:src Committed By: christos Date: Thu Jan 14 00:39:06 UTC 2016 Removed Files: src/gnu/usr.bin/texinfo: Makefile Makefile.inc src/gnu/usr.bin/texinfo/common: Makefile config.h src/gnu/usr.bin/texinfo/info: Makefile src/gnu/usr.bin/texinfo/infokey: Makefile src/gnu/usr.bin/texinfo/install-info: Makefile src/gnu/usr.bin/texinfo/makedoc: Makefile src/gnu/usr.bin/texinfo/makeinfo: Makefile src/gnu/usr.bin/texinfo/texi2dvi: Makefile src/gnu/usr.bin/texinfo/texindex: Makefile Log Message: unhook texinfo To generate a diff of this commit: cvs rdiff -u -r1.23 -r0 src/gnu/usr.bin/texinfo/Makefile cvs rdiff -u -r1.10 -r0 src/gnu/usr.bin/texinfo/Makefile.inc cvs rdiff -u -r1.13 -r0 src/gnu/usr.bin/texinfo/common/Makefile cvs rdiff -u -r1.12 -r0 src/gnu/usr.bin/texinfo/common/config.h cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/texinfo/info/Makefile cvs rdiff -u -r1.3 -r0 src/gnu/usr.bin/texinfo/infokey/Makefile cvs rdiff -u -r1.10 -r0 src/gnu/usr.bin/texinfo/install-info/Makefile cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/texinfo/makedoc/Makefile cvs rdiff -u -r1.8 -r0 src/gnu/usr.bin/texinfo/makeinfo/Makefile cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/texinfo/texi2dvi/Makefile cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/texinfo/texindex/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Jan 14 00:41:15 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: texinfo has moved. To generate a diff of this commit: cvs rdiff -u -r1.1296 -r1.1297 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.1296 src/doc/3RDPARTY:1.1297 --- src/doc/3RDPARTY:1.1296 Wed Jan 13 17:01:15 2016 +++ src/doc/3RDPARTY Wed Jan 13 19:41:14 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1296 2016/01/13 22:01:15 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1297 2016/01/14 00:41:14 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1285,17 +1285,17 @@ Location: regress/lib/libc/ieeefp/testfl Notes: Package: texinfo -Version: 4.8 +Version: 4.8a (Last GPLv2+ version) Current Vers: 5.2 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/texinfo/ Home Page: http://www.gnu.org/software/texinfo/ Mailing List: bug-texi...@gnu.org Responsible: -License: GPLv2+ (4.8), GPLv3+ (4.9 and later) -Location: gnu/dist/texinfo +License: GPLv2+ (4.8a), GPLv3+ (4.9 and later) +Location: external/gpl2/texinfo Notes: -Use src/gnu/dist/texinfo/texinfo2netbsd for preparing the source tree +Use src/external/gpl2/texinfo/texinfo2netbsd for preparing the source tree for the import. Package: malloc
CVS commit: src/gnu/dist/texinfo
Module Name:src Committed By: christos Date: Thu Jan 14 00:41:44 UTC 2016 Removed Files: src/gnu/dist/texinfo: ABOUT-NLS AUTHORS COPYING ChangeLog ChangeLog.46 INSTALL INSTALL.generic INTRODUCTION Makefile.am Makefile.in NEWS README README.dev TODO aclocal.m4 config.guess config.in config.rpath config.sub configure configure.ac depcomp install-sh missing mkinstalldirs texinfo2netbsd src/gnu/dist/texinfo/doc: Makefile.am Makefile.in README epsf.tex fdl.texi info-stnd.texi info.1 info.5 info.texi infokey.1 install-info.1 makeinfo.1 mdate-sh pdfcolor.tex stamp-1 stamp-vti texi2dvi.1 texindex.1 texinfo.5 texinfo.tex texinfo.txi txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex txi-it.tex txi-nl.tex txi-no.tex txi-pl.tex txi-pt.tex txi-tr.tex version-stnd.texi version.texi src/gnu/dist/texinfo/info: Makefile.am Makefile.in README dir.c display.c display.h doc.h dribble.c dribble.h echo-area.c echo-area.h filesys.c filesys.h footnotes.c footnotes.h gc.c gc.h indices.c indices.h info-utils.c info-utils.h info.c info.h infodoc.c infokey.c infokey.h infomap.c infomap.h key.h m-x.c makedoc.c man.c man.h nodemenu.c nodes.c nodes.h pcterm.c search.c search.h session.c session.h signals.c signals.h termdep.h terminal.c terminal.h tilde.c tilde.h variables.c variables.h window.c window.h src/gnu/dist/texinfo/intl: ChangeLog Makefile.in VERSION bindtextdom.c config.charset dcgettext.c dcigettext.c dcngettext.c dgettext.c dngettext.c eval-plural.h explodename.c finddomain.c gettext.c gettextP.h gmo.h hash-string.h intl-compat.c l10nflist.c libgnuintl.h.in loadinfo.h loadmsgcat.c localcharset.c localcharset.h locale.alias localealias.c localename.c log.c ngettext.c os2compat.c os2compat.h osdep.c plural-exp.c plural-exp.h plural.c plural.y printf-args.c printf-args.h printf-parse.c printf-parse.h printf.c ref-add.sin ref-del.sin relocatable.c relocatable.h textdomain.c vasnprintf.c vasnprintf.h vasnwprintf.h wprintf-parse.h xsize.h src/gnu/dist/texinfo/lib: Makefile.am Makefile.in README alloca.c getopt.c getopt.h getopt1.c getopt_.h getopt_int.h gettext.h memcpy.c memmove.c mkstemp.c strcase.h strcasecmp.c strdup.c strdup.h strerror.c strncasecmp.c substring.c system.h tempname.c xalloc.h xexit.c xmalloc.c xstrdup.c src/gnu/dist/texinfo/m4: ChangeLog Makefile.am Makefile.in check-decl.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 mkstemp.m4 nls.m4 onceonly.m4 onceonly_2_57.m4 po.m4 prereq.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 strcase.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 src/gnu/dist/texinfo/makeinfo: Makefile.am Makefile.in README cmds.c cmds.h defun.c defun.h files.c files.h float.c float.h footnote.c footnote.h html.c html.h index.c index.h insertion.c insertion.h lang.c lang.h macro.c macro.h makeinfo.c makeinfo.h multi.c multi.h node.c node.h sectioning.c sectioning.h toc.c toc.h xml.c xml.h xref.c xref.h src/gnu/dist/texinfo/makeinfo/tests: Makefile.am Makefile.in accent accent-text.txi accent.txi accentenc accentenc.txi cond cond.txi copying copying.txi defxcond defxcond.txi html-docdesc html-docdesc.txi html-extrali html-extrali.txi html-manuals html-min html-min.txi html-para html-para.txi html-title html-title.txi html-top html-top.txi incl-incl.txi include-value include-value.txi macro-at macro-at.txi menu-whitespace menu-whitespace.txi no-headers node-expand node-expand.txi node-value node-value.txi node-whitespace node-whitespace.txi top top.txi twofiles src/gnu/dist/texinfo/po: ChangeLog LINGUAS Makefile.in.in Makevars POTFILES.in Rules-quot boldquot.sed cs.gmo cs.po da.gmo da.po de.gmo de.po de_AT.gmo de_AT.po en@boldquot.header en@quot.header eo.gmo eo.po fr.gmo fr.po he.gmo he.po hr.gmo hr.po insert-header.sin ja.gmo ja.po nb.gmo nb.po nl.gmo nl.po no.gmo no.po pl.gmo pl.po quot.sed remove-potcdate.sin ro.gmo ro.po ru.gmo ru.po stamp-po sv.gmo sv.po texinfo.pot tr.gmo tr.po zh_CN.gmo zh_CN.po zh_TW.gmo zh_TW.po src/gnu/dist/texinfo/util: Makefile.am Makefile.in README deref.c dir-example fix-i
CVS commit: src/tools/groff
Module Name:src
Committed By: christos
Date: Thu Jan 14 01:13:26 UTC 2016
Modified Files:
src/tools/groff: Makefile
Log Message:
grr another copy of the path I missed; factor out to a variable.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/tools/groff/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/groff/Makefile
diff -u src/tools/groff/Makefile:1.31 src/tools/groff/Makefile:1.32
--- src/tools/groff/Makefile:1.31 Wed Jan 13 14:29:26 2016
+++ src/tools/groff/Makefile Wed Jan 13 20:13:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2016/01/13 19:29:26 christos Exp $
+# $NetBSD: Makefile,v 1.32 2016/01/14 01:13:26 christos Exp $
MODULE= groff
@@ -10,6 +10,7 @@ CONFIGURE_ARGS+= --without-x
TMACDIR= ${TOOLDIR}/share/groff/tmac
SITETMACDIR= ${TOOLDIR}/share/groff/site-tmac
+GROFFDIR= ${.CURDIR}/../../external/gpl2/groff
# Add gnuwrap hack directly to the Makefile.
_NOWRAPPER=1
@@ -31,7 +32,7 @@ _post_conf: .USE
.include "${.CURDIR}/../Makefile.gnuhost"
.-include "${TOOLDIR}/share/compat/defs.mk"
-.PATH: ${.CURDIR}/../../share/tmac ${.CURDIR}/../../gnu/usr.bin/groff/tmac
+.PATH: ${.CURDIR}/../../share/tmac ${GROFFDIR}/tmac
_installtmac: .USE
.if ${MKUPDATE} != "no"
@@ -61,8 +62,7 @@ ${SITETMACDIR}/${F}: ${F}-s _installtmac
.ORDER: realinstall ${SITETMACDIR}/${F}
CLEANFILES+=${F}-s
${F}-s: ${F}
- ${TOOL_SED} -f ${.CURDIR}/../../external/gpl2/groff/dist/tmac/strip.sed \
- ${.ALLSRC} > ${.TARGET}
+ ${TOOL_SED} -f ${GROFFDIR}/dist/tmac/strip.sed ${.ALLSRC} > ${.TARGET}
.endfor
# The silly walk below is because sometimes the files begin with "g",
CVS import: othersrc/external/mit/micropython
Module Name:othersrc
Committed By: agc
Date: Thu Jan 14 01:38:53 UTC 2016
Update of /cvsroot/othersrc/external/mit/micropython
In directory ivanova.netbsd.org:/tmp/cvs-serv18307
Log Message:
Import micropython version 1.5.2 into othersrc.
Micropython is a python3 implementation that has been optimised for
micro-controllers and small embedded systems. It also has a "unix"
port. It has an MIT license.
This is version 1.5.2 of micropython.
MicroPython implements the entire Python 3.4 syntax (including
exceptions, "with", "yield from", etc.). The following core
datatypes are provided: str (including basic Unicode
support), bytes, bytearray, tuple, list, dict, set, frozenset,
array.array, collections.namedtuple, classes and instances.
Builtin modules include sys, time, and struct. Note that only
subset of Python 3.4 functionality implemented for the data
types and modules.
This is the standard micropython source (version v1.5.2), which has been
adapted to use reachover infrastructure. At the present time, libffi
(from pkgsrc) is used. Alternative locations for libffi can be set
using the PKGSRC_PREFIX definition to make.
In the whole scheme of things, micropython is quite small:
% size bin/micropython
textdata bss dec hex filename
39349516242208 397327 6100f bin/micropython
%
and runs much as expected:
% bin/micropython
MicroPython v1.5.2 on 2016-01-13; linux version
Use Ctrl-D to exit, Ctrl-E for paste mode
>>> print("hello world")
hello world
>>> list(5 * x + y for x in range(10) for y in [4, 2, 1])
[4, 2, 1, 9, 7, 6, 14, 12, 11, 19, 17, 16, 24, 22, 21, 29, 27, 26, 34,
32, 31, 39, 37, 36, 44, 42, 41, 49, 47, 46]
>>>
% python2.7
Python 2.7.10 (default, Oct 17 2015, 17:55:29)
[GCC 4.8.5] on netbsd7
Type "help", "copyright", "credits" or "license" for more information.
>>> print("hello world")
hello world
>>> list(5 * x + y for x in range(10) for y in [4, 2, 1])
[4, 2, 1, 9, 7, 6, 14, 12, 11, 19, 17, 16, 24, 22, 21, 29, 27, 26, 34,
32, 31, 39, 37, 36, 44, 42, 41, 49, 47, 46]
>>> ^D
%
This (reachover) version runs all the tests which the gmake version does.
% make t
cd bin && make t
cd /home/agc/local/micropython/bin/../dist/unix/../tests && env
MICROPY_MICROPYTHON=/home/agc/local/micropython/bin/micropython ./run-tests
pass basics/0prelim.py
pass basics/andor.py
pass basics/array1.py
pass basics/array_add.py
pass basics/array_construct.py
pass basics/array_construct2.py
...
pass unix/ffi_callback.py
pass unix/ffi_float.py
pass unix/ffi_float2.py
474 tests performed (15812 individual testcases)
474 tests passed
5 tests skipped: cmd_showbc cmd_verbose machine1 machine_mem
extra_coverage
%
The sources are available from github:
https://github.com/micropython/micropython
micropython release at:
https://github.com/micropython/micropython/releases
Sources for 1.5.2 taken from:
https://github.com/micropython/micropython/archive/v1.5.2.tar.gz
Alistair Crooks
a...@netbsd.org
Wed Jan 13 17:15:30 PST 2016
Status:
Vendor Tag: MICROPYTHON
Release Tags: micropython-1-5-2-base
N othersrc/external/mit/micropython/README
N othersrc/external/mit/micropython/Makefile
N othersrc/external/mit/micropython/bin/_frozen_upip.c
N othersrc/external/mit/micropython/bin/mpversion.h
N othersrc/external/mit/micropython/bin/Makefile
N othersrc/external/mit/micropython/bin/qstrdefs.preprocessed.h
N othersrc/external/mit/micropython/bin/qstrdefs.generated.h
N othersrc/external/mit/micropython/bin/emitnative.c
N othersrc/external/mit/micropython/dist/CODECONVENTIONS.md
N othersrc/external/mit/micropython/dist/.gitattributes
N othersrc/external/mit/micropython/dist/.gitignore
N othersrc/external/mit/micropython/dist/.gitmodules
N othersrc/external/mit/micropython/dist/.travis.yml
N othersrc/external/mit/micropython/dist/ACKNOWLEDGEMENTS
N othersrc/external/mit/micropython/dist/CONTRIBUTING.md
N othersrc/external/mit/micropython/dist/LICENSE
N othersrc/external/mit/micropython/dist/README.md
N othersrc/external/mit/micropython/dist/bare-arm/mpconfigport.h
N othersrc/external/mit/micropython/dist/bare-arm/Makefile
N othersrc/external/mit/micropython/dist/bare-arm/main.c
N othersrc/external/mit/micropython/dist/bare-arm/qstrdefsport.h
N othersrc/external/mit/micropython/dist/bare-arm/mphalport.h
N othersrc/external/mit/micropython/dist/bare-arm/stm32f405.ld
N othersrc/external/mit/micropython/dist/lib/README.md
N othersrc/external/mit/micropython/dist/lib/fatfs/00readme.txt
N othersrc/external/mit/micropython/dist/lib/fatfs/diskio.c
N othersrc/external/m
CVS commit: othersrc/external/mit/micropython/dist
Module Name:othersrc
Committed By: agc
Date: Thu Jan 14 01:44:20 UTC 2016
Modified Files:
othersrc/external/mit/micropython/dist/lib/utils: pyexec.c
othersrc/external/mit/micropython/dist/py: modsys.c qstr.c qstr.h
othersrc/external/mit/micropython/dist/unix: Makefile main.c
mpconfigport.h mpconfigport_minimal.h
Log Message:
Build fixes for NetBSD and reachover infrastructure
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/mit/micropython/dist/lib/utils/pyexec.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/mit/micropython/dist/py/modsys.c \
othersrc/external/mit/micropython/dist/py/qstr.c \
othersrc/external/mit/micropython/dist/py/qstr.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/mit/micropython/dist/unix/Makefile \
othersrc/external/mit/micropython/dist/unix/main.c \
othersrc/external/mit/micropython/dist/unix/mpconfigport.h \
othersrc/external/mit/micropython/dist/unix/mpconfigport_minimal.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/mit/micropython/dist/lib/utils/pyexec.c
diff -u othersrc/external/mit/micropython/dist/lib/utils/pyexec.c:1.1.1.1 othersrc/external/mit/micropython/dist/lib/utils/pyexec.c:1.2
--- othersrc/external/mit/micropython/dist/lib/utils/pyexec.c:1.1.1.1 Thu Jan 14 01:38:49 2016
+++ othersrc/external/mit/micropython/dist/lib/utils/pyexec.c Thu Jan 14 01:44:20 2016
@@ -42,7 +42,7 @@
#endif
#include "readline.h"
#include "lib/utils/pyexec.h"
-#include "genhdr/mpversion.h"
+#include "mpversion.h"
pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
STATIC bool repl_display_debugging_info = 0;
Index: othersrc/external/mit/micropython/dist/py/modsys.c
diff -u othersrc/external/mit/micropython/dist/py/modsys.c:1.1.1.1 othersrc/external/mit/micropython/dist/py/modsys.c:1.2
--- othersrc/external/mit/micropython/dist/py/modsys.c:1.1.1.1 Thu Jan 14 01:38:50 2016
+++ othersrc/external/mit/micropython/dist/py/modsys.c Thu Jan 14 01:44:20 2016
@@ -35,7 +35,7 @@
#if MICROPY_PY_SYS
-#include "genhdr/mpversion.h"
+#include "mpversion.h"
/// \module sys - system specific functions
Index: othersrc/external/mit/micropython/dist/py/qstr.c
diff -u othersrc/external/mit/micropython/dist/py/qstr.c:1.1.1.1 othersrc/external/mit/micropython/dist/py/qstr.c:1.2
--- othersrc/external/mit/micropython/dist/py/qstr.c:1.1.1.1 Thu Jan 14 01:38:50 2016
+++ othersrc/external/mit/micropython/dist/py/qstr.c Thu Jan 14 01:44:20 2016
@@ -94,7 +94,7 @@ STATIC const qstr_pool_t const_pool = {
MP_QSTR_number_of, // corresponds to number of strings in array just below
{
#define QDEF(id, str) str,
-#include "genhdr/qstrdefs.generated.h"
+#include "qstrdefs.generated.h"
#undef QDEF
},
};
Index: othersrc/external/mit/micropython/dist/py/qstr.h
diff -u othersrc/external/mit/micropython/dist/py/qstr.h:1.1.1.1 othersrc/external/mit/micropython/dist/py/qstr.h:1.2
--- othersrc/external/mit/micropython/dist/py/qstr.h:1.1.1.1 Thu Jan 14 01:38:50 2016
+++ othersrc/external/mit/micropython/dist/py/qstr.h Thu Jan 14 01:44:20 2016
@@ -38,7 +38,7 @@
// first entry in enum will be MP_QSTR_NULL=0, which indicates invalid/no qstr
enum {
#define QDEF(id, str) id,
-#include "genhdr/qstrdefs.generated.h"
+#include "qstrdefs.generated.h"
#undef QDEF
MP_QSTR_number_of,
};
Index: othersrc/external/mit/micropython/dist/unix/Makefile
diff -u othersrc/external/mit/micropython/dist/unix/Makefile:1.1.1.1 othersrc/external/mit/micropython/dist/unix/Makefile:1.2
--- othersrc/external/mit/micropython/dist/unix/Makefile:1.1.1.1 Thu Jan 14 01:38:51 2016
+++ othersrc/external/mit/micropython/dist/unix/Makefile Thu Jan 14 01:44:20 2016
@@ -16,6 +16,7 @@ include ../py/py.mk
INC += -I.
INC += -I..
INC += -I$(BUILD)
+INC += -I$(BUILD)/genhdr
# compiler settings
CWARN = -Wall -Werror
@@ -196,7 +197,7 @@ $(BUILD)/_frozen_upip.c: $(BUILD)/frozen
../tools/make-frozen.py $(dir $^) > $@
# Select latest upip version available
-UPIP_TARBALL := $(shell ls -1 -v ../tools/micropython-upip-*.tar.gz | tail -n1)
+UPIP_TARBALL := $(shell ls -1 ../tools/micropython-upip-*.tar.gz | tail -n1)
$(BUILD)/frozen_upip/upip.py: $(UPIP_TARBALL)
$(ECHO) "MISC Preparing upip as frozen module"
@@ -224,10 +225,10 @@ libffi:
cd ../lib/libffi; ./autogen.sh
mkdir -p ../lib/libffi/build_dir; cd ../lib/libffi/build_dir; \
../configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out CC="$(CC)" CXX="$(CXX)" LD="$(LD)"; \
- make install-exec-recursive; make -C include install-data-am
+ $(MAKE) install-exec-recursive; $(MAKE) -C include install-data-am
axtls:
cd ../lib/axtls; cp config/upyconfig config/.config
- cd ../lib/axtls; make oldconfig -B
- cd ../lib/axtls; make clean
- cd ../lib/axtls; make all CC="$(CC)" LD="$(LD)"
+ cd ../lib/axtls; $(MAKE) oldconfig -B
+ cd ../lib/a
CVS commit: src/external/gpl2/groff
Module Name:src
Committed By: christos
Date: Thu Jan 14 02:30:19 UTC 2016
Modified Files:
src/external/gpl2/groff: Makefile Makefile.inc
src/external/gpl2/groff/bin/eqn: Makefile
src/external/gpl2/groff/bin/grn: Makefile
src/external/gpl2/groff/bin/groff: Makefile
src/external/gpl2/groff/bin/hpftodit: Makefile
src/external/gpl2/groff/bin/html: Makefile
src/external/gpl2/groff/bin/pic: Makefile
src/external/gpl2/groff/bin/refer: Makefile
src/external/gpl2/groff/bin/soelim: Makefile
src/external/gpl2/groff/bin/tbl: Makefile
src/external/gpl2/groff/bin/troff: Makefile
Removed Files:
src/external/gpl2/groff/dist/src/preproc/pic: pic.cpp
src/external/gpl2/groff/dist/src/preproc/refer: label.cpp
Log Message:
- remove generated files
- remove libdriver dependencies where they are not needed
- add bin to Makefile
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/Makefile \
src/external/gpl2/groff/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/eqn/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/grn/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/groff/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/hpftodit/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/html/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/pic/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/refer/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/soelim/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/tbl/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/troff/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl2/groff/dist/src/preproc/pic/pic.cpp
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl2/groff/dist/src/preproc/refer/label.cpp
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/groff/Makefile
diff -u src/external/gpl2/groff/Makefile:1.1 src/external/gpl2/groff/Makefile:1.2
--- src/external/gpl2/groff/Makefile:1.1 Wed Jan 13 14:01:55 2016
+++ src/external/gpl2/groff/Makefile Wed Jan 13 21:30:18 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:55 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/Makefile,v 2.11 2003/05/02 00:55:52 ru Exp $
-SUBDIR= lib .WAIT doc font man tmac devices
+SUBDIR= lib .WAIT bin doc font man tmac devices
.include
Index: src/external/gpl2/groff/Makefile.inc
diff -u src/external/gpl2/groff/Makefile.inc:1.1 src/external/gpl2/groff/Makefile.inc:1.2
--- src/external/gpl2/groff/Makefile.inc:1.1 Wed Jan 13 14:01:55 2016
+++ src/external/gpl2/groff/Makefile.inc Wed Jan 13 21:30:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2016/01/13 19:01:55 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $
@@ -79,7 +79,9 @@ DIST= ${NETBSDSRCDIR}/external/gpl2/gro
GROFF_DIST= ${DIST}/dist
PROGDPLIBS+= bib ${DIST}/lib/libbib
+.if !defined(NOLIBDRIVER)
PROGDPLIBS+= driver ${DIST}/lib/libdriver
+.endif
PROGDPLIBS+= groff ${DIST}/lib/libgroff
CPPFLAGS+= -DHAVE_CONFIG_H
Index: src/external/gpl2/groff/bin/eqn/Makefile
diff -u src/external/gpl2/groff/bin/eqn/Makefile:1.1 src/external/gpl2/groff/bin/eqn/Makefile:1.2
--- src/external/gpl2/groff/bin/eqn/Makefile:1.1 Wed Jan 13 14:01:56 2016
+++ src/external/gpl2/groff/bin/eqn/Makefile Wed Jan 13 21:30:18 2016
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/preproc/eqn
GROFFYSRCS= eqn.y
+NOLIBDRIVER=
.include
Index: src/external/gpl2/groff/bin/grn/Makefile
diff -u src/external/gpl2/groff/bin/grn/Makefile:1.1 src/external/gpl2/groff/bin/grn/Makefile:1.2
--- src/external/gpl2/groff/bin/grn/Makefile:1.1 Wed Jan 13 14:01:56 2016
+++ src/external/gpl2/groff/bin/grn/Makefile Wed Jan 13 21:30:18 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/preproc/grn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/preproc/grn
+NOLIBDRIVER=
.include
Index: src/external/gpl2/groff/bin/groff/Makefile
diff -u src/external/gpl2/groff/bin/groff/Makefile:1.1 src/external/gpl2/groff/bin/groff/Makefile:1.2
--- src/external/gpl2/groff/bin/groff/Makefile:1.1 Wed Jan 13 14:01:56 2016
+++ src/external/gpl2/groff/bin/groff/Makefile Wed Jan 13 21:30:18 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:56 christos Exp $
+#
CVS commit: src/external/gpl2/groff/bin
Module Name:src
Committed By: christos
Date: Thu Jan 14 02:41:58 UTC 2016
Modified Files:
src/external/gpl2/groff/bin: Makefile
Added Files:
src/external/gpl2/groff/bin/gdiffmk: Makefile
Log Message:
remove afmtodit, add gdiffmk
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/groff/bin/gdiffmk/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/groff/bin/Makefile
diff -u src/external/gpl2/groff/bin/Makefile:1.1 src/external/gpl2/groff/bin/Makefile:1.2
--- src/external/gpl2/groff/bin/Makefile:1.1 Wed Jan 13 14:01:55 2016
+++ src/external/gpl2/groff/bin/Makefile Wed Jan 13 21:41:58 2016
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:01:55 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/14 02:41:58 christos Exp $
-SUBDIR= addftinfo afmtodit eqn grn groff grog hpftodit html indxbib \
+SUBDIR= addftinfo eqn gdiffmk grn groff grog hpftodit html indxbib \
lkbib lookbib nroff pfbtops pic refer soelim tbl tfmtodit troff
+# afmtodit?
.include
Added files:
Index: src/external/gpl2/groff/bin/gdiffmk/Makefile
diff -u /dev/null src/external/gpl2/groff/bin/gdiffmk/Makefile:1.1
--- /dev/null Wed Jan 13 21:41:58 2016
+++ src/external/gpl2/groff/bin/gdiffmk/Makefile Wed Jan 13 21:41:58 2016
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 02:41:58 christos Exp $
+
+DIST_SUBDIR= contrib/gdiffmk
+
+.include
+
+SCRIPTS= gdiffmk
+MAN= gdiffmk.1
+CLEANFILES= ${SCRIPTS} ${MAN}
+
+.include
CVS commit: src/external/gpl2/libmalloc/lib
Module Name:src Committed By: christos Date: Thu Jan 14 02:43:50 UTC 2016 Modified Files: src/external/gpl2/libmalloc/lib: Makefile Log Message: we want a lint library To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/libmalloc/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/gpl2/libmalloc/lib/Makefile diff -u src/external/gpl2/libmalloc/lib/Makefile:1.1 src/external/gpl2/libmalloc/lib/Makefile:1.2 --- src/external/gpl2/libmalloc/lib/Makefile:1.1 Wed Jan 13 16:56:38 2016 +++ src/external/gpl2/libmalloc/lib/Makefile Wed Jan 13 21:43:50 2016 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.1 2016/01/13 21:56:38 christos Exp $ +# $NetBSD: Makefile,v 1.2 2016/01/14 02:43:50 christos Exp $ -NOLINT= NOMAN= # defined .include
CVS commit: src
Module Name:src
Committed By: christos
Date: Thu Jan 14 02:51:25 UTC 2016
Modified Files:
src: Makefile
Log Message:
fix direct reference to texinfo, bleh
To generate a diff of this commit:
cvs rdiff -u -r1.316 -r1.317 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.316 src/Makefile:1.317
--- src/Makefile:1.316 Thu Jul 23 04:03:25 2015
+++ src/Makefile Wed Jan 13 21:51:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.316 2015/07/23 08:03:25 mrg Exp $
+# $NetBSD: Makefile,v 1.317 2016/01/14 02:51:25 christos Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -163,7 +163,7 @@ afterinstall: .PHONY .MAKE
${MAKEDIRTARGET} share/man makedb
.endif
.if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
- ${MAKEDIRTARGET} gnu/usr.bin/texinfo/install-info infodir-meta
+ ${MAKEDIRTARGET} external/gpl2/texinfo/bin/install-info infodir-meta
.endif
.if !defined(NOPOSTINSTALL)
${MAKEDIRTARGET} . postinstall-check
CVS import: src/external/gpl2/rcs/dist
Module Name:src Committed By: christos Date: Thu Jan 14 03:05:06 UTC 2016 Update of /cvsroot/src/external/gpl2/rcs/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10615 Log Message: import rcs-5.7 Status: Vendor Tag: FSF Release Tags: rcs-5-7 N src/external/gpl2/rcs/dist/ChangeLog N src/external/gpl2/rcs/dist/COPYING N src/external/gpl2/rcs/dist/CREDITS N src/external/gpl2/rcs/dist/INSTALL.RCS N src/external/gpl2/rcs/dist/INSTALL N src/external/gpl2/rcs/dist/rcs.ms N src/external/gpl2/rcs/dist/Makefile.in N src/external/gpl2/rcs/dist/NEWS N src/external/gpl2/rcs/dist/README N src/external/gpl2/rcs/dist/REFS N src/external/gpl2/rcs/dist/configure N src/external/gpl2/rcs/dist/configure.in N src/external/gpl2/rcs/dist/install-sh N src/external/gpl2/rcs/dist/mkinstalldirs N src/external/gpl2/rcs/dist/rcs_func.ms N src/external/gpl2/rcs/dist/man/rcsclean.1 N src/external/gpl2/rcs/dist/man/ident.1 N src/external/gpl2/rcs/dist/man/ci.1 N src/external/gpl2/rcs/dist/man/co.1 N src/external/gpl2/rcs/dist/man/rcsdiff.1 N src/external/gpl2/rcs/dist/man/merge.1 N src/external/gpl2/rcs/dist/man/rcs.1 N src/external/gpl2/rcs/dist/man/COPYING N src/external/gpl2/rcs/dist/man/rcsfile.5 N src/external/gpl2/rcs/dist/man/rcsfreeze.1 N src/external/gpl2/rcs/dist/man/rcsintro.1 N src/external/gpl2/rcs/dist/man/rcsmerge.1 N src/external/gpl2/rcs/dist/man/rlog.1 N src/external/gpl2/rcs/dist/man/rcsfile.5in N src/external/gpl2/rcs/dist/man/ChangeLog N src/external/gpl2/rcs/dist/man/Makefile.in N src/external/gpl2/rcs/dist/src/maketime.c N src/external/gpl2/rcs/dist/src/ident.c N src/external/gpl2/rcs/dist/src/ci.c N src/external/gpl2/rcs/dist/src/co.c N src/external/gpl2/rcs/dist/src/COPYING N src/external/gpl2/rcs/dist/src/maketime.h N src/external/gpl2/rcs/dist/src/merge.c N src/external/gpl2/rcs/dist/src/merger.c N src/external/gpl2/rcs/dist/src/partime.c N src/external/gpl2/rcs/dist/src/partime.h N src/external/gpl2/rcs/dist/src/rcs.c N src/external/gpl2/rcs/dist/src/rcsbase.h N src/external/gpl2/rcs/dist/src/rcsclean.c N src/external/gpl2/rcs/dist/src/rcsdiff.c N src/external/gpl2/rcs/dist/src/rcsedit.c N src/external/gpl2/rcs/dist/src/rcsfcmp.c N src/external/gpl2/rcs/dist/src/rcsfnms.c N src/external/gpl2/rcs/dist/src/rcsgen.c N src/external/gpl2/rcs/dist/src/rcskeep.c N src/external/gpl2/rcs/dist/src/rcskeys.c N src/external/gpl2/rcs/dist/src/rcslex.c N src/external/gpl2/rcs/dist/src/rcsmap.c N src/external/gpl2/rcs/dist/src/rcsmerge.c N src/external/gpl2/rcs/dist/src/rcsrev.c N src/external/gpl2/rcs/dist/src/rcssyn.c N src/external/gpl2/rcs/dist/src/rcstime.c N src/external/gpl2/rcs/dist/src/rcsutil.c N src/external/gpl2/rcs/dist/src/rlog.c N src/external/gpl2/rcs/dist/src/conf.heg N src/external/gpl2/rcs/dist/src/version.c N src/external/gpl2/rcs/dist/src/conf.sh N src/external/gpl2/rcs/dist/src/rcsfreeze.sh N src/external/gpl2/rcs/dist/src/ChangeLog N src/external/gpl2/rcs/dist/src/Makefile.in N src/external/gpl2/rcs/dist/src/rcstest No conflicts created by this import
CVS commit: src/external/gpl2
Module Name:src Committed By: christos Date: Thu Jan 14 04:21:48 UTC 2016 Modified Files: src/external/gpl2: Makefile Log Message: hook rcs To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/gpl2/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/Makefile diff -u src/external/gpl2/Makefile:1.11 src/external/gpl2/Makefile:1.12 --- src/external/gpl2/Makefile:1.11 Wed Jan 13 19:38:30 2016 +++ src/external/gpl2/Makefile Wed Jan 13 23:21:48 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2016/01/14 00:38:30 christos Exp $ +# $NetBSD: Makefile,v 1.12 2016/01/14 04:21:48 christos Exp $ .include @@ -17,6 +17,6 @@ SUBDIR+= grep SUBDIR+=groff .endif -SUBDIR+= gettext diffutils texinfo +SUBDIR+= gettext diffutils texinfo rcs .include
CVS commit: src/external/gpl2/rcs
Module Name:src Committed By: christos Date: Thu Jan 14 04:22:39 UTC 2016 Modified Files: src/external/gpl2/rcs/dist: rcs.ms src/external/gpl2/rcs/dist/man: ci.1 co.1 ident.1 merge.1 rcs.1 rcsclean.1 rcsdiff.1 rcsfile.5 rcsfreeze.1 rcsintro.1 rcsmerge.1 rlog.1 src/external/gpl2/rcs/dist/src: ci.c co.c ident.c maketime.h merge.c merger.c partime.c partime.h rcs.c rcsbase.h rcsclean.c rcsdiff.c rcsedit.c rcsfcmp.c rcsfnms.c rcsfreeze.sh rcsgen.c rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsmerge.c rcsrev.c rcssyn.c rcstime.c rcsutil.c rlog.c version.c Added Files: src/external/gpl2/rcs: Makefile Makefile.inc rcs2netbsd src/external/gpl2/rcs/bin: Makefile Makefile.inc src/external/gpl2/rcs/bin/ci: Makefile src/external/gpl2/rcs/bin/co: Makefile src/external/gpl2/rcs/bin/ident: Makefile src/external/gpl2/rcs/bin/merge: Makefile src/external/gpl2/rcs/bin/rcs: Makefile src/external/gpl2/rcs/bin/rcsclean: Makefile src/external/gpl2/rcs/bin/rcsdiff: Makefile src/external/gpl2/rcs/bin/rcsfreeze: Makefile src/external/gpl2/rcs/bin/rcsmerge: Makefile src/external/gpl2/rcs/bin/rlog: Makefile src/external/gpl2/rcs/include: conf.h src/external/gpl2/rcs/lib: Makefile Log Message: - merge local changes - provide reach-over infrastructure To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/Makefile \ src/external/gpl2/rcs/Makefile.inc src/external/gpl2/rcs/rcs2netbsd cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/Makefile \ src/external/gpl2/rcs/bin/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/ci/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/co/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/ident/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/merge/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/rcs/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/rcsclean/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/rcsdiff/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/rcsfreeze/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/rcsmerge/Makefile cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/bin/rlog/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/rcs/dist/rcs.ms cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/rcs/dist/man/ci.1 \ src/external/gpl2/rcs/dist/man/co.1 \ src/external/gpl2/rcs/dist/man/ident.1 \ src/external/gpl2/rcs/dist/man/merge.1 \ src/external/gpl2/rcs/dist/man/rcs.1 \ src/external/gpl2/rcs/dist/man/rcsclean.1 \ src/external/gpl2/rcs/dist/man/rcsdiff.1 \ src/external/gpl2/rcs/dist/man/rcsfile.5 \ src/external/gpl2/rcs/dist/man/rcsfreeze.1 \ src/external/gpl2/rcs/dist/man/rcsintro.1 \ src/external/gpl2/rcs/dist/man/rcsmerge.1 \ src/external/gpl2/rcs/dist/man/rlog.1 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/rcs/dist/src/ci.c \ src/external/gpl2/rcs/dist/src/co.c \ src/external/gpl2/rcs/dist/src/ident.c \ src/external/gpl2/rcs/dist/src/maketime.h \ src/external/gpl2/rcs/dist/src/merge.c \ src/external/gpl2/rcs/dist/src/merger.c \ src/external/gpl2/rcs/dist/src/partime.c \ src/external/gpl2/rcs/dist/src/partime.h \ src/external/gpl2/rcs/dist/src/rcs.c \ src/external/gpl2/rcs/dist/src/rcsbase.h \ src/external/gpl2/rcs/dist/src/rcsclean.c \ src/external/gpl2/rcs/dist/src/rcsdiff.c \ src/external/gpl2/rcs/dist/src/rcsedit.c \ src/external/gpl2/rcs/dist/src/rcsfcmp.c \ src/external/gpl2/rcs/dist/src/rcsfnms.c \ src/external/gpl2/rcs/dist/src/rcsfreeze.sh \ src/external/gpl2/rcs/dist/src/rcsgen.c \ src/external/gpl2/rcs/dist/src/rcskeep.c \ src/external/gpl2/rcs/dist/src/rcskeys.c \ src/external/gpl2/rcs/dist/src/rcslex.c \ src/external/gpl2/rcs/dist/src/rcsmap.c \ src/external/gpl2/rcs/dist/src/rcsmerge.c \ src/external/gpl2/rcs/dist/src/rcsrev.c \ src/external/gpl2/rcs/dist/src/rcssyn.c \ src/external/gpl2/rcs/dist/src/rcstime.c \ src/external/gpl2/rcs/dist/src/rcsutil.c \ src/external/gpl2/rcs/dist/src/rlog.c \ src/external/gpl2/rcs/dist/src/version.c cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/include/conf.h cvs rdiff -u -r0 -r1.1 src/external/gpl2/rcs/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/gpl2/rcs/dist/rcs.ms diff -u src/external/gpl2/rcs/dist/rcs.ms:1.1.1.1 src/external/gpl2/rcs/dist/rcs.ms:1.2 --- src/external/gpl2/rcs/dist/rcs.ms:1.1.1.1 Wed Jan 13 22:05:06 2016 +++ src/external/gpl2/rcs/dist/rcs.ms Wed Jan 13 23:22:39 2016 @@ -1,4 +1,4 @@ -.\" Format this file with: +.\" $NetBSD: rcs.ms,v 1.2 2016/01/14 04:22:39 christos Exp $ .\" pic file | tbl | troff -ms .\" .\" \*s stands fo
CVS commit: src/gnu/usr.bin
Module Name:src Committed By: christos Date: Thu Jan 14 04:23:15 UTC 2016 Modified Files: src/gnu/usr.bin: Makefile Removed Files: src/gnu/usr.bin/rcs: COPYING Makefile Makefile.inc rcstest src/gnu/usr.bin/rcs/ci: Makefile ci.1 ci.c src/gnu/usr.bin/rcs/co: Makefile co.1 co.c src/gnu/usr.bin/rcs/doc: rcs.ms rcs_func.ms src/gnu/usr.bin/rcs/ident: Makefile ident.1 ident.c src/gnu/usr.bin/rcs/lib: Makefile conf.h maketime.c maketime.h merger.c partime.c partime.h rcsbase.h rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c rcsutil.c version.c src/gnu/usr.bin/rcs/merge: Makefile merge.1 merge.c src/gnu/usr.bin/rcs/rcs: Makefile rcs.1 rcs.c rcsfile.5 rcsintro.1 src/gnu/usr.bin/rcs/rcsclean: Makefile rcsclean.1 rcsclean.c src/gnu/usr.bin/rcs/rcsdiff: Makefile rcsdiff.1 rcsdiff.c src/gnu/usr.bin/rcs/rcsfreeze: Makefile rcsfreeze.1 rcsfreeze.sh src/gnu/usr.bin/rcs/rcsmerge: Makefile rcsmerge.1 rcsmerge.c src/gnu/usr.bin/rcs/rlog: Makefile rlog.1 rlog.c Log Message: remove rcs To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/gnu/usr.bin/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/gnu/usr.bin/rcs/COPYING cvs rdiff -u -r1.8 -r0 src/gnu/usr.bin/rcs/Makefile cvs rdiff -u -r1.11 -r0 src/gnu/usr.bin/rcs/Makefile.inc cvs rdiff -u -r1.3 -r0 src/gnu/usr.bin/rcs/rcstest cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/ci/Makefile \ src/gnu/usr.bin/rcs/ci/ci.1 cvs rdiff -u -r1.5 -r0 src/gnu/usr.bin/rcs/ci/ci.c cvs rdiff -u -r1.7 -r0 src/gnu/usr.bin/rcs/co/Makefile cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/co/co.1 cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/rcs/co/co.c cvs rdiff -u -r1.3 -r0 src/gnu/usr.bin/rcs/doc/rcs.ms cvs rdiff -u -r1.1.1.2 -r0 src/gnu/usr.bin/rcs/doc/rcs_func.ms cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/ident/Makefile \ src/gnu/usr.bin/rcs/ident/ident.c cvs rdiff -u -r1.5 -r0 src/gnu/usr.bin/rcs/ident/ident.1 cvs rdiff -u -r1.24 -r0 src/gnu/usr.bin/rcs/lib/Makefile cvs rdiff -u -r1.12 -r0 src/gnu/usr.bin/rcs/lib/conf.h cvs rdiff -u -r1.5 -r0 src/gnu/usr.bin/rcs/lib/maketime.c \ src/gnu/usr.bin/rcs/lib/rcsgen.c src/gnu/usr.bin/rcs/lib/rcssyn.c cvs rdiff -u -r1.2 -r0 src/gnu/usr.bin/rcs/lib/maketime.h \ src/gnu/usr.bin/rcs/lib/partime.h src/gnu/usr.bin/rcs/lib/rcstime.c \ src/gnu/usr.bin/rcs/lib/version.c cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/rcs/lib/merger.c \ src/gnu/usr.bin/rcs/lib/partime.c src/gnu/usr.bin/rcs/lib/rcsfcmp.c \ src/gnu/usr.bin/rcs/lib/rcsmap.c cvs rdiff -u -r1.13 -r0 src/gnu/usr.bin/rcs/lib/rcsbase.h cvs rdiff -u -r1.10 -r0 src/gnu/usr.bin/rcs/lib/rcsedit.c cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/lib/rcsfnms.c cvs rdiff -u -r1.7 -r0 src/gnu/usr.bin/rcs/lib/rcskeep.c \ src/gnu/usr.bin/rcs/lib/rcslex.c src/gnu/usr.bin/rcs/lib/rcsrev.c cvs rdiff -u -r1.8 -r0 src/gnu/usr.bin/rcs/lib/rcskeys.c \ src/gnu/usr.bin/rcs/lib/rcsutil.c cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/merge/Makefile \ src/gnu/usr.bin/rcs/merge/merge.1 cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/rcs/merge/merge.c cvs rdiff -u -r1.7 -r0 src/gnu/usr.bin/rcs/rcs/Makefile \ src/gnu/usr.bin/rcs/rcs/rcs.c cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/rcs/rcs.1 \ src/gnu/usr.bin/rcs/rcs/rcsintro.1 cvs rdiff -u -r1.5 -r0 src/gnu/usr.bin/rcs/rcs/rcsfile.5 cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/rcsclean/Makefile cvs rdiff -u -r1.5 -r0 src/gnu/usr.bin/rcs/rcsclean/rcsclean.1 \ src/gnu/usr.bin/rcs/rcsclean/rcsclean.c cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/rcsdiff/Makefile cvs rdiff -u -r1.5 -r0 src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1 cvs rdiff -u -r1.8 -r0 src/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c cvs rdiff -u -r1.7 -r0 src/gnu/usr.bin/rcs/rcsfreeze/Makefile cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1 \ src/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/rcsmerge/Makefile cvs rdiff -u -r1.5 -r0 src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c cvs rdiff -u -r1.8 -r0 src/gnu/usr.bin/rcs/rlog/Makefile cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/rcs/rlog/rlog.1 cvs rdiff -u -r1.7 -r0 src/gnu/usr.bin/rcs/rlog/rlog.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/Makefile diff -u src/gnu/usr.bin/Makefile:1.143 src/gnu/usr.bin/Makefile:1.144 --- src/gnu/usr.bin/Makefile:1.143 Wed Jan 13 14:03:09 2016 +++ src/gnu/usr.bin/Makefile Wed Jan 13 23:23:14 2016 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.143 2016/01/13 19:03:09 christos Exp $ +# $NetBSD: Makefile,v 1.144 2016/01/14 04:23:14 christos Exp $ .include SUBDIR+= bc SUBDIR+= c89 c99 SUBDIR+= dc -SUBDIR+= rcs send-pr texinfo +SUBDIR+= send-pr .include
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Jan 14 04:25:13 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: move rcs To generate a diff of this commit: cvs rdiff -u -r1.1297 -r1.1298 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.1297 src/doc/3RDPARTY:1.1298 --- src/doc/3RDPARTY:1.1297 Wed Jan 13 19:41:14 2016 +++ src/doc/3RDPARTY Wed Jan 13 23:25:13 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1297 2016/01/14 00:41:14 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1298 2016/01/14 04:25:13 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1178,15 +1178,15 @@ TDB code as found in 2.4.x, x>1 is under using the version found in 2.4.1. Package: rcs -Version: 5.7 -Current Vers: 5.9.2 +Version: 5.7 (Last GPLv2+ version) +Current Vers: 5.9.4 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/rcs/ Mailing List: bug-gnu-ut...@gnu.org Home Page: http://www.gnu.org/software/rcs/ Responsible: agc License: GPLv2+ (5.7), GPLv3+ (5.8 and later) -Location: gnu/usr.bin/rcs +Location: external/gpl2/rcs Notes: Old versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS).
CVS commit: src/usr.bin
Module Name:src Committed By: christos Date: Thu Jan 14 04:27:26 UTC 2016 Modified Files: src/usr.bin: Makefile Added Files: src/usr.bin/c89: Makefile c89.1 c89.sh src/usr.bin/c99: Makefile c99.1 c99.sh Log Message: this are our's not gnu To generate a diff of this commit: cvs rdiff -u -r1.222 -r1.223 src/usr.bin/Makefile cvs rdiff -u -r0 -r1.1 src/usr.bin/c89/Makefile src/usr.bin/c89/c89.1 \ src/usr.bin/c89/c89.sh cvs rdiff -u -r0 -r1.1 src/usr.bin/c99/Makefile src/usr.bin/c99/c99.1 \ src/usr.bin/c99/c99.sh 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.222 src/usr.bin/Makefile:1.223 --- src/usr.bin/Makefile:1.222 Fri Dec 18 13:56:47 2015 +++ src/usr.bin/Makefile Wed Jan 13 23:27:26 2016 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.222 2015/12/18 18:56:47 christos Exp $ +# $NetBSD: Makefile,v 1.223 2016/01/14 04:27:26 christos Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include SUBDIR= apply asa at audio audiocfg \ banner basename biff bthset btkey btpin \ - bzip2 bzip2recover cal calendar cap_mkdb cdplay \ + bzip2 bzip2recover c89 c99 cal calendar cap_mkdb cdplay \ checknr chflags chpass cksum cmp cleantags col colcrt colrm \ column comm compress config crunch csplit ctags cut \ deroff db dirname du \ Added files: Index: src/usr.bin/c89/Makefile diff -u /dev/null src/usr.bin/c89/Makefile:1.1 --- /dev/null Wed Jan 13 23:27:26 2016 +++ src/usr.bin/c89/Makefile Wed Jan 13 23:27:26 2016 @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2016/01/14 04:27:26 christos Exp $ + +SCRIPTS= c89.sh +SCRIPTSDIR=/usr/bin + +MAN= c89.1 + +.include Index: src/usr.bin/c89/c89.1 diff -u /dev/null src/usr.bin/c89/c89.1:1.1 --- /dev/null Wed Jan 13 23:27:26 2016 +++ src/usr.bin/c89/c89.1 Wed Jan 13 23:27:26 2016 @@ -0,0 +1,80 @@ +.\" $NetBSD: c89.1,v 1.1 2016/01/14 04:27:26 christos Exp $ +.\" +.\" Copyright (c) 1999 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.Dd January 5, 1999 +.Dt C89 1 +.Os +.Sh NAME +.Nm c89 +.Nd ANSI (1989) C compiler +.Sh SYNOPSIS +.Nm +.Op Fl pedantic +.Op Fl pedantic-errors +.Op Fl D_ANSI_SOURCE +.Op options ... +.Sh DESCRIPTION +Calls the C compiler (cc) with the given +.Ar options , +using a C language environment compatible with the +.St -ansiC +specification. +.Pp +This includes proper handling of trigraphs, +disabling non-ANSI compiler features (such as +.Ar asm , +.Ar inline , +.Ar typeof , +and the $ character in identifiers), +and definition of the preprocessor symbol +.Ev __STRICT_ANSI__ . +.Pp +The following options are available: +.Bl -tag -width "-pedantic-errorsxx" +.It Fl pedantic +Issue extra warnings defined by ANSI for use of non-ANSI features. +.It Fl pedantic-errors +Issue errors instead of warnings that normally would be presented by +.Fl pedantic . +.It Fl D_ANSI_SOURCE +Tell the system header file set to use an ANSI-conformant "clean" namespace. +.El +.Sh SEE ALSO +.Xr cc 1 +.Sh STANDARDS +.Nm +conforms to +.St -p1003.2-92 . +.Sh HISTORY +.Nm +appeared in +.Nx 1.4 . +.Sh BUGS +Since +.Nm +is a shell wrapper script to +.Ar cc , +compile errors are prefixed by "cc:". Index: src/usr.bin/c89/c89.sh diff -u /dev/null src/usr.bin/c89/c89.sh:1.1 --- /dev/null Wed Jan 13 23:27:26 2016 +++ src/usr.bin/c89/c89.sh Wed Jan 13 23:27:26 2016 @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/cc -std=c89 "$@" Index: src/usr.bin/c99/Makefile diff -u /dev/null src/usr.bin/c99/Makefile:1.1 --- /dev/null Wed Jan 13 23:27:26 2016 +++ src/usr.bin/c99
CVS commit: src/gnu/usr.bin
Module Name:src Committed By: christos Date: Thu Jan 14 04:28:05 UTC 2016 Modified Files: src/gnu/usr.bin: Makefile Removed Files: src/gnu/usr.bin/c89: Makefile c89.1 c89.sh src/gnu/usr.bin/c99: Makefile c99.1 c99.sh Log Message: c89/c99 moved to usr.bin To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/gnu/usr.bin/Makefile cvs rdiff -u -r1.2 -r0 src/gnu/usr.bin/c89/Makefile cvs rdiff -u -r1.3 -r0 src/gnu/usr.bin/c89/c89.1 cvs rdiff -u -r1.6 -r0 src/gnu/usr.bin/c89/c89.sh cvs rdiff -u -r1.2 -r0 src/gnu/usr.bin/c99/Makefile \ src/gnu/usr.bin/c99/c99.sh cvs rdiff -u -r1.4 -r0 src/gnu/usr.bin/c99/c99.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/Makefile diff -u src/gnu/usr.bin/Makefile:1.144 src/gnu/usr.bin/Makefile:1.145 --- src/gnu/usr.bin/Makefile:1.144 Wed Jan 13 23:23:14 2016 +++ src/gnu/usr.bin/Makefile Wed Jan 13 23:28:05 2016 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.144 2016/01/14 04:23:14 christos Exp $ +# $NetBSD: Makefile,v 1.145 2016/01/14 04:28:05 christos Exp $ .include SUBDIR+= bc -SUBDIR+= c89 c99 SUBDIR+= dc SUBDIR+= send-pr
