From c1ab3fd4f0cb0dc449ded66ccf826790cd07cecb Mon Sep 17 00:00:00 2001 From: Petr Sumbera <petr.sumbera@oracle.com> Date: Fri, 30 Nov 2012 10:32:53 +0100 Subject: [PATCH] 15808775 SUNBT7189956 facet.compat.gnulinks takes precedence over facet.doc.man resulting --- components/patch/patch.p5m | 2 components/diffutils/diffutils.p5m | 10 +- components/gettext/gettext.p5m | 8 +- transforms/docs | 22 ++-- transforms/devel | 14 +- components/gtar/gtar.p5m | 4 components/make/make.p5m | 2 components/coreutils/coreutils.p5m | 146 ++++++++++++++++++------------------ components/gawk/gawk.p5m | 2 components/libxml2/libxml2.p5m | 4 components/m4/m4.p5m | 4 components/sed/sed.p5m | 4 components/which/which.p5m | 4 components/libxslt/libxslt.p5m | 2 components/ggrep/gnu-grep.p5m | 6 15 files changed, 117 insertions(+), 117 deletions(-) diff --git a/components/coreutils/coreutils.p5m b/components/coreutils/coreutils.p5m index 5f3002b..71fcd4f 100644 --- a/components/coreutils/coreutils.p5m +++ b/components/coreutils/coreutils.p5m @@ -638,148 +638,148 @@ target=../gnu/bin/yes facet.compat.gnulinks=true link path=usr/share/man/man1/gbasename.1 \ - target=../../../gnu/share/man/man1/basename.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/basename.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gcat.1 \ - target=../../../gnu/share/man/man1/cat.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/cat.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gchgrp.1 \ - target=../../../gnu/share/man/man1/chgrp.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/chgrp.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gchmod.1 \ - target=../../../gnu/share/man/man1/chmod.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/chmod.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gchown.1 \ - target=../../../gnu/share/man/man1/chown.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/chown.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gchroot.1 \ - target=../../../gnu/share/man/man1/chroot.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/chroot.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gcksum.1 \ - target=../../../gnu/share/man/man1/cksum.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/cksum.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gcomm.1 \ - target=../../../gnu/share/man/man1/comm.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/comm.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gcp.1 \ - target=../../../gnu/share/man/man1/cp.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/cp.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gcsplit.1 \ - target=../../../gnu/share/man/man1/csplit.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/csplit.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gcut.1 \ - target=../../../gnu/share/man/man1/cut.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/cut.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gdate.1 \ - target=../../../gnu/share/man/man1/date.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/date.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gdd.1 \ - target=../../../gnu/share/man/man1/dd.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/dd.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gdf.1 \ - target=../../../gnu/share/man/man1/df.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/df.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gdirname.1 \ - target=../../../gnu/share/man/man1/dirname.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/dirname.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gdu.1 \ - target=../../../gnu/share/man/man1/du.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/du.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gecho.1 \ - target=../../../gnu/share/man/man1/echo.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/echo.1 facet.compat.gnulinks=all link path=usr/share/man/man1/genv.1 \ - target=../../../gnu/share/man/man1/env.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/env.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gexpand.1 \ - target=../../../gnu/share/man/man1/expand.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/expand.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gexpr.1 \ - target=../../../gnu/share/man/man1/expr.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/expr.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gfactor.1 \ - target=../../../gnu/share/man/man1/factor.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/factor.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gfalse.1 \ - target=../../../gnu/share/man/man1/false.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/false.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gfmt.1 \ - target=../../../gnu/share/man/man1/fmt.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/fmt.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gfold.1 \ - target=../../../gnu/share/man/man1/fold.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/fold.1 facet.compat.gnulinks=all link path=usr/share/man/man1/ggroups.1 \ - target=../../../gnu/share/man/man1/groups.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/groups.1 facet.compat.gnulinks=all link path=usr/share/man/man1/ghead.1 \ - target=../../../gnu/share/man/man1/head.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/head.1 facet.compat.gnulinks=all link path=usr/share/man/man1/ghostid.1 \ - target=../../../gnu/share/man/man1/hostid.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/hostid.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gid.1 \ - target=../../../gnu/share/man/man1/id.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/id.1 facet.compat.gnulinks=all link path=usr/share/man/man1/ginstall.1 \ - target=../../../gnu/share/man/man1/install.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/install.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gjoin.1 \ - target=../../../gnu/share/man/man1/join.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/join.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gkill.1 \ - target=../../../gnu/share/man/man1/kill.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/kill.1 facet.compat.gnulinks=all link path=usr/share/man/man1/glink.1 \ - target=../../../gnu/share/man/man1/link.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/link.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gln.1 \ - target=../../../gnu/share/man/man1/ln.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/ln.1 facet.compat.gnulinks=all link path=usr/share/man/man1/glogname.1 \ - target=../../../gnu/share/man/man1/logname.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/logname.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gls.1 \ - target=../../../gnu/share/man/man1/ls.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/ls.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gmkdir.1 \ - target=../../../gnu/share/man/man1/mkdir.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/mkdir.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gmkfifo.1 \ - target=../../../gnu/share/man/man1/mkfifo.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/mkfifo.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gmknod.1 \ - target=../../../gnu/share/man/man1/mknod.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/mknod.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gmktemp.1 \ - target=../../../gnu/share/man/man1/mktemp.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/mktemp.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gmv.1 \ - target=../../../gnu/share/man/man1/mv.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/mv.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gnice.1 \ - target=../../../gnu/share/man/man1/nice.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/nice.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gnl.1 \ - target=../../../gnu/share/man/man1/nl.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/nl.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gnohup.1 \ - target=../../../gnu/share/man/man1/nohup.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/nohup.1 facet.compat.gnulinks=all link path=usr/share/man/man1/god.1 \ - target=../../../gnu/share/man/man1/od.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/od.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gpaste.1 \ - target=../../../gnu/share/man/man1/paste.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/paste.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gpathchk.1 \ - target=../../../gnu/share/man/man1/pathchk.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/pathchk.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gpr.1 \ - target=../../../gnu/share/man/man1/pr.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/pr.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gprintf.1 \ - target=../../../gnu/share/man/man1/printf.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/printf.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gpwd.1 \ - target=../../../gnu/share/man/man1/pwd.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/pwd.1 facet.compat.gnulinks=all link path=usr/share/man/man1/grm.1 \ - target=../../../gnu/share/man/man1/rm.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/rm.1 facet.compat.gnulinks=all link path=usr/share/man/man1/grmdir.1 \ - target=../../../gnu/share/man/man1/rmdir.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/rmdir.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gsleep.1 \ - target=../../../gnu/share/man/man1/sleep.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/sleep.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gsort.1 \ - target=../../../gnu/share/man/man1/sort.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/sort.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gsplit.1 \ - target=../../../gnu/share/man/man1/split.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/split.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gstty.1 \ - target=../../../gnu/share/man/man1/stty.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/stty.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gsum.1 \ - target=../../../gnu/share/man/man1/sum.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/sum.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gsync.1 \ - target=../../../gnu/share/man/man1/sync.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/sync.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gtail.1 \ - target=../../../gnu/share/man/man1/tail.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/tail.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gtee.1 \ - target=../../../gnu/share/man/man1/tee.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/tee.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gtest.1 \ - target=../../../gnu/share/man/man1/test.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/test.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gtouch.1 \ - target=../../../gnu/share/man/man1/touch.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/touch.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gtr.1 \ - target=../../../gnu/share/man/man1/tr.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/tr.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gtrue.1 \ - target=../../../gnu/share/man/man1/true.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/true.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gtsort.1 \ - target=../../../gnu/share/man/man1/tsort.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/tsort.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gtty.1 \ - target=../../../gnu/share/man/man1/tty.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/tty.1 facet.compat.gnulinks=all link path=usr/share/man/man1/guname.1 \ - target=../../../gnu/share/man/man1/uname.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/uname.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gunexpand.1 \ - target=../../../gnu/share/man/man1/unexpand.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/unexpand.1 facet.compat.gnulinks=all link path=usr/share/man/man1/guniq.1 \ - target=../../../gnu/share/man/man1/uniq.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/uniq.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gunlink.1 \ - target=../../../gnu/share/man/man1/unlink.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/unlink.1 facet.compat.gnulinks=all link path=usr/share/man/man1/guptime.1 \ - target=../../../gnu/share/man/man1/uptime.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/uptime.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gwc.1 \ - target=../../../gnu/share/man/man1/wc.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/wc.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gwho.1 \ - target=../../../gnu/share/man/man1/who.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/who.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gyes.1 \ - target=../../../gnu/share/man/man1/yes.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/yes.1 facet.compat.gnulinks=all diff --git a/components/diffutils/diffutils.p5m b/components/diffutils/diffutils.p5m index 19d3764..907b6f4 100644 --- a/components/diffutils/diffutils.p5m +++ b/components/diffutils/diffutils.p5m @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted> @@ -138,10 +138,10 @@ link path=usr/bin/gsdiff \ target=../gnu/bin/sdiff facet.compat.gnulinks=true link path=usr/share/man/man1/gcmp.1 \ - target=../../../gnu/share/man/man1/cmp.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/cmp.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gdiff.1 \ - target=../../../gnu/share/man/man1/diff.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/diff.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gdiff3.1 \ - target=../../../gnu/share/man/man1/diff3.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/diff3.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gsdiff.1 \ - target=../../../gnu/share/man/man1/sdiff.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/sdiff.1 facet.compat.gnulinks=all diff --git a/components/gawk/gawk.p5m b/components/gawk/gawk.p5m index 1a14f75..8bfefb0 100644 --- a/components/gawk/gawk.p5m +++ b/components/gawk/gawk.p5m @@ -140,6 +140,6 @@ license gawk.license license="GPLv3, FDLv1.3" link path=usr/bin/gawk target=../gnu/bin/awk facet.compat.gnulinks=true link path=usr/share/man/man1/gawk.1 \ - target=../../../gnu/share/man/man1/awk.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/awk.1 facet.compat.gnulinks=all link path=usr/share/man/man1/pgawk.1 \ target=../../../gnu/share/man/man1/awk.1 diff --git a/components/gettext/gettext.p5m b/components/gettext/gettext.p5m index f8488b3..5e34362 100644 --- a/components/gettext/gettext.p5m +++ b/components/gettext/gettext.p5m @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted> @@ -1667,8 +1667,8 @@ link path=usr/bin/gmsgfmt target=../gnu/bin/msgfmt facet.compat.gnulinks=true link path=usr/bin/gxgettext target=../gnu/bin/xgettext facet.compat.gnulinks=true link path=usr/share/man/man1/ggettext.1 \ - target=../../../gnu/share/man/man1/gettext.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/gettext.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gmsgfmt.1 \ - target=../../../gnu/share/man/man1/msgfmt.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/msgfmt.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gxgettext.1 \ - target=../../../gnu/share/man/man1/xgettext.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/xgettext.1 facet.compat.gnulinks=all diff --git a/components/ggrep/gnu-grep.p5m b/components/ggrep/gnu-grep.p5m index 8b93424..1757cc3 100644 --- a/components/ggrep/gnu-grep.p5m +++ b/components/ggrep/gnu-grep.p5m @@ -196,11 +196,11 @@ link path=usr/bin/ggrep \ target=../gnu/bin/grep facet.compat.gnulinks=true link path=usr/share/man/man1/gegrep.1 \ - target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=all link path=usr/share/man/man1/gfgrep.1 \ - target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=all link path=usr/share/man/man1/ggrep.1 \ - target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/grep.1 facet.compat.gnulinks=all link path=usr/sfw/bin/gegrep target=../../gnu/bin/egrep link path=usr/sfw/bin/gfgrep target=../../gnu/bin/fgrep link path=usr/sfw/bin/ggrep target=../../gnu/bin/grep diff --git a/components/gtar/gtar.p5m b/components/gtar/gtar.p5m index 43c44f8..e2bcbef 100644 --- a/components/gtar/gtar.p5m +++ b/components/gtar/gtar.p5m @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile> @@ -174,5 +174,5 @@ license gtar.license license="GPLv3, FDLv1.3" link path=usr/bin/gtar target=../gnu/bin/tar facet.compat.gnulinks=true link path=usr/share/man/man1/gtar.1 \ - target=../../../gnu/share/man/man1/tar.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/tar.1 facet.compat.gnulinks=all link path=usr/sfw/bin/gtar target=../../gnu/bin/tar diff --git a/components/libxml2/libxml2.p5m b/components/libxml2/libxml2.p5m index e6275fb..4a27d63 100644 --- a/components/libxml2/libxml2.p5m +++ b/components/libxml2/libxml2.p5m @@ -52,7 +52,7 @@ file $(MACH64)/llib-lxml2.ln path=lib/$(MACH64)/llib-lxml2.ln file usr/lib/libxml2.so.2 path=lib/libxml2.so.2 file $(MACH32)/llib-lxml2.ln path=lib/llib-lxml2.ln -file path=usr/bin/xml2-config +file path=usr/bin/xml2-config facet.devel=true file path=usr/bin/xmlcatalog file path=usr/bin/xmllint file path=usr/include/libxml2/libxml/DOCBparser.h @@ -106,7 +106,7 @@ file llib-lxml2 path=usr/lib/llib-lxml2 file path=usr/lib/pkgconfig/libxml-2.0.pc file path=usr/share/aclocal/libxml.m4 -file path=usr/share/man/man1/xml2-config.1 +file path=usr/share/man/man1/xml2-config.1 facet.devel=all file path=usr/share/man/man1/xmlcatalog.1 file path=usr/share/man/man1/xmllint.1 file path=usr/share/man/man3/libxml.3 diff --git a/components/libxslt/libxslt.p5m b/components/libxslt/libxslt.p5m index 9cb6ec7..3d442c3 100644 --- a/components/libxslt/libxslt.p5m +++ b/components/libxslt/libxslt.p5m @@ -184,7 +184,7 @@ file path=usr/share/lib/xslt/doc/html/xslt.html file path=usr/share/lib/xslt/doc/html/xsltproc.html file path=usr/share/lib/xslt/doc/html/xsltproc2.html -file xslt-config.1 path=usr/share/man/man1/xslt-config.1 facet.devel=true +file xslt-config.1 path=usr/share/man/man1/xslt-config.1 facet.devel=all file path=usr/share/man/man1/xsltproc.1 file path=usr/share/man/man3/libexslt.3 file path=usr/share/man/man3/libxslt.3 diff --git a/components/m4/m4.p5m b/components/m4/m4.p5m index 8b233d5..96ec005 100644 --- a/components/m4/m4.p5m +++ b/components/m4/m4.p5m @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # <transform file path=usr.*/man/.+ -> default mangler.man.stability committed> @@ -63,4 +63,4 @@ target=../gnu/bin/m4 facet.compat.gnulinks=true link path=usr/sfw/bin/gm4 target=../../gnu/bin/m4 link path=usr/share/man/man1/gm4.1 \ - target=../../../gnu/share/man/man1/m4.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/m4.1 facet.compat.gnulinks=all diff --git a/components/make/make.p5m b/components/make/make.p5m index ade1535..351773b 100644 --- a/components/make/make.p5m +++ b/components/make/make.p5m @@ -136,7 +136,7 @@ license make.license license="GPLv3, FDLv1.3" link path=usr/bin/gmake target=../gnu/bin/make facet.compat.gnulinks=true link path=usr/share/man/man1/gmake.1 \ - target=../../../gnu/share/man/man1/make.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/make.1 facet.compat.gnulinks=all link path=usr/sfw/bin/gmake target=../../gnu/bin/make link path=usr/sfw/share/man/man1/gmake.1 \ target=../../../../gnu/share/man/man1/make.1 diff --git a/components/patch/patch.p5m b/components/patch/patch.p5m index 884e81e..4d54c89 100644 --- a/components/patch/patch.p5m +++ b/components/patch/patch.p5m @@ -53,4 +53,4 @@ link path=usr/share/man/man1/patch.1 \ target=../../../gnu/share/man/man1/patch.1 link path=usr/share/man/man1/gpatch.1 \ - target=../../../gnu/share/man/man1/patch.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/patch.1 facet.compat.gnulinks=all diff --git a/components/sed/sed.p5m b/components/sed/sed.p5m index 67242ae..be659ef 100644 --- a/components/sed/sed.p5m +++ b/components/sed/sed.p5m @@ -20,7 +20,7 @@ # # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile> @@ -164,4 +164,4 @@ link path=usr/bin/gsed \ target=../gnu/bin/sed facet.compat.gnulinks=true link path=usr/share/man/man1/gsed.1 \ - target=../../../gnu/share/man/man1/sed.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/sed.1 facet.compat.gnulinks=all diff --git a/components/which/which.p5m b/components/which/which.p5m index 36136ef..fa4f870 100644 --- a/components/which/which.p5m +++ b/components/which/which.p5m @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # # PSARC/2007/049 @@ -47,5 +47,5 @@ file path=usr/share/info/which.info link path=usr/bin/gwhich target=../gnu/bin/which facet.compat.gnulinks=true link path=usr/share/man/man1/gwhich.1 \ - target=../../../gnu/share/man/man1/which.1 facet.compat.gnulinks=true + target=../../../gnu/share/man/man1/which.1 facet.compat.gnulinks=all license which.license license=GPLv2 diff --git a/transforms/devel b/transforms/devel index f262c91..2887ea1 100644 --- a/transforms/devel +++ b/transforms/devel @@ -20,26 +20,26 @@ # # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # # header files <transform dir file link hardlink path=usr.*/include(/.+){0,1} -> \ - default facet.devel true> + default facet.devel all> # archive libraries (on rare occasion, we should be delivering these) -<transform file path=.*lib/.+\.a$ -> default facet.devel true> +<transform file path=.*lib/.+\.a$ -> default facet.devel all> # .so links, we need to determine if this is a problem, I suspect that it is. -#<transform link path=.*lib/.*\.so$ -> default facet.devel true> +#<transform link path=.*lib/.*\.so$ -> default facet.devel all> # lint libraries -<transform file link hardlink path=.*/lib/llib-.* -> default facet.devel true> +<transform file link hardlink path=.*/lib/llib-.* -> default facet.devel all> # pkg-config data <transform dir file link hardlink path=.*/pkgconfig(/.+\.pc){0,1}$ -> \ - default facet.devel true> + default facet.devel all> # autoconf macros <transform dir file link hardlink path=.*/aclocal(/.*\.m4){0,1}$ -> \ - default facet.devel true> + default facet.devel all> diff --git a/transforms/docs b/transforms/docs index 4d1550b..70b1903 100644 --- a/transforms/docs +++ b/transforms/docs @@ -25,35 +25,35 @@ # man pages <transform dir file link hardlink path=usr.*/man(/.+){0,1}$ -> \ - default facet.doc.man true> + default facet.doc.man all> # texinfo docs <transform dir file link hardlink path=usr/.*/info(/.+){0,1}$ -> \ - default facet.doc.info true> + default facet.doc.info all> <transform file path=usr/.*/info/.+$ -> \ add restart_fmri svc:/application/texinfo-update:default> <transform file path=usr/.*/info/dir$ -> exit 1 "Error: packaged texinfo directory file (%<action.path>)" > # html docs <transform dir file link hardlink path=usr/.*/doc/.*(html?|css).* -> \ - default facet.doc.html true> + default facet.doc.html all> <transform dir file link hardlink path=usr/lib/help/.*\.html$ -> \ - default facet.doc.html true> + default facet.doc.html all> # pdf docs <transform dir file link hardlink path=usr/.*/doc/.*\.pdf$ -> \ - default facet.doc.pdf true> + default facet.doc.pdf all> # ps docs <transform dir file link hardlink path=usr/.*/doc/.*\.ps$ -> \ - default facet.doc.ps true> + default facet.doc.ps all> # general documentation <transform dir file link hardlink path=usr/.*/doc(/.+){0,1}$ -> \ - default facet.doc true> + default facet.doc all> # drop facet.doc if we have a type specific facet. -<transform dir file link hardlink facet.doc.html=true -> delete facet.doc true> -<transform dir file link hardlink facet.doc.info=true -> delete facet.doc true> -<transform dir file link hardlink facet.doc.pdf=true -> delete facet.doc true> -<transform dir file link hardlink facet.doc.man=true -> delete facet.doc true> +<transform dir file link hardlink facet.doc.html=all -> delete facet.doc all> +<transform dir file link hardlink facet.doc.info=all -> delete facet.doc all> +<transform dir file link hardlink facet.doc.pdf=all -> delete facet.doc all> +<transform dir file link hardlink facet.doc.man=all -> delete facet.doc all> -- Gitblit v1.9.3