Module Name: src
Committed By: spz
Date: Fri Apr 6 10:49:29 UTC 2012
Modified Files:
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
md.sparc64 shl.mi
src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64
md.sparc64 shl.mi
src/external/mit/expat/lib/libexpat: expat_config.h shlib_version
Log Message:
adjust for expat-2.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.161 -r1.162 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.621 -r1.622 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/comp/ad.mips64eb
cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.142 -r1.143 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.214 -r1.215 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1 -r1.2 src/external/mit/expat/lib/libexpat/expat_config.h \
src/external/mit/expat/lib/libexpat/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/distrib/sets/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.86 src/distrib/sets/lists/base/ad.mips64eb:1.87
--- src/distrib/sets/lists/base/ad.mips64eb:1.86 Thu Mar 8 21:59:24 2012
+++ src/distrib/sets/lists/base/ad.mips64eb Fri Apr 6 10:49:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.86 2012/03/08 21:59:24 joerg Exp $
+# $NetBSD: ad.mips64eb,v 1.87 2012/04/06 10:49:27 spz Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -94,7 +94,7 @@
./usr/lib/64/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/64/libevent.so.3.2 base-compat-shlib compat,pic
./usr/lib/64/libexpat.so.2 base-compat-shlib compat,pic
-./usr/lib/64/libexpat.so.2.0 base-compat-shlib compat,pic
+./usr/lib/64/libexpat.so.2.1 base-compat-shlib compat,pic
./usr/lib/64/libfetch.so.3 base-compat-shlib compat,pic
./usr/lib/64/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/64/libform.so.6 base-compat-shlib compat,pic
@@ -392,7 +392,7 @@
./usr/lib/o32/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/o32/libevent.so.3.2 base-compat-shlib compat,pic
./usr/lib/o32/libexpat.so.2 base-compat-shlib compat,pic
-./usr/lib/o32/libexpat.so.2.0 base-compat-shlib compat,pic
+./usr/lib/o32/libexpat.so.2.1 base-compat-shlib compat,pic
./usr/lib/o32/libfetch.so.3 base-compat-shlib compat,pic
./usr/lib/o32/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/o32/libform.so.6 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.85 src/distrib/sets/lists/base/ad.mips64el:1.86
--- src/distrib/sets/lists/base/ad.mips64el:1.85 Thu Mar 8 21:59:24 2012
+++ src/distrib/sets/lists/base/ad.mips64el Fri Apr 6 10:49:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.85 2012/03/08 21:59:24 joerg Exp $
+# $NetBSD: ad.mips64el,v 1.86 2012/04/06 10:49:28 spz Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -94,7 +94,7 @@
./usr/lib/64/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/64/libevent.so.3.2 base-compat-shlib compat,pic
./usr/lib/64/libexpat.so.2 base-compat-shlib compat,pic
-./usr/lib/64/libexpat.so.2.0 base-compat-shlib compat,pic
+./usr/lib/64/libexpat.so.2.1 base-compat-shlib compat,pic
./usr/lib/64/libfetch.so.3 base-compat-shlib compat,pic
./usr/lib/64/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/64/libform.so.6 base-compat-shlib compat,pic
@@ -392,7 +392,7 @@
./usr/lib/o32/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/o32/libevent.so.3.2 base-compat-shlib compat,pic
./usr/lib/o32/libexpat.so.2 base-compat-shlib compat,pic
-./usr/lib/o32/libexpat.so.2.0 base-compat-shlib compat,pic
+./usr/lib/o32/libexpat.so.2.1 base-compat-shlib compat,pic
./usr/lib/o32/libfetch.so.3 base-compat-shlib compat,pic
./usr/lib/o32/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/o32/libform.so.6 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.161 src/distrib/sets/lists/base/md.amd64:1.162
--- src/distrib/sets/lists/base/md.amd64:1.161 Sun Mar 11 06:53:18 2012
+++ src/distrib/sets/lists/base/md.amd64 Fri Apr 6 10:49:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.161 2012/03/11 06:53:18 riz Exp $
+# $NetBSD: md.amd64,v 1.162 2012/04/06 10:49:28 spz Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -103,7 +103,7 @@
./usr/lib/i386/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/i386/libevent.so.3.2 base-compat-shlib compat,pic
./usr/lib/i386/libexpat.so.2 base-compat-shlib compat,pic
-./usr/lib/i386/libexpat.so.2.0 base-compat-shlib compat,pic
+./usr/lib/i386/libexpat.so.2.1 base-compat-shlib compat,pic
./usr/lib/i386/libfetch.so.3 base-compat-shlib compat,pic
./usr/lib/i386/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/i386/libform.so.6 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.151 src/distrib/sets/lists/base/md.sparc64:1.152
--- src/distrib/sets/lists/base/md.sparc64:1.151 Thu Mar 8 21:59:24 2012
+++ src/distrib/sets/lists/base/md.sparc64 Fri Apr 6 10:49:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.151 2012/03/08 21:59:24 joerg Exp $
+# $NetBSD: md.sparc64,v 1.152 2012/04/06 10:49:28 spz Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -95,7 +95,7 @@
./usr/lib/sparc/libevent.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/libevent.so.3.2 base-compat-shlib compat,pic
./usr/lib/sparc/libexpat.so.2 base-compat-shlib compat,pic
-./usr/lib/sparc/libexpat.so.2.0 base-compat-shlib compat,pic
+./usr/lib/sparc/libexpat.so.2.1 base-compat-shlib compat,pic
./usr/lib/sparc/libfetch.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/libfetch.so.3.0 base-compat-shlib compat,pic
./usr/lib/sparc/libform.so.6 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.621 src/distrib/sets/lists/base/shl.mi:1.622
--- src/distrib/sets/lists/base/shl.mi:1.621 Sat Mar 10 21:52:00 2012
+++ src/distrib/sets/lists/base/shl.mi Fri Apr 6 10:49:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.621 2012/03/10 21:52:00 joerg Exp $
+# $NetBSD: shl.mi,v 1.622 2012/04/06 10:49:28 spz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -222,7 +222,7 @@
./usr/lib/libevent.so.3.2 base-sys-shlib
./usr/lib/libexpat.so base-sys-shlib
./usr/lib/libexpat.so.2 base-sys-shlib
-./usr/lib/libexpat.so.2.0 base-sys-shlib
+./usr/lib/libexpat.so.2.1 base-sys-shlib
./usr/lib/libfetch.so base-sys-shlib
./usr/lib/libfetch.so.3 base-sys-shlib
./usr/lib/libfetch.so.3.0 base-sys-shlib
Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.73 src/distrib/sets/lists/comp/ad.mips64eb:1.74
--- src/distrib/sets/lists/comp/ad.mips64eb:1.73 Thu Mar 8 21:59:25 2012
+++ src/distrib/sets/lists/comp/ad.mips64eb Fri Apr 6 10:49:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.73 2012/03/08 21:59:25 joerg Exp $
+# $NetBSD: ad.mips64eb,v 1.74 2012/04/06 10:49:28 spz Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -1291,7 +1291,7 @@
./usr/libdata/debug/usr/lib/64/libedit.so.3.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libelf.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libevent.so.3.2.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/64/libexpat.so.2.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/64/libexpat.so.2.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libfetch.so.3.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libform.so.6.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug,compat
@@ -1444,7 +1444,7 @@
./usr/libdata/debug/usr/lib/o32/libedit.so.3.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libelf.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libevent.so.3.2.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/libexpat.so.2.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/libexpat.so.2.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libfetch.so.3.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libform.so.6.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug,compat
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.74 src/distrib/sets/lists/comp/ad.mips64el:1.75
--- src/distrib/sets/lists/comp/ad.mips64el:1.74 Thu Mar 8 21:59:25 2012
+++ src/distrib/sets/lists/comp/ad.mips64el Fri Apr 6 10:49:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.74 2012/03/08 21:59:25 joerg Exp $
+# $NetBSD: ad.mips64el,v 1.75 2012/04/06 10:49:28 spz Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -1291,7 +1291,7 @@
./usr/libdata/debug/usr/lib/64/libedit.so.3.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libelf.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libevent.so.3.2.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/64/libexpat.so.2.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/64/libexpat.so.2.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libfetch.so.3.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libform.so.6.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug,compat
@@ -1444,7 +1444,7 @@
./usr/libdata/debug/usr/lib/o32/libedit.so.3.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libelf.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libevent.so.3.2.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/libexpat.so.2.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/libexpat.so.2.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libfetch.so.3.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libform.so.6.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug,compat
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.159 src/distrib/sets/lists/comp/md.amd64:1.160
--- src/distrib/sets/lists/comp/md.amd64:1.159 Thu Mar 8 21:59:25 2012
+++ src/distrib/sets/lists/comp/md.amd64 Fri Apr 6 10:49:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.159 2012/03/08 21:59:25 joerg Exp $
+# $NetBSD: md.amd64,v 1.160 2012/04/06 10:49:28 spz Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -1068,7 +1068,7 @@
./usr/libdata/debug/usr/lib/i386/libedit.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libelf.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libevent.so.3.2.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libexpat.so.2.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libexpat.so.2.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libfetch.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libform.so.6.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libgcc_s.so.1.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.142 src/distrib/sets/lists/comp/md.sparc64:1.143
--- src/distrib/sets/lists/comp/md.sparc64:1.142 Thu Mar 8 21:59:25 2012
+++ src/distrib/sets/lists/comp/md.sparc64 Fri Apr 6 10:49:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.142 2012/03/08 21:59:25 joerg Exp $
+# $NetBSD: md.sparc64,v 1.143 2012/04/06 10:49:28 spz Exp $
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
@@ -911,7 +911,7 @@
./usr/libdata/debug/usr/lib/sparc/libedit.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libelf.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libevent.so.3.2.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libexpat.so.2.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libexpat.so.2.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libfetch.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libform.so.6.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libgcc_s.so.1.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.214 src/distrib/sets/lists/comp/shl.mi:1.215
--- src/distrib/sets/lists/comp/shl.mi:1.214 Sat Mar 10 21:52:02 2012
+++ src/distrib/sets/lists/comp/shl.mi Fri Apr 6 10:49:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.214 2012/03/10 21:52:02 joerg Exp $
+# $NetBSD: shl.mi,v 1.215 2012/04/06 10:49:28 spz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -265,7 +265,7 @@
./usr/libdata/debug/usr/lib/libedit.so.3.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libelf.so.0.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libevent.so.3.2.debug comp-sys-debug debug
-./usr/libdata/debug/usr/lib/libexpat.so.2.0.debug comp-sys-debug debug
+./usr/libdata/debug/usr/lib/libexpat.so.2.1.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libfetch.so.3.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libform.so.6.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug
Index: src/external/mit/expat/lib/libexpat/expat_config.h
diff -u src/external/mit/expat/lib/libexpat/expat_config.h:1.1 src/external/mit/expat/lib/libexpat/expat_config.h:1.2
--- src/external/mit/expat/lib/libexpat/expat_config.h:1.1 Wed Feb 29 20:07:56 2012
+++ src/external/mit/expat/lib/libexpat/expat_config.h Fri Apr 6 10:49:27 2012
@@ -1,8 +1,6 @@
-/* expat_config.h. Generated by configure. */
+/* expat_config.h. Generated from expat_config.h.in by configure. */
/* expat_config.h.in. Generated from configure.in by autoheader. */
-#include <sys/endian.h>
-
/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
#define BYTEORDER BYTE_ORDER
@@ -42,6 +40,9 @@
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
@@ -51,6 +52,10 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "[email protected]"
@@ -58,13 +63,16 @@
#define PACKAGE_NAME "expat"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.0.1"
+#define PACKAGE_STRING "expat 2.1.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "expat"
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.1"
+#define PACKAGE_VERSION "2.1.0"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -88,8 +96,8 @@
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
-/* Define to `long' if <sys/types.h> does not define. */
+/* Define to `long int' if <sys/types.h> does not define. */
/* #undef off_t */
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
/* #undef size_t */
Index: src/external/mit/expat/lib/libexpat/shlib_version
diff -u src/external/mit/expat/lib/libexpat/shlib_version:1.1 src/external/mit/expat/lib/libexpat/shlib_version:1.2
--- src/external/mit/expat/lib/libexpat/shlib_version:1.1 Wed Feb 29 20:07:56 2012
+++ src/external/mit/expat/lib/libexpat/shlib_version Fri Apr 6 10:49:27 2012
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.1 2012/02/29 20:07:56 tron Exp $
+# $NetBSD: shlib_version,v 1.2 2012/04/06 10:49:27 spz Exp $
#
# XXX netbsd xsrc had major=4
major=2
-minor=0
+minor=1
