diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-08 15:46:45 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-08 15:46:45 +0000 |
| commit | bc318710eeaee30aaaab403709e15606b9789dd3 (patch) | |
| tree | 68ea2945cd2444447128afcbe62e64bbe16fe276 /editors/abiword-devel/files/patch-au | |
| parent | Oops - forgot to do a "cvs add" for pkg-message before previous commit. (diff) | |
Update to 0.9.0.
Notes
Notes:
svn path=/head/; revision=45968
Diffstat (limited to 'editors/abiword-devel/files/patch-au')
| -rw-r--r-- | editors/abiword-devel/files/patch-au | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/editors/abiword-devel/files/patch-au b/editors/abiword-devel/files/patch-au index f5d1dce6b631..6290aae585fc 100644 --- a/editors/abiword-devel/files/patch-au +++ b/editors/abiword-devel/files/patch-au @@ -1,7 +1,10 @@ ---- pkg/common/unix/scripts/makewrapper.sh.orig Tue Oct 10 08:39:31 2000 -+++ pkg/common/unix/scripts/makewrapper.sh Wed Jan 3 13:56:49 2001 -@@ -64,23 +64,31 @@ - if [ -z \$locale ] + +$FreeBSD$ + +--- src/pkg/common/unix/scripts/makewrapper.sh.orig Mon Jun 11 02:14:43 2001 ++++ src/pkg/common/unix/scripts/makewrapper.sh Wed Aug 8 13:38:34 2001 +@@ -66,23 +66,31 @@ + if [ -z "\$locale" ] then locale=\$LANG +elif [ -z \$locale ] @@ -9,37 +12,35 @@ + locale=\$LC_CTYPE fi - if [ ! -z \$locale ] + if [ ! -z "\$locale" ] then - #now guess encoding + #now guess country/region/encoding -+ country=\`echo \$locale |sed -e 's/\(.*\)_.*\$/\1/'\` -+ region=\`echo \$locale |sed -e 's/^.*_\(.*\)\..*/\1/'\` ++ country=\`echo \$locale | sed -e 's/\(.*\)_.*\$/\1/'\` ++ region=\`echo \$locale | sed -e 's/^.*_\(.*\)\..*/\1/'\` encoding=\`echo \$locale | sed -e 's/^.*\.\(.*\)\$/\1/'\` -- if [ ! -z \$encoding ] +- if [ ! -z "\$encoding" ] + if [ ! -z \$country -o ! -z \$region -o ! -z \$encoding ] then - addfontdir=\$ABISUITE_FONT_HOME/\$encoding -- if [ ! -z \$addfontdir ] +- if [ ! -z "\$addfontdir" ] - then -- if [ -d \$addfontdir ] -- then +- if [ -d "\$addfontdir" ] ++ addfontdirlst="\$ABISUITE_FONT_HOME/\$country \$ABISUITE_FONT_HOME/\${country}-\${region} \$ABISUITE_FONT_HOME/\$encoding \$ABISUITE_FONT_HOME/\${country}-\${region}.\${encoding}" ++ for addfontdir in \$addfontdirlst ++ do ++ if [ ! -z \$addfontdir ] + then - #add directory with locale-specific fonts to font path - ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir -- fi ++ if [ -d \$addfontdir -a ! -f \$addfontdir/.already-in-fp ] ++ then ++ #add directory with locale-specific fonts to font path ++ ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir ++ fi + fi - fi -+ addfontdirlst="\$ABISUITE_FONT_HOME/\$country \$ABISUITE_FONT_HOME/\${country}-\${region} \$ABISUITE_FONT_HOME/\$encoding \$ABISUITE_FONT_HOME/\${country}-\${region}.\${encoding}" -+ for addfontdir in \$addfontdirlst -+ do -+ if [ ! -z \$addfontdir ] -+ then -+ if [ -d \$addfontdir -a ! -f \$addfontdir/.already-in-fp ] -+ then -+ #add directory with locale-specific fonts to font path -+ ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir -+ fi -+ fi -+ done ++ done fi fi |