# HG changeset patch # User Edwin Beasant # Date 1341819863 -3600 # Node ID ec78fc2e4b1d056ced8eaa618b5f95f6de66eb6e # Parent a5331e3b6d860306f3cbb57a50ab3c5784a57dc1 7168548 package shell/ksh version number needs to conform. diff -r a5331e3b6d86 -r ec78fc2e4b1d components/ksh93/Makefile --- a/components/ksh93/Makefile Thu Jul 05 10:31:21 2012 -0700 +++ b/components/ksh93/Makefile Mon Jul 09 08:44:23 2012 +0100 @@ -117,9 +117,26 @@ @$(MKDIR) -p $(PROTO_DIR)/etc/; \ $(CP) ksh.kshrc $(PROTO_DIR)/etc/ -# Packaging information +# Packaging information. +# Note how the AT&T "version letter symbol date" code is translated +# into the IPS version number: +# +# shell/ksh93@93..<0 or 1>. +# +# is the numeric place in the alphabet of the +# major version letter. +# +# <0 or 1> is the presence or absence of the "+" symbol in the AT&T +# version code. The "+" represents a point/bugfix release and would appear as +# "93+" in the human readable form. +# +# EXAMPLE: +# AT&T Version string: 93u+ 2011-02-08 +# IPS Version number: 93.21.1.20110208 +# IPS_PKG_NAME= ksh93 -IPS_COMPONENT_VERSION= 20110208 +IPS_COMPONENT_VERSION= 93.21.0.20110208 +IPS_HUMAN_VERSION= "93u 2011-02-08" # common targets build: $(BUILD_32_and_64) diff -r a5331e3b6d86 -r ec78fc2e4b1d components/ksh93/developer-astdev.p5m --- a/components/ksh93/developer-astdev.p5m Thu Jul 05 10:31:21 2012 -0700 +++ b/components/ksh93/developer-astdev.p5m Mon Jul 09 08:44:23 2012 +0100 @@ -18,43 +18,11 @@ # # CDDL HEADER END # - -# # Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. # -# The man pages are all at the top of a "files" directory; setting the hash to -# # point to the files therein. - set action.hash %<\1> > -# Bypassing the mangler for these files because they are pre-Solarified. - add mangler.bypass true > -set name=pkg.fmri \ - value=pkg:/developer/astdev@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.description \ - value="AT&T AST development utilities for extracting messages for localisation" -set name=pkg.summary value="AT&T AST development utilities" -set name=info.classification \ - value="org.opensolaris.category.2008:System/Software Management" -set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) -set name=info.upstream \ - value="AT&T Software Technology (AST) OpenSource Software Collection" -set name=info.upstream-url value=$(COMPONENT_ARCHIVE_URL) -set name=org.opensolaris.arc-caseid value=PSARC/2012/002 +set name=pkg.fmri value=pkg:/developer/astdev@20110208-0.175.1.0.0.21.0 +set name=pkg.renamed value=true set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -dir path=usr group=sys -dir path=usr/ast group=sys -dir path=usr/ast/bin -dir path=usr/share/man/man1 -file $(MACH64)/bin/msgcc path=usr/ast/bin/msgcc mode=0555 -file $(MACH64)/bin/msgcpp path=usr/ast/bin/msgcpp mode=0555 -file $(MACH64)/bin/msgcvt path=usr/ast/bin/msgcvt mode=0555 -file $(MACH64)/bin/msggen path=usr/ast/bin/msggen mode=0555 -file $(MACH64)/bin/msgget path=usr/ast/bin/msgget mode=0555 -file path=usr/share/man/man1/msgcc.1 -file path=usr/share/man/man1/msgcpp.1 -file path=usr/share/man/man1/msgcvt.1 -file path=usr/share/man/man1/msggen.1 -file path=usr/share/man/man1/msgget.1 -legacy pkg=SUNWastdev desc="AT&T AST development utilities" \ - name="AT&T AST development utilities" -license ksh93.license license=CPL +depend fmri=pkg:/developer/astdev93@93.21.0.20110208-0.175.1.0.0.21 type=require + diff -r a5331e3b6d86 -r ec78fc2e4b1d components/ksh93/developer-astdev93.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ksh93/developer-astdev93.p5m Mon Jul 09 08:44:23 2012 +0100 @@ -0,0 +1,64 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. +# + +# The man pages are all at the top of a "files" directory; setting the hash to +# # point to the files therein. + set action.hash %<\1> > +# Bypassing the mangler for these files because they are pre-Solarified. + add mangler.bypass true > +set name=pkg.fmri \ + value=pkg:/developer/astdev93@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(IPS_HUMAN_VERSION) +set name=pkg.description \ + value="AT&T AST development utilities for extracting messages for localisation" +set name=pkg.summary value="AT&T AST development utilities" +set name=info.classification \ + value="org.opensolaris.category.2008:System/Software Management" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream \ + value="AT&T Software Technology (AST) OpenSource Software Collection" +set name=info.upstream-url value=$(COMPONENT_ARCHIVE_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2012/002 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +dir path=usr group=sys +dir path=usr/ast group=sys +dir path=usr/ast/bin +dir path=usr/share/man/man1 +file $(MACH64)/bin/msgcc path=usr/ast/bin/msgcc mode=0555 +file $(MACH64)/bin/msgcpp path=usr/ast/bin/msgcpp mode=0555 +file $(MACH64)/bin/msgcvt path=usr/ast/bin/msgcvt mode=0555 +file $(MACH64)/bin/msggen path=usr/ast/bin/msggen mode=0555 +file $(MACH64)/bin/msgget path=usr/ast/bin/msgget mode=0555 +file path=usr/share/man/man1/msgcc.1 +file path=usr/share/man/man1/msgcpp.1 +file path=usr/share/man/man1/msgcvt.1 +file path=usr/share/man/man1/msggen.1 +file path=usr/share/man/man1/msgget.1 +legacy pkg=SUNWastdev desc="AT&T AST development utilities" \ + name="AT&T AST development utilities" +license ksh93.license license=CPL +# Ensure that we upgrade the old package to the version where it's +# renamed. +depend fmri=pkg:/developer/astdev@20110208-0.175.1.0.0.21.0 type=optional diff -r a5331e3b6d86 -r ec78fc2e4b1d components/ksh93/ksh93.p5m --- a/components/ksh93/ksh93.p5m Thu Jul 05 10:31:21 2012 -0700 +++ b/components/ksh93/ksh93.p5m Mon Jul 09 08:44:23 2012 +0100 @@ -27,7 +27,8 @@ # Bypassing the mangler for these files because they are pre-Solarified. add mangler.bypass true > set name=pkg.fmri \ - value=pkg:/shell/ksh@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) + value=pkg:/shell/ksh93@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(IPS_HUMAN_VERSION) set name=pkg.description \ value="Korn Shell 93: A command and programming language that executes commands read from a terminal or a file" set name=pkg.summary value="Ksh93 - The AT&T Korn Shell" @@ -109,3 +110,6 @@ link path=usr/lib/rsh target=../bin/ksh93 link path=usr/sbin/jsh target=../bin/ksh93 link path=usr/sbin/sh target=../bin/$(MACH32)/ksh93 +# Ensure that we upgrade the old package to the version where it's +# renamed. +depend fmri=pkg:/shell/ksh@20110208-0.175.1.0.0.21.0 type=optional diff -r a5331e3b6d86 -r ec78fc2e4b1d components/ksh93/shell-ksh.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ksh93/shell-ksh.p5m Mon Jul 09 08:44:23 2012 +0100 @@ -0,0 +1,28 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# + +set name=pkg.fmri value=pkg:/shell/ksh@20110208-0.175.1.0.0.21.0 +set name=pkg.renamed value=true +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +depend fmri=pkg:/shell/ksh93@93.21.0.20110208-0.175.1.0.0.21 type=require + diff -r a5331e3b6d86 -r ec78fc2e4b1d components/ksh93/source-demo-ksh.p5m --- a/components/ksh93/source-demo-ksh.p5m Thu Jul 05 10:31:21 2012 -0700 +++ b/components/ksh93/source-demo-ksh.p5m Mon Jul 09 08:44:23 2012 +0100 @@ -18,41 +18,11 @@ # # CDDL HEADER END # - -# # Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. # -# The man pages are all at the top of a "files" directory; setting the hash to -# point to the files therein. - set action.hash %<\1> > -# Bypassing the mangler for these files because they are pre-Solarified. - add mangler.bypass true > -set name=pkg.fmri \ - value=pkg:/source/demo/ksh@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.description value="Source code to demonstrate the KornShell" -set name=pkg.summary value="KornShell demos" -set name=info.classification value=org.opensolaris.category.2008:System/Core -set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) -set name=info.upstream \ - value="AT&T Software Technology (AST) OpenSource Software Collection" -set name=info.upstream-url value=$(COMPONENT_ARCHIVE_URL) -set name=org.opensolaris.arc-caseid value=PSARC/2012/002 +set name=pkg.fmri value=pkg:/source/demo/ksh@20110208-0.175.1.0.0.21.0 +set name=pkg.renamed value=true set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -dir path=usr group=sys -dir path=usr/demo -dir path=usr/demo/ksh -dir path=usr/demo/ksh/fun -dir path=usr/share/man/ja_JP.UTF-8/man1 -dir path=usr/share/man/man1 -file $(MACH64)/fun/dirs path=usr/demo/ksh/fun/dirs mode=0755 preserve=true -file $(MACH64)/fun/popd path=usr/demo/ksh/fun/popd mode=0755 preserve=true -file $(MACH64)/fun/pushd path=usr/demo/ksh/fun/pushd mode=0755 preserve=true -file $(MACH64)/fun/title path=usr/demo/ksh/fun/title mode=0755 preserve=true -file dirs.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/dirs.1 -file popd.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/popd.1 -file pushd.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/pushd.1 -file path=usr/share/man/man1/dirs.1 -file path=usr/share/man/man1/popd.1 -file path=usr/share/man/man1/pushd.1 -license ksh93.license license=CPL +depend fmri=pkg:/source/demo/ksh93@93.21.0.20110208-0.175.1.0.0.21 type=require + diff -r a5331e3b6d86 -r ec78fc2e4b1d components/ksh93/source-demo-ksh93.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ksh93/source-demo-ksh93.p5m Mon Jul 09 08:44:23 2012 +0100 @@ -0,0 +1,62 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. +# + +# The man pages are all at the top of a "files" directory; setting the hash to +# point to the files therein. + set action.hash %<\1> > +# Bypassing the mangler for these files because they are pre-Solarified. + add mangler.bypass true > +set name=pkg.fmri \ + value=pkg:/source/demo/ksh93@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(IPS_HUMAN_VERSION) +set name=pkg.description value="Source code to demonstrate the KornShell" +set name=pkg.summary value="KornShell demos" +set name=info.classification value=org.opensolaris.category.2008:System/Core +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream \ + value="AT&T Software Technology (AST) OpenSource Software Collection" +set name=info.upstream-url value=$(COMPONENT_ARCHIVE_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2012/002 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +dir path=usr group=sys +dir path=usr/demo +dir path=usr/demo/ksh +dir path=usr/demo/ksh/fun +dir path=usr/share/man/ja_JP.UTF-8/man1 +dir path=usr/share/man/man1 +file $(MACH64)/fun/dirs path=usr/demo/ksh/fun/dirs mode=0755 preserve=true +file $(MACH64)/fun/popd path=usr/demo/ksh/fun/popd mode=0755 preserve=true +file $(MACH64)/fun/pushd path=usr/demo/ksh/fun/pushd mode=0755 preserve=true +file $(MACH64)/fun/title path=usr/demo/ksh/fun/title mode=0755 preserve=true +file dirs.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/dirs.1 +file popd.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/popd.1 +file pushd.1.ja_JP.UTF-8 path=usr/share/man/ja_JP.UTF-8/man1/pushd.1 +file path=usr/share/man/man1/dirs.1 +file path=usr/share/man/man1/popd.1 +file path=usr/share/man/man1/pushd.1 +license ksh93.license license=CPL +# Ensure that we upgrade the old package to the version where it's +# renamed. +depend fmri=pkg:/source/demo/ksh@20110208-0.175.1.0.0.21.0 type=optional