From 7d0eb012a93d3a5a9e8e0612b4d0c5c0c233bd51 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 10 Jan 2010 10:58:27 +0000
Subject: [PATCH] 2010-01-10 11:57 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * INSTALL     + Added gcc pkg to opensolaris pkg list.

  * harbour.spec
    ! Do not mark Red Hat and SUSE as discontinued. These names seem
      to be used for "enterprise" versions of these distros, but correct
      me if I'm wrong.

  * utils/hbmk2/hbmk2.pt_BR.po
  * utils/hbmk2/hbmk2.hu_HU.po
  * utils/hbmk2/hbmk2.prg
    + Made it clean on the help screen which options can only be used
      from the command line.
---
 harbour/ChangeLog                  | 21 +++++++++++++++---
 harbour/INSTALL                    |  2 +-
 harbour/harbour.spec               |  2 --
 harbour/utils/hbmk2/hbmk2.hu_HU.po |  6 +++---
 harbour/utils/hbmk2/hbmk2.prg      | 34 ++++++++++++++++++------------
 harbour/utils/hbmk2/hbmk2.pt_BR.po | 12 +++++------
 6 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9231eb8129..b7ccadb6e6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-10 11:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    + Added gcc pkg to opensolaris pkg list.
+
+  * harbour.spec
+    ! Do not mark Red Hat and SUSE as discontinued. These names seem
+      to be used for "enterprise" versions of these distros, but correct
+      me if I'm wrong.
+
+  * utils/hbmk2/hbmk2.pt_BR.po
+  * utils/hbmk2/hbmk2.hu_HU.po
+  * utils/hbmk2/hbmk2.prg
+    + Made it clean on the help screen which options can only be used
+      from the command line.
+
 2010-01-10 02:16 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/hbide.prg
   * contrib/hbide/idedocks.prg
@@ -27,7 +42,7 @@
   * contrib/hbide/idethemes.prg
   * contrib/hbide/resources/projectproperties.ui
     ! Some fixes and code optimizations.
-      Please report if some feature is not working ok.    
+      Please report if some feature is not working ok.
 
 2010-01-09 15:39 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/hbide.ch
@@ -39,7 +54,7 @@
   + contrib/hbide/idesources.prg
   * contrib/hbide/projects/hbide.hbi
     ! Next round of reforms, may be second-last,
-      mainly concentrating on accessing the different 
+      mainly concentrating on accessing the different
       components with ease.
 
     ! Some formattig and code optimizations.
@@ -62,7 +77,7 @@
       Now it is synchronized with toolbar with same look and feel.
 
     + Implemented to re-position editor tabs with drag.
-      HOWTO: Place mouse pointer over a tab -> 
+      HOWTO: Place mouse pointer over a tab ->
              keep pressed left button ->
              move mouse pointer left or right ->
              ( tab will move with your action ) ->
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 78e245a288..bb2daac4f6 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -438,7 +438,7 @@ HARBOUR
    OpenSolaris
    -----------
 
-      - $ pkg install SUNWgmake SUNWsvn
+      - $ pkg install SUNWsvn SUNWgcc SUNWgmake
 
    FreeBSD
    -------
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 4406f0d974..c9db9ab0c2 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -22,12 +22,10 @@
 # DISCONTINUED
 %define platform %(release=$(rpm -q --queryformat='%{VERSION}' mandrake-release 2>/dev/null) && echo "mdk$release"|tr -d ".")
 %if "%{platform}" == ""
-# DISCONTINUED
 %define platform %(release=$(rpm -q --queryformat='%{VERSION}' redhat-release 2>/dev/null) && echo "rh$release"|tr -d ".")
 %if "%{platform}" == ""
 %define platform %(release=$(rpm -q --queryformat='%{VERSION}' fedora-release 2>/dev/null) && echo "fc$release"|tr -d ".")
 %if "%{platform}" == ""
-# DISCONTINUED
 %define platform %(release=$(rpm -q --queryformat='%{VERSION}' suse-release 2>/dev/null) && echo "sus$release"|tr -d ".")
 %if "%{platform}" == ""
 %define platform %(release=$(rpm -q --queryformat='%{VERSION}' openSUSE-release 2>/dev/null) && echo "sus$release"|tr -d ".")
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index 637e233957..750083004d 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -359,12 +359,12 @@ msgstr "  hbmk2 [kapcsol
 
 #: hbmk2.prg:7941
 #, c-format
-msgid "marks beginning of options belonging to a new build target (available on command line only)"
+msgid "marks beginning of options belonging to a new build target"
 msgstr ""
 
 #: hbmk2.prg:7941
 #, c-format
-msgid "marks beginning of common options belonging to all targets (available on command line only)"
+msgid "marks beginning of common options belonging to all targets"
 msgstr ""
 
 #: hbmk2.prg:7941
@@ -809,7 +809,7 @@ msgstr "haszn
 
 #: hbmk2.prg:7941
 #, c-format
-msgid "specify a new build target. <script> can be .prg (or no extension) or .hbm file (available on command line only)"
+msgid "specify a new build target. <script> can be .prg (or no extension) or .hbm file"
 msgstr ""
 
 #: hbmk2.prg:7850
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 2fdfd7485b..74f83fcc50 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -8105,9 +8105,11 @@ STATIC PROCEDURE ShowHelp( lLong )
       { "-[no]minipo"       , I_( "don't (or do) add Harbour version number and source file reference to .po (default: add them)" ) },;
       { "-rebuildpo"        , I_( "recreate .po file, thus removing all obsolete entries in it" ) },;
       NIL,;
-      { "-target=<script>"  , I_( "specify a new build target. <script> can be .prg (or no extension) or .hbm file (available on command line only)" ) },;
-      { "-target"           , I_( "marks beginning of options belonging to a new build target (available on command line only)" ) },;
-      { "-alltarget"        , I_( "marks beginning of common options belonging to all targets (available on command line only)" ) },;
+      { "Options below are available on command line only:" },;
+      NIL,;
+      { "-target=<script>"  , I_( "specify a new build target. <script> can be .prg (or no extension) or .hbm file" ) },;
+      { "-target"           , I_( "marks beginning of options belonging to a new build target" ) },;
+      { "-alltarget"        , I_( "marks beginning of common options belonging to all targets" ) },;
       NIL,;
       { "-hbrun"            , I_( "run target" ) },;
       { "-hbraw"            , I_( "stop after running Harbour compiler" ) },;
@@ -8180,18 +8182,22 @@ STATIC PROCEDURE OutOpt( aOpt )
    IF Empty( aOpt )
       OutStd( _OUT_EOL )
    ELSE
-      aOpt[ 2 ] := StrTran( aOpt[ 2 ], "\n", hb_osNewLine() )
-      nLines := MLCount( aOpt[ 2 ], MaxCol() - 21 )
-      FOR nLine := 1 TO nLines
-         IF ! Empty( tmp := RTrim( MemoLine( aOpt[ 2 ], MaxCol() - 21, nLine ) ) )
-            IF nLine == 1
-               OutStd( PadR( Space( 2 ) + aOpt[ 1 ], 21 ) )
-            ELSE
-               OutStd( Space( 21 ) )
+      IF Len( aOpt ) > 1
+         aOpt[ 2 ] := StrTran( aOpt[ 2 ], "\n", hb_osNewLine() )
+         nLines := MLCount( aOpt[ 2 ], MaxCol() - 21 )
+         FOR nLine := 1 TO nLines
+            IF ! Empty( tmp := RTrim( MemoLine( aOpt[ 2 ], MaxCol() - 21, nLine ) ) )
+               IF nLine == 1
+                  OutStd( PadR( Space( 2 ) + aOpt[ 1 ], 21 ) )
+               ELSE
+                  OutStd( Space( 21 ) )
+               ENDIF
+               OutStd( tmp + _OUT_EOL )
             ENDIF
-            OutStd( tmp + _OUT_EOL )
-         ENDIF
-      NEXT
+         NEXT
+      ELSE
+         OutStd( Space( 2 ) + aOpt[ 1 ] + _OUT_EOL )
+      ENDIF
    ENDIF
 
    RETURN
diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po
index 4ee8cf85e6..30a7169b47 100644
--- a/harbour/utils/hbmk2/hbmk2.pt_BR.po
+++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po
@@ -569,8 +569,8 @@ msgstr "Recompilar tudo (em modo de compila
 
 #: hbmk2.prg:7942
 #, c-format
-msgid "marks beginning of options belonging to a new build target (available on command line only)"
-msgstr "marca o início de opções pertencentes à um novo alvo (disponível apenas em linha de comando)"
+msgid "marks beginning of options belonging to a new build target"
+msgstr "marca o início de opções pertencentes à um novo alvo"
 
 #: hbmk2.prg:7854
 #, c-format
@@ -792,8 +792,8 @@ msgstr "nome-de-arquivo .hbl resultante. A macro %1$s 
 
 #: hbmk2.prg:7942
 #, c-format
-msgid "specify a new build target. <script> can be .prg (or no extension) or .hbm file (available on command line only)"
-msgstr "especifique um novo alvo para compilação. <script> pode ser módulo .prg (com ou sem extensão) ou .hbm (somente para linha de comando)"
+msgid "specify a new build target. <script> can be .prg (or no extension) or .hbm file"
+msgstr "especifique um novo alvo para compilação. <script> pode ser módulo .prg (com ou sem extensão) ou .hbm"
 
 #: hbmk2.prg:7960
 #, c-format
@@ -1081,8 +1081,8 @@ msgstr "Translation (%1$s): Vailton Renato <vailtom@gmail.com>"
 
 #: hbmk2.prg:7942
 #, c-format
-msgid "marks beginning of common options belonging to all targets (available on command line only)"
-msgstr "denota o início de opções comuns pertencentes à todos os alvos (disponível apenas em linha de comando)"
+msgid "marks beginning of common options belonging to all targets"
+msgstr "denota o início de opções comuns pertencentes à todos os alvos"
 
 #: hbmk2.prg:7851
 #, c-format