Index: ossp-pkg/shtool/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v rcsdiff -q -kk '-r1.237' '-r1.238' -u '/v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v' 2>/dev/null --- ChangeLog 2008/01/30 16:23:07 1.237 +++ ChangeLog 2008/04/02 20:12:04 1.238 @@ -89,7 +89,7 @@ "ls" changes its time format in response to the TIME_STYLE variable. [James Rowe ] - *) Use "env -i sort" for Linux detections in "shtool platform" + *) Use "env -i sort" for Linux detections in "shtool platform" to circumvent LC_COLLATE and LANG environment problems. [Ralf S. Engelschall] Index: ossp-pkg/shtool/devtool RCS File: /v/ossp/cvs/ossp-pkg/shtool/devtool,v rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/shtool/devtool,v' 2>/dev/null --- devtool 2002/02/01 14:58:04 1.1 +++ devtool 2008/04/02 20:12:04 1.2 @@ -1,7 +1,7 @@ #!/bin/sh ## ## devtool -- Development Tool -## Copyright (c) 2001 Ralf S. Engelschall +## Copyright (c) 2001 Ralf S. Engelschall ## if [ $# -eq 0 ]; then Index: ossp-pkg/shtool/devtool.conf RCS File: /v/ossp/cvs/ossp-pkg/shtool/devtool.conf,v rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/shtool/devtool.conf,v' 2>/dev/null --- devtool.conf 2007/05/19 19:06:08 1.8 +++ devtool.conf 2008/04/02 20:12:04 1.9 @@ -14,7 +14,7 @@ %version sh sh.version -l txt -n "GNU shtool" -e VERSION V=`sh sh.version -l txt -d long VERSION` - sed -e "s/Version .*(.*)/Version $V/g" README.n + sed -e "s/Version .*(.*)/Version $V/g" README.n mv README.n README V=`sh sh.version -l txt -d short VERSION` sed -e "s/%define ver .*/%define ver $V/g" shtool.spec.n Index: ossp-pkg/shtool/devtool.func RCS File: /v/ossp/cvs/ossp-pkg/shtool/devtool.func,v rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/shtool/devtool.func,v' 2>/dev/null --- devtool.func 2007/05/19 19:09:39 1.8 +++ devtool.func 2008/04/02 20:12:04 1.9 @@ -1,6 +1,6 @@ ## ## devtool.func -- Development Tool Functions -## Copyright (c) 2001-2007 Ralf S. Engelschall +## Copyright (c) 2001-2007 Ralf S. Engelschall ## devtool_require () { Index: ossp-pkg/shtool/sh.mkln RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.mkln,v rcsdiff -q -kk '-r1.22' '-r1.23' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.mkln,v' 2>/dev/null --- sh.mkln 2007/05/19 19:09:39 1.22 +++ sh.mkln 2008/04/02 20:12:04 1.23 @@ -134,13 +134,13 @@ allow_relative_srcpre=no if [ ".$prefix" != . ] && [ ".$prefix" != ./ ]; then allow_relative_srcpre=yes - fi + fi if [ $oneisabs = 0 ]; then allow_relative_srcpre=yes - fi + fi if [ ".$opt_s" != .yes ]; then allow_relative_srcpre=no - fi + fi if [ ".$allow_relative_srcpre" = .yes ]; then pl="$dstdir/" OIFS="$IFS"; IFS='/' Index: ossp-pkg/shtool/sh.platform RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.platform,v rcsdiff -q -kk '-r1.28' '-r1.29' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.platform,v' 2>/dev/null --- sh.platform 2008/01/30 16:23:07 1.28 +++ sh.platform 2008/04/02 20:12:04 1.29 @@ -195,7 +195,7 @@ r=`echo "${UNAME_RELEASE}" | sed -e 's/\([-_].*\)$/[\1]/'` ST="DragonFly ${r}" SP="${ST}" - SC="4.4BSD" + SC="4.4BSD" ;; # GNU/Linux Index: ossp-pkg/shtool/sh.subst RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.subst,v rcsdiff -q -kk '-r1.18' '-r1.19' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.subst,v' 2>/dev/null --- sh.subst 2007/08/31 13:15:12 1.18 +++ sh.subst 2008/04/02 20:12:04 1.19 @@ -146,7 +146,7 @@ fi fi - # optionally check whether any content change actually occurred + # optionally check whether any content change actually occurred if [ ".$opt_q" = .no ]; then if cmp $file$orig $file >/dev/null 2>&1; then if [ ".$opt_w" = .yes ]; then Index: ossp-pkg/shtool/sh.version RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.version,v rcsdiff -q -kk '-r1.43' '-r1.44' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.version,v' 2>/dev/null --- sh.version 2007/05/19 19:09:39 1.43 +++ sh.version 2008/04/02 20:12:04 1.44 @@ -368,7 +368,7 @@ =item B<-l>, B<--language> I Choose format of version file I. I="C", ANSI C -(I="c"), M4 (I="m4"), Perl (I="perl") or Python +(I="c"), M4 (I="m4"), Perl (I="perl") or Python (I="python"). Default is C. =item B<-n>, B<--name> I