17601897 The gznew script should have /usr/gnu/bin at the front of its PATH. s11u1-sru
authorVladimir Marek <Vladimir.Marek@oracle.com>
Thu, 24 Oct 2013 13:43:51 +0200
branchs11u1-sru
changeset 2844 25fca853cb6d
parent 2843 349e022de8ed
child 2845 5260a9f352d7
17601897 The gznew script should have /usr/gnu/bin at the front of its PATH.
components/gzip/gzip.p5m
components/gzip/patches/znew.patch
--- a/components/gzip/gzip.p5m	Thu Oct 24 13:41:59 2013 +0200
+++ b/components/gzip/gzip.p5m	Thu Oct 24 13:43:51 2013 +0200
@@ -24,23 +24,22 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
 set name=pkg.fmri \
     value=pkg:/compress/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GNU Zip (gzip)"
 set name=pkg.description value="The GNU Zip (gzip) compression utility"
-set name=pkg.summary value="GNU Zip (gzip)"
 set name=com.oracle.info.description value="GNU zip"
 set name=com.oracle.info.tpno value=7913
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/1999/555
+set name=org.opensolaris.arc-caseid value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/gunzip
 file path=usr/bin/gzcat
 file path=usr/bin/gzcmp
 file path=usr/bin/gzdiff
+file path=usr/bin/gzegrep
 file path=usr/bin/gzexe
-file path=usr/bin/gzegrep
 file path=usr/bin/gzfgrep
 file path=usr/bin/gzforce
 file path=usr/bin/gzgrep
@@ -62,10 +61,11 @@
 file path=usr/share/man/man1/gzless.1
 file path=usr/share/man/man1/gzmore.1
 file path=usr/share/man/man1/gznew.1
-legacy pkg=SUNWgzip \
-    desc="The GNU Zip (gzip) compression utility" \
+legacy pkg=SUNWgzip desc="The GNU Zip (gzip) compression utility" \
     name="The GNU Zip (gzip) compression utility"
+license gzip.license license="GPLv3, FDLv1.3"
 
-license gzip.license license="GPLv3, FDLv1.3"
+# znew needs GNU chmod.
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/chmod
 # zgrep needs a version of grep that has the -f command line option.
-depend fmri=system/xopen/xcu4 type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/xpg4/bin/grep
--- a/components/gzip/patches/znew.patch	Thu Oct 24 13:41:59 2013 +0200
+++ b/components/gzip/patches/znew.patch	Thu Oct 24 13:43:51 2013 +0200
@@ -46,6 +46,15 @@
 index 9bd3ce9..d16311a 100644
 --- a/znew.in
 +++ b/znew.in
[email protected]@ -21,7 +21,7 @@
+ case $1 in
+ --__bindir) bindir=${2?}; shift; shift;;
+ esac
+-PATH=$bindir:$PATH; export PATH
++PATH=/usr/gnu/bin:$bindir:$PATH; export PATH
+
+ version="znew (gzip) @[email protected]
+ Copyright (C) 2010-2012 Free Software Foundation, Inc.
 @@ -58,33 +58,9 @@ new=0
  block=1024
  # block is the disk block size (best guess, need not be exact)