Module Name: src
Committed By: agc
Date: Sat Aug 7 05:53:21 UTC 2010
Modified Files:
src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64
md.sparc64 mi
Log Message:
merge conflicts
this isn't how this was planned, but needed for releases to build. will
be revisited later
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/ad.mips64eb \
src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1490 -r1.1491 src/distrib/sets/lists/comp/mi
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/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.9 src/distrib/sets/lists/comp/ad.mips64eb:1.10
--- src/distrib/sets/lists/comp/ad.mips64eb:1.9 Sun Jul 11 12:37:52 2010
+++ src/distrib/sets/lists/comp/ad.mips64eb Sat Aug 7 05:53:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.9 2010/07/11 12:37:52 mrg Exp $
+# $NetBSD: ad.mips64eb,v 1.10 2010/08/07 05:53:20 agc Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/mips comp-c-include
@@ -352,6 +352,10 @@
./usr/lib/64/libmenu.so base-sys-shlib compat,pic
./usr/lib/64/libmenu_p.a comp-c-proflib compat,profile
./usr/lib/64/libmenu_pic.a comp-c-piclib compat,pic
+./usr/lib/64/libmj.a comp-c-lib compat,crypto
+./usr/lib/64/libmj.so comp-sys-shlib compat,crypto,pic
+./usr/lib/64/libmj_p.a comp-c-proflib compat,crypto,profile
+./usr/lib/64/libmj_pic.a comp-c-piclib compat,crypto,pic
./usr/lib/64/libnetpgp.a comp-c-lib compat,crypto
./usr/lib/64/libnetpgp.so comp-sys-shlib compat,crypto,pic
./usr/lib/64/libnetpgp_p.a comp-c-proflib compat,crypto,profile
@@ -817,6 +821,10 @@
./usr/lib/o32/libmenu.so base-sys-shlib compat,pic
./usr/lib/o32/libmenu_p.a comp-c-proflib compat,profile
./usr/lib/o32/libmenu_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/libmj.a comp-c-lib compat,crypto
+./usr/lib/o32/libmj.so comp-sys-shlib compat,crypto,pic
+./usr/lib/o32/libmj_p.a comp-c-proflib compat,crypto,profile
+./usr/lib/o32/libmj_pic.a comp-c-piclib compat,crypto,pic
./usr/lib/o32/libnetpgp.a comp-c-lib compat,crypto
./usr/lib/o32/libnetpgp.so comp-sys-shlib compat,crypto,pic
./usr/lib/o32/libnetpgp_p.a comp-c-proflib compat,crypto,profile
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.9 src/distrib/sets/lists/comp/ad.mips64el:1.10
--- src/distrib/sets/lists/comp/ad.mips64el:1.9 Sun Jul 11 12:37:52 2010
+++ src/distrib/sets/lists/comp/ad.mips64el Sat Aug 7 05:53:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.9 2010/07/11 12:37:52 mrg Exp $
+# $NetBSD: ad.mips64el,v 1.10 2010/08/07 05:53:20 agc Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/mips comp-c-include
@@ -352,6 +352,10 @@
./usr/lib/64/libmenu.so base-sys-shlib compat,pic
./usr/lib/64/libmenu_p.a comp-c-proflib compat,profile
./usr/lib/64/libmenu_pic.a comp-c-piclib compat,pic
+./usr/lib/64/libmj.a comp-c-lib compat,crypto
+./usr/lib/64/libmj.so comp-sys-shlib compat,crypto,pic
+./usr/lib/64/libmj_p.a comp-c-proflib compat,crypto,profile
+./usr/lib/64/libmj_pic.a comp-c-piclib compat,crypto,pic
./usr/lib/64/libnetpgp.a comp-c-lib compat,crypto
./usr/lib/64/libnetpgp.so comp-sys-shlib compat,crypto,pic
./usr/lib/64/libnetpgp_p.a comp-c-proflib compat,crypto,profile
@@ -817,6 +821,10 @@
./usr/lib/o32/libmenu.so base-sys-shlib compat,pic
./usr/lib/o32/libmenu_p.a comp-c-proflib compat,profile
./usr/lib/o32/libmenu_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/libmj.a comp-c-lib compat,crypto
+./usr/lib/o32/libmj.so comp-sys-shlib compat,crypto,pic
+./usr/lib/o32/libmj_p.a comp-c-proflib compat,crypto,profile
+./usr/lib/o32/libmj_pic.a comp-c-piclib compat,crypto,pic
./usr/lib/o32/libnetpgp.a comp-c-lib compat,crypto
./usr/lib/o32/libnetpgp.so comp-sys-shlib compat,crypto,pic
./usr/lib/o32/libnetpgp_p.a comp-c-proflib compat,crypto,profile
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.72 src/distrib/sets/lists/comp/md.amd64:1.73
--- src/distrib/sets/lists/comp/md.amd64:1.72 Sat Jul 31 21:47:52 2010
+++ src/distrib/sets/lists/comp/md.amd64 Sat Aug 7 05:53:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.72 2010/07/31 21:47:52 joerg Exp $
+# $NetBSD: md.amd64,v 1.73 2010/08/07 05:53:20 agc Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -602,6 +602,11 @@
./usr/lib/i386/libmenu_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/libmenu_p.a comp-c-proflib compat,profile
./usr/lib/i386/libmenu_pic.a comp-c-piclib compat,pic
+./usr/lib/i386/libmj.a comp-c-lib compat
+./usr/lib/i386/libmj.so comp-sys-shlib compat,pic
+./usr/lib/i386/libmj_g.a comp-c-proflib compat,debuglib
+./usr/lib/i386/libmj_p.a comp-c-proflib compat,profile
+./usr/lib/i386/libmj_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libnetpgp.a comp-c-lib compat
./usr/lib/i386/libnetpgp.so comp-sys-shlib compat,pic
./usr/lib/i386/libnetpgp_g.a comp-c-proflib compat,debuglib
@@ -885,6 +890,7 @@
./usr/libdata/debug/usr/lib/i386/libm.so.0.8.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libmagic.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libmenu.so.6.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libmj.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libnetpgp.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libobjc.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libopcodes.so.4.0.debug comp-compat-shlib compat,pic,binutils,debug
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.61 src/distrib/sets/lists/comp/md.sparc64:1.62
--- src/distrib/sets/lists/comp/md.sparc64:1.61 Sun Jul 11 12:37:52 2010
+++ src/distrib/sets/lists/comp/md.sparc64 Sat Aug 7 05:53:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.61 2010/07/11 12:37:52 mrg Exp $
+# $NetBSD: md.sparc64,v 1.62 2010/08/07 05:53:20 agc Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -425,6 +425,10 @@
./usr/lib/sparc/libmenu.so base-sys-shlib compat,pic
./usr/lib/sparc/libmenu_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libmenu_pic.a comp-c-piclib compat,pic
+./usr/lib/sparc/libmj.a comp-c-lib compat,crypto
+./usr/lib/sparc/libmj.so comp-sys-shlib compat,pic,crypto
+./usr/lib/sparc/libmj_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/sparc/libmj_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/sparc/libnetpgp.a comp-c-lib compat,crypto
./usr/lib/sparc/libnetpgp.so comp-sys-shlib compat,pic,crypto
./usr/lib/sparc/libnetpgp_p.a comp-c-proflib compat,profile,crypto
@@ -662,6 +666,7 @@
./usr/libdata/debug/usr/lib/sparc/libm.so.0.8.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libmagic.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libmenu.so.6.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libmj.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libnetpgp.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libobjc.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libopcodes.so.4.0.debug comp-compat-shlib compat,pic,binutils,debug
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1490 src/distrib/sets/lists/comp/mi:1.1491
--- src/distrib/sets/lists/comp/mi:1.1490 Fri Aug 6 05:39:43 2010
+++ src/distrib/sets/lists/comp/mi Sat Aug 7 05:53:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1490 2010/08/06 05:39:43 christos Exp $
+# $NetBSD: mi,v 1.1491 2010/08/07 05:53:20 agc Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1424,6 +1424,7 @@
./usr/include/miscfs/syncfs/syncfs.h comp-c-include
./usr/include/miscfs/umapfs/umap.h comp-c-include
./usr/include/miscfs/union/union.h comp-c-include
+./usr/include/mj.h comp-c-include crypto
./usr/include/mntopts.h comp-c-include
./usr/include/monetary.h comp-c-include
./usr/include/mpool.h comp-c-include
@@ -2513,6 +2514,9 @@
./usr/lib/libmenu_g.a -unknown- debuglib
./usr/lib/libmenu_p.a comp-c-proflib profile
./usr/lib/libmilter.a comp-obsolete obsolete
+./usr/lib/libmj.a comp-c-lib crypto
+./usr/lib/libmj_g.a -unknown- debuglib
+./usr/lib/libmj_p.a comp-c-proflib profile,crypto
./usr/lib/libnetpgp.a comp-c-lib crypto
./usr/lib/libnetpgp_g.a -unknown- debuglib
./usr/lib/libnetpgp_p.a comp-c-proflib profile,crypto
@@ -3804,6 +3808,7 @@
./usr/libdata/lint/llib-lmagic.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lmenu.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lmilter.ln comp-obsolete obsolete
+./usr/libdata/lint/llib-lmj.ln comp-c-lintlib lint,crypto
./usr/libdata/lint/llib-lnetpgp.ln comp-c-lintlib lint,crypto
./usr/libdata/lint/llib-lntp.ln comp-obsolete obsolete
./usr/libdata/lint/llib-lopenpgpsdk.ln comp-obsolete obsolete
@@ -7066,6 +7071,7 @@
./usr/share/man/cat3/libarchive_internals.0 comp-c-catman .cat
./usr/share/man/cat3/libiscsi.0 comp-c-catman iscsi,.cat
./usr/share/man/cat3/libmagic.0 comp-c-catman .cat
+./usr/share/man/cat3/libmj.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/libnetpgp.0 comp-c-catman crypto,.cat
./usr/share/man/cat3/libradius.0 comp-c-catman .cat
./usr/share/man/cat3/libusb.0 comp-obsolete obsolete
@@ -12963,6 +12969,7 @@
./usr/share/man/html3/libarchive_internals.html comp-c-htmlman html
./usr/share/man/html3/libiscsi.html comp-c-htmlman iscsi,html
./usr/share/man/html3/libmagic.html comp-c-htmlman html
+./usr/share/man/html3/libmj.html comp-c-htmlman crypto,html
./usr/share/man/html3/libnetpgp.html comp-c-htmlman crypto,html
./usr/share/man/html3/libradius.html comp-c-htmlman html
./usr/share/man/html3/libusbhid.html comp-c-htmlman html
@@ -18822,6 +18829,7 @@
./usr/share/man/man3/libarchive_internals.3 comp-c-man .man
./usr/share/man/man3/libiscsi.3 comp-c-man iscsi,.man
./usr/share/man/man3/libmagic.3 comp-c-man .man
+./usr/share/man/man3/libmj.3 comp-c-man crypto,.man
./usr/share/man/man3/libnetpgp.3 comp-c-man crypto,.man
./usr/share/man/man3/libradius.3 comp-c-man .man
./usr/share/man/man3/libusb.3 comp-obsolete obsolete
