From f4140bc5435dffb27064df5a98b33f6d0d1b9595 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Fri, 28 Sep 2012 22:37:16 +0400 Subject: Setting gnu symlinks blindly is not good --- examples/findutils/gnu-findutils.p5m | 7 +++++++ examples/findutils/locate.p5m | 2 ++ examples/gm4/gm4.p5m | 7 +++++++ examples/grep/gnu-grep.p5m | 8 +++++++- 4 files changed, 23 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/findutils/gnu-findutils.p5m b/examples/findutils/gnu-findutils.p5m index 8e6f021..e902e90 100644 --- a/examples/findutils/gnu-findutils.p5m +++ b/examples/findutils/gnu-findutils.p5m @@ -4,6 +4,13 @@ set name=info.upstream-url value="$(home)" set name=info.source_url value="$(download)" license $(license-file) license="$(license)" + \ +emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> > + + \ +emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1> > + + dir path=usr dir path=usr/gnu dir path=usr/gnu/bin diff --git a/examples/findutils/locate.p5m b/examples/findutils/locate.p5m index fe26217..fee8de0 100644 --- a/examples/findutils/locate.p5m +++ b/examples/findutils/locate.p5m @@ -6,6 +6,8 @@ license $(license-file) license="$(license)" depend fmri=pkg:/file/gnu-$(name)@4.4 type=require +# TODO: mediators for /usr/bin/{locate,updatedb} + dir path=usr dir path=usr/gnu dir path=usr/gnu/bin diff --git a/examples/gm4/gm4.p5m b/examples/gm4/gm4.p5m index 638004d..b5843ed 100644 --- a/examples/gm4/gm4.p5m +++ b/examples/gm4/gm4.p5m @@ -5,6 +5,13 @@ set name=info.source_url value="$(download)" license $(license-file) license=$(license) + \ +emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> > + + \ +emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1>> + + dir path=usr dir path=usr/gnu dir path=usr/gnu/bin diff --git a/examples/grep/gnu-grep.p5m b/examples/grep/gnu-grep.p5m index bf811ec..a1e10d5 100644 --- a/examples/grep/gnu-grep.p5m +++ b/examples/grep/gnu-grep.p5m @@ -1,10 +1,16 @@ - set name=pkg.fmri value=pkg:/text/gnu-$(name)@$(ips_version) set name=pkg.summary value="$(summary)" set name=info.upstream-url value="$(home)" set name=info.source_url value="$(download)" license $(license-file) license="$(license)" + \ +emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> > + + \ +emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1> > + + dir path=usr dir path=usr/gnu dir path=usr/gnu/bin -- cgit v1.2.3