From 1aa2da5f76f2b00ad57cce9090c31c85de047693 Mon Sep 17 00:00:00 2001 From: Norm Jacobs <Norm.Jacobs@Oracle.COM> Date: Tue, 08 Feb 2011 19:54:06 +0100 Subject: [PATCH] 7016379 migrate elinks to userland (fix pkglint) 7017379 package metadata not required for building should be kept in the package manifest (fix dependency generation) --- components/bzip2/bzip2.p5m | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/components/bzip2/bzip2.p5m b/components/bzip2/bzip2.p5m index 3877a14..be7b56b 100644 --- a/components/bzip2/bzip2.p5m +++ b/components/bzip2/bzip2.p5m @@ -30,30 +30,29 @@ set name=info.upstream_url value=http://www.bzip.org/ set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -set variant.arch=$(ARCH) dir path=usr dir path=usr/bin dir path=usr/include dir path=usr/lib -dir path=usr/lib/$(MACH64) variant.arch=$(ARCH) +dir path=usr/lib/$(MACH64) dir path=usr/share dir path=usr/share/man dir path=usr/share/man/man1 dir path=usr/share/man/man3 -file path=usr/bin/bunzip2 variant.arch=$(ARCH) -file path=usr/bin/bzcat variant.arch=$(ARCH) +file path=usr/bin/bunzip2 +file path=usr/bin/bzcat file path=usr/bin/bzdiff file path=usr/bin/bzgrep -file path=usr/bin/bzip2 variant.arch=$(ARCH) -file path=usr/bin/bzip2recover variant.arch=$(ARCH) +file path=usr/bin/bzip2 +file path=usr/bin/bzip2recover file path=usr/bin/bzmore file path=usr/include/bzlib.h -file path=usr/lib/$(MACH64)/libbz2.so.1 variant.arch=$(ARCH) -file path=usr/lib/$(MACH64)/llib-lbz2.ln variant.arch=$(ARCH) -file path=usr/lib/libbz2.so.1 variant.arch=$(ARCH) +file path=usr/lib/$(MACH64)/libbz2.so.1 +file path=usr/lib/$(MACH64)/llib-lbz2.ln +file path=usr/lib/libbz2.so.1 file path=usr/lib/llib-lbz2 -file path=usr/lib/llib-lbz2.ln variant.arch=$(ARCH) +file path=usr/lib/llib-lbz2.ln file path=usr/share/man/man1/bunzip2.1 file path=usr/share/man/man1/bzcat.1 file path=usr/share/man/man1/bzcmp.1 @@ -70,8 +69,8 @@ link path=usr/bin/bzegrep target=./bzgrep link path=usr/bin/bzfgrep target=./bzgrep link path=usr/bin/bzless target=./bzmore -link path=usr/lib/$(MACH64)/libbz2.so target=libbz2.so.1 variant.arch=$(ARCH) -link path=usr/lib/libbz2.so target=libbz2.so.1 variant.arch=$(ARCH) +link path=usr/lib/$(MACH64)/libbz2.so target=libbz2.so.1 +link path=usr/lib/libbz2.so target=libbz2.so.1 license bzip2.license license="bzip2 license" -- Gitblit v1.9.3