author | Radhika Siravara<radhika.siravara@oracle.com> |
Tue, 17 Nov 2015 09:12:59 -0800 | |
changeset 5098 | 77b8086c6247 |
parent 3732 | 0f62cc221c7e |
permissions | -rw-r--r-- |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
# CDDL HEADER START |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
# The contents of this file are subject to the terms of the |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
# Common Development and Distribution License (the "License"). |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
# You may not use this file except in compliance with the License. |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
# or http://www.opensolaris.org/os/licensing. |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
# See the License for the specific language governing permissions |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
# and limitations under the License. |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
# When distributing Covered Code, include this CDDL HEADER in each |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
# If applicable, add the following below this CDDL HEADER, with the |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
# fields enclosed by brackets "[]" replaced with your own identifying |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
# information: Portions Copyright [yyyy] [name of copyright owner] |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
# CDDL HEADER END |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
# |
3732
0f62cc221c7e
20440737 pkgfmt all Userland pkg(5) manifests
John Beck <John.Beck@Oracle.COM>
parents:
1948
diff
changeset
|
23 |
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
# |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
|
403
7190c8bbb28d
7067321 conflict man page has wrong stability level.
Rich Burridge <rich.burridge@oracle.com>
parents:
387
diff
changeset
|
26 |
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted> |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
set name=pkg.fmri \ |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
value=pkg:/shell/conflict@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
set name=pkg.summary value="Displays conflicting filenames in $PATH (6.0)" |
3732
0f62cc221c7e
20440737 pkgfmt all Userland pkg(5) manifests
John Beck <John.Beck@Oracle.COM>
parents:
1948
diff
changeset
|
30 |
set name=pkg.human-version value=$(COMPONENT_VERSION) |
1205
6c6c27bcf9ac
16431724 Adjust how license text and Oracle internal tracking numbers are propagated
Rich Burridge <rich.burridge@oracle.com>
parents:
629
diff
changeset
|
31 |
set name=com.oracle.info.description value="the conflict utility" |
1948
2d1537e7942d
18978320 Userland components should specify TPNOs in Makefiles instead of pkg manifests
John Beck <John.Beck@Oracle.COM>
parents:
1254
diff
changeset
|
32 |
set name=com.oracle.info.tpno value=$(TPNO) |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
set name=info.classification \ |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
value="org.opensolaris.category.2008:Applications/System Utilities" |
464
08f94c414553
7073736 need to turn _ into -
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
403
diff
changeset
|
35 |
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) |
08f94c414553
7073736 need to turn _ into -
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
403
diff
changeset
|
36 |
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) |
3732
0f62cc221c7e
20440737 pkgfmt all Userland pkg(5) manifests
John Beck <John.Beck@Oracle.COM>
parents:
1948
diff
changeset
|
37 |
set name=org.opensolaris.arc-caseid value=PSARC/2009/003 |
387
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
38 |
set name=org.opensolaris.consolidation value=$(CONSOLIDATION) |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
39 |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
40 |
|
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
41 |
file path=usr/bin/conflict |
88254491c816
7063901 Move conflict to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
42 |
file path=usr/share/man/man1/conflict.1 |
3732
0f62cc221c7e
20440737 pkgfmt all Userland pkg(5) manifests
John Beck <John.Beck@Oracle.COM>
parents:
1948
diff
changeset
|
43 |
license conflict.copyright license=BSD-like |