Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/sets/lists/base merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/ad8629477457
branches:  trunk
changeset: 756894:ad8629477457
user:      agc <agc%NetBSD.org@localhost>
date:      Sat Aug 07 05:30:58 2010 +0000

description:
merge conflicts

this isn't how this was planned, but needed for releases to build. will
be revisited later

diffstat:

 distrib/sets/lists/base/ad.mips64eb |  6 +++++-
 distrib/sets/lists/base/ad.mips64el |  6 +++++-
 distrib/sets/lists/base/md.amd64    |  4 +++-
 distrib/sets/lists/base/md.sparc64  |  4 +++-
 distrib/sets/lists/base/shl.mi      |  5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diffs (109 lines):

diff -r c2be81b0ad82 -r ad8629477457 distrib/sets/lists/base/ad.mips64eb
--- a/distrib/sets/lists/base/ad.mips64eb       Sat Aug 07 04:53:56 2010 +0000
+++ b/distrib/sets/lists/base/ad.mips64eb       Sat Aug 07 05:30:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.20 2010/07/11 12:54:26 mrg Exp $
+# $NetBSD: ad.mips64eb,v 1.21 2010/08/07 05:30:58 agc 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
@@ -129,6 +129,8 @@
 ./usr/lib/64/libmagic.so.3.0                   base-compat-shlib       compat,pic
 ./usr/lib/64/libmenu.so.6                      base-compat-shlib       compat,pic
 ./usr/lib/64/libmenu.so.6.0                    base-compat-shlib       compat,pic
+./usr/lib/64/libmj.so.0                                base-compat-shlib       compat,pic,crypto
+./usr/lib/64/libmj.so.0.0                      base-compat-shlib       compat,pic,crypto
 ./usr/lib/64/libnetpgp.so.3                    base-compat-shlib       compat,pic,crypto
 ./usr/lib/64/libnetpgp.so.3.0                  base-compat-shlib       compat,pic,crypto
 ./usr/lib/64/libobjc.so.3                      base-compat-shlib       compat,pic
@@ -362,6 +364,8 @@
 ./usr/lib/o32/libmagic.so.3.0                  base-compat-shlib       compat,pic
 ./usr/lib/o32/libmenu.so.6                     base-compat-shlib       compat,pic
 ./usr/lib/o32/libmenu.so.6.0                   base-compat-shlib       compat,pic
+./usr/lib/o32/libmj.so.3                       base-compat-shlib       compat,pic,crypto
+./usr/lib/o32/libmj.so.3.0                     base-compat-shlib       compat,pic,crypto
 ./usr/lib/o32/libnetpgp.so.3                   base-compat-shlib       compat,pic,crypto
 ./usr/lib/o32/libnetpgp.so.3.0                 base-compat-shlib       compat,pic,crypto
 ./usr/lib/o32/libobjc.so.3                     base-compat-shlib       compat,pic
diff -r c2be81b0ad82 -r ad8629477457 distrib/sets/lists/base/ad.mips64el
--- a/distrib/sets/lists/base/ad.mips64el       Sat Aug 07 04:53:56 2010 +0000
+++ b/distrib/sets/lists/base/ad.mips64el       Sat Aug 07 05:30:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.19 2010/07/11 12:54:26 mrg Exp $
+# $NetBSD: ad.mips64el,v 1.20 2010/08/07 05:30:58 agc 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
@@ -129,6 +129,8 @@
 ./usr/lib/64/libmagic.so.3.0                   base-compat-shlib       compat,pic
 ./usr/lib/64/libmenu.so.6                      base-compat-shlib       compat,pic
 ./usr/lib/64/libmenu.so.6.0                    base-compat-shlib       compat,pic
+./usr/lib/64/libmj.so.0                                base-compat-shlib       compat,pic,crypto
+./usr/lib/64/libmj.so.0.0                      base-compat-shlib       compat,pic,crypto
 ./usr/lib/64/libnetpgp.so.3                    base-compat-shlib       compat,pic,crypto
 ./usr/lib/64/libnetpgp.so.3.0                  base-compat-shlib       compat,pic,crypto
 ./usr/lib/64/libobjc.so.3                      base-compat-shlib       compat,pic
@@ -362,6 +364,8 @@
 ./usr/lib/o32/libmagic.so.3.0                  base-compat-shlib       compat,pic
 ./usr/lib/o32/libmenu.so.6                     base-compat-shlib       compat,pic
 ./usr/lib/o32/libmenu.so.6.0                   base-compat-shlib       compat,pic
+./usr/lib/o32/libmj.so.3                       base-compat-shlib       compat,pic,crypto
+./usr/lib/o32/libmj.so.3.0                     base-compat-shlib       compat,pic,crypto
 ./usr/lib/o32/libnetpgp.so.3                   base-compat-shlib       compat,pic,crypto
 ./usr/lib/o32/libnetpgp.so.3.0                 base-compat-shlib       compat,pic,crypto
 ./usr/lib/o32/libobjc.so.3                     base-compat-shlib       compat,pic
diff -r c2be81b0ad82 -r ad8629477457 distrib/sets/lists/base/md.amd64
--- a/distrib/sets/lists/base/md.amd64  Sat Aug 07 04:53:56 2010 +0000
+++ b/distrib/sets/lists/base/md.amd64  Sat Aug 07 05:30:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.92 2010/07/11 06:16:55 mrg Exp $
+# $NetBSD: md.amd64,v 1.93 2010/08/07 05:30:58 agc Exp $
 ./dev/lms0                                     base-obsolete           obsolete
 ./dev/mms0                                     base-obsolete           obsolete
 ./libexec/ld.elf_so-i386                       base-sys-shlib          compat,pic
@@ -134,6 +134,8 @@
 ./usr/lib/i386/libmagic.so.3.0                 base-compat-shlib       compat,pic
 ./usr/lib/i386/libmenu.so.6                    base-compat-shlib       compat,pic
 ./usr/lib/i386/libmenu.so.6.0                  base-compat-shlib       compat,pic
+./usr/lib/i386/libmj.so.0                      base-compat-shlib       compat,pic,crypto
+./usr/lib/i386/libmj.so.0.0                    base-compat-shlib       compat,pic,crypto
 ./usr/lib/i386/libnetpgp.so.3                  base-compat-shlib       compat,pic
 ./usr/lib/i386/libnetpgp.so.3.0                        base-compat-shlib       compat,pic
 ./usr/lib/i386/libobjc.so.3                    base-compat-shlib       compat,pic
diff -r c2be81b0ad82 -r ad8629477457 distrib/sets/lists/base/md.sparc64
--- a/distrib/sets/lists/base/md.sparc64        Sat Aug 07 04:53:56 2010 +0000
+++ b/distrib/sets/lists/base/md.sparc64        Sat Aug 07 05:30:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.87 2010/07/11 13:13:19 mrg Exp $
+# $NetBSD: md.sparc64,v 1.88 2010/08/07 05:30:58 agc Exp $
 ./libexec/ld.elf_so-sparc                      base-sysutil-bin        compat,pic
 ./sbin/edlabel                                 base-sysutil-root       obsolete
 ./usr/bin/fdformat                             base-util-bin
@@ -130,6 +130,8 @@
 ./usr/lib/sparc/libmagic.so.3.0                        base-compat-shlib       compat,pic
 ./usr/lib/sparc/libmenu.so.6                   base-compat-shlib       compat,pic
 ./usr/lib/sparc/libmenu.so.6.0                 base-compat-shlib       compat,pic
+./usr/lib/sparc/libmj.so.0                     base-compat-shlib       compat,pic,crypto
+./usr/lib/sparc/libmj.so.0.0                   base-compat-shlib       compat,pic,crypto
 ./usr/lib/sparc/libnetpgp.so.3                 base-compat-shlib       compat,pic,crypto
 ./usr/lib/sparc/libnetpgp.so.3.0               base-compat-shlib       compat,pic,crypto
 ./usr/lib/sparc/libobjc.so.3                   base-compat-shlib       compat,pic
diff -r c2be81b0ad82 -r ad8629477457 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Sat Aug 07 04:53:56 2010 +0000
+++ b/distrib/sets/lists/base/shl.mi    Sat Aug 07 05:30:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.547 2010/07/26 16:23:31 pooka Exp $
+# $NetBSD: shl.mi,v 1.548 2010/08/07 05:30:58 agc Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -296,6 +296,9 @@
 ./usr/lib/libmenu.so                           base-sys-shlib
 ./usr/lib/libmenu.so.6                         base-sys-shlib
 ./usr/lib/libmenu.so.6.0                       base-sys-shlib
+./usr/lib/libmj.so                             base-crypto-shlib       crypto
+./usr/lib/libmj.so.0                           base-crypto-shlib       crypto
+./usr/lib/libmj.so.0.0                         base-crypto-shlib       crypto
 ./usr/lib/libnetpgp.so                         base-crypto-shlib       crypto
 ./usr/lib/libnetpgp.so.3                       base-crypto-shlib       crypto
 ./usr/lib/libnetpgp.so.3.0                     base-crypto-shlib       crypto



Home | Main Index | Thread Index | Old Index