Norm Jacobs
2011-02-08 1aa2da5f76f2b00ad57cce9090c31c85de047693
7016379 migrate elinks to userland (fix pkglint)
7017379 package metadata not required for building should be kept in the package manifest (fix dependency generation)
1 files deleted
17 files modified
149 ■■■■ changed files
components/a2ps/SUNWa2ps.p5m 5 ●●●● patch | view | raw | blame | history
components/a2ps/a2ps.p5m 7 ●●●●● patch | view | raw | blame | history
components/bzip2/SUNWbzip.p5m 3 ●●●●● patch | view | raw | blame | history
components/bzip2/bzip2.p5m 23 ●●●● patch | view | raw | blame | history
components/elinks/SUNWelinks.p5m 3 ●●●●● patch | view | raw | blame | history
components/elinks/elinks.p5m 3 ●●●● patch | view | raw | blame | history
components/gtar/SUNWgtar.p5m 3 ●●●●● patch | view | raw | blame | history
components/gtar/gtar.p5m 3 ●●●● patch | view | raw | blame | history
components/less/SUNWless.p5m 3 ●●●●● patch | view | raw | blame | history
components/less/less.p5m 7 ●●●●● patch | view | raw | blame | history
components/make/SUNWgmake.p5m 3 ●●●●● patch | view | raw | blame | history
components/make/make.p5m 3 ●●●● patch | view | raw | blame | history
components/which/SUNWgnu-which.p5m 3 ●●●●● patch | view | raw | blame | history
components/which/which.p5m 4 ●●● patch | view | raw | blame | history
make-rules/ips.mk 4 ●●● patch | view | raw | blame | history
transforms/defaults 1 ●●●● patch | view | raw | blame | history
transforms/manifest-metadata-template 1 ●●●● patch | view | raw | blame | history
transforms/variant.arch 70 ●●●●● patch | view | raw | blame | history
components/a2ps/SUNWa2ps.p5m
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -29,8 +29,5 @@
set name=pkg.renamed value=true
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=variant.opensolaris.zone value=global value=nonglobal
set name=variant.arch value=$(ARCH)
depend fmri=print/lp/filter/a2ps@4.13-0.133 type=require
components/a2ps/a2ps.p5m
@@ -27,7 +27,6 @@
set name=info.upstream_url value=http://www.gnu.org/software/a2ps/
set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set variant.arch=$(ARCH)
dir path=etc
dir path=etc/gnu
@@ -93,10 +92,10 @@
file path=etc/gnu/a2ps-site.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps-site.cfg
file path=etc/gnu/a2ps.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps.cfg
file path=etc/lp/fd/a2ps.fd
file path=usr/bin/a2ps variant.arch=$(ARCH)
file path=usr/bin/a2ps
file path=usr/bin/card
file path=usr/bin/composeglyphs
file path=usr/bin/fixnt variant.arch=$(ARCH)
file path=usr/bin/fixnt
file path=usr/bin/fixps
file path=usr/bin/ogonkify
file path=usr/bin/pdiff
@@ -104,7 +103,7 @@
file path=usr/bin/psset
file path=usr/bin/texi2dvi4a2ps
file path=usr/include/liba2ps.h
file path=usr/lib/liba2ps.so.1.0.0 variant.arch=$(ARCH)
file path=usr/lib/liba2ps.so.1.0.0
link path=usr/sfw/bin/a2ps target=../../bin/a2ps
link path=usr/sfw/bin/card target=../../bin/card
link path=usr/sfw/bin/composeglyphs target=../../bin/composeglyphs
components/bzip2/SUNWbzip.p5m
@@ -30,7 +30,4 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=variant.opensolaris.zone value=global value=nonglobal
set name=variant.arch value=$(ARCH)
depend fmri=compress/bzip2@1.0.5-0.133 type=require
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"
components/elinks/SUNWelinks.p5m
@@ -30,7 +30,4 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=variant.opensolaris.zone value=global value=nonglobal
set name=variant.arch value=$(ARCH)
depend fmri=web/browser/elinks@0.11.7-0.133 type=require
components/elinks/elinks.p5m
@@ -27,7 +27,6 @@
set name=info.upstream_url value="http://elinks.or.cz/"
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
@@ -98,7 +97,7 @@
dir path=usr/share/man
dir path=usr/share/man/man1
dir path=usr/share/man/man5
file path=usr/bin/elinks variant.arch=$(ARCH)
file path=usr/bin/elinks
file path=usr/share/doc/elinks/bittorrent.txt
file path=usr/share/doc/elinks/color-model.txt
file path=usr/share/doc/elinks/bookmarks.txt
components/gtar/SUNWgtar.p5m
@@ -30,7 +30,4 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=variant.opensolaris.zone value=global value=nonglobal
set name=variant.arch value=$(ARCH)
depend fmri=archiver/gnu-tar@1.25-0.133 type=require
components/gtar/gtar.p5m
@@ -27,7 +27,6 @@
set name=info.upstream_url value="http://www.gnu.org/software/tar/"
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
@@ -115,7 +114,7 @@
dir path=usr/share/locale/zh_TW/LC_MESSAGES
dir path=usr/share/man
dir path=usr/share/man/man1
file path=usr/bin/gtar variant.arch=$(ARCH)
file path=usr/bin/gtar
file path=usr/share/info/tar.info
file path=usr/share/info/tar.info-1
file path=usr/share/info/tar.info-2
components/less/SUNWless.p5m
@@ -30,7 +30,4 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=variant.opensolaris.zone value=global value=nonglobal
set name=variant.arch value=$(ARCH)
depend fmri=text/less@436-0.133 type=require
components/less/less.p5m
@@ -30,7 +30,6 @@
set name=info.upstream_url value=http://www.greenwoodsoftware.com/less/
set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set variant.arch=$(ARCH)
license less.license license='Less License'
@@ -39,9 +38,9 @@
dir path=usr/share
dir path=usr/share/man
dir path=usr/share/man/man1
file path=usr/bin/less variant.arch=$(ARCH)
file path=usr/bin/lessecho variant.arch=$(ARCH)
file path=usr/bin/lesskey variant.arch=$(ARCH)
file path=usr/bin/less
file path=usr/bin/lessecho
file path=usr/bin/lesskey
file path=usr/share/man/man1/less.1
file path=usr/share/man/man1/lessecho.1
file path=usr/share/man/man1/lesskey.1
components/make/SUNWgmake.p5m
@@ -30,7 +30,4 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=variant.opensolaris.zone value=global value=nonglobal
set name=variant.arch value=$(ARCH)
depend fmri=developer/build/gnu-make@3.81-0.133 type=require
components/make/make.p5m
@@ -30,7 +30,6 @@
set name=info.upstream_url value=http://http.gnu.org/software/make/
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
@@ -95,7 +94,7 @@
dir path=usr/share/locale/zh_CN/LC_MESSAGES
dir path=usr/share/man
dir path=usr/share/man/man1
file path=usr/bin/gmake variant.arch=$(ARCH)
file path=usr/bin/gmake
file path=usr/share/info/make.info
file path=usr/share/info/make.info-1
file path=usr/share/info/make.info-2
components/which/SUNWgnu-which.p5m
@@ -30,7 +30,4 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=variant.opensolaris.zone value=global value=nonglobal
set name=variant.arch value=$(ARCH)
depend fmri=shell/which@2.16-0.133 type=require
components/which/which.p5m
@@ -27,8 +27,6 @@
set name=info.upstream_url value="http://www.xs4all.nl/~carlo17/which/"
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/gnu
@@ -38,7 +36,7 @@
dir path=usr/gnu/share/man/man1
dir path=usr/share
dir path=usr/share/info
file path=usr/gnu/bin/which variant.arch=$(ARCH)
file path=usr/gnu/bin/which
file path=usr/gnu/share/man/man1/which.1
file path=usr/share/info/which.info
make-rules/ips.mk
@@ -47,7 +47,6 @@
# order is important
GENERATE_TRANSFORMS +=        $(WS_TOP)/transforms/generate-cleanup
GENERATE_TRANSFORMS +=        $(WS_TOP)/transforms/variant.arch
COMPARISON_TRANSFORMS +=    $(WS_TOP)/transforms/comparison-cleanup
COMPARISON_TRANSFORMS +=    $(PKGMOGRIFY_TRANSFORMS)
@@ -116,8 +115,7 @@
        $(PUBLISH_TRANSFORMS) | \
        sed -e '/^$$/d' -e '/^#.*$$/d' | uniq >$@
# generate dependencies, drop variant.arch in set and depend actions because
# "pkgdepend resolve" fails when it's present.
# generate dependencies
$(MANIFEST_BASE)-%.depend:    $(MANIFEST_BASE)-%.mogrified
    $(PKGDEPEND) generate -m $< $(PROTO_DIR) >$@
transforms/defaults
@@ -36,6 +36,7 @@
<transform dir path=usr$ -> default group sys>
<transform dir path=usr/share$ -> default group sys>
<transform dir path=usr/share/doc$ -> default group other>
<transform dir path=usr/share/locale(/.+){0,1}$ -> default group other>
<transform dir path=usr/gnu/share$ -> default group sys>
transforms/manifest-metadata-template
@@ -27,7 +27,6 @@
set name=info.upstream_url value="XXX PROJECT URL XXX"
set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set variant.arch=$(ARCH)
license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
transforms/variant.arch
File was deleted