ports/73925: Installation of accessibility/gok fails due to patch error

[Malte von dem Hagen]

>Number:         73925
>Category:       ports
>Synopsis:       Installation of accessibility/gok fails due to patch error
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 14 06:50:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Malte von dem Hagen
>Release:        5-STABLE
>Organization:
>Environment:
FreeBSD sharra.docvalde.local 5.3-STABLE FreeBSD 5.3-STABLE #6: Sat Nov 13 03:07:37 CET 2004     docvalde at sharra.docvalde.local:/usr/obj/usr/src/sys/SHARRA  i386
>Description:
portupgrade'ing accessibility/gok to 0.11.16_1 fails.
I tried "make deinstall" and following "make reinstall" then:

<----------------- schnipp ----------------->
[root at sharra /usr/ports/accessibility/gok]# make reinstall
===>  Patching for gok-0.11.16_1
===>  Applying FreeBSD patches for gok-0.11.16_1
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to gok/gok-keyboard.c.rej
>How-To-Repeat:
Install gok. Trying on another machine (same state of OS, same Ports-tree) fires the same error:

<----------------- schnipp ----------------->                                       
===>  Extracting for gok-0.11.16_1
>Fix:
      
>Release-Note:
>Audit-Trail:
>Unformatted:
 >> Patch patch-gok_gok-keyboard.c failed to apply cleanly.
 *** Error code 1
 
 Stop in /usr/ports/accessibility/gok.
 *** Error code 1
 
 Stop in /usr/ports/accessibility/gok.
 <----------------- schnapp ----------------->
 
 gok/gok-keyboard.c.rej reads as following:
 
 <----------------- schnipp ----------------->
 ***************
 *** 2519,2526 ****
                         else if ((pKeyboard->search_type == GOK_SPY_SEARCH_ACTIONABLE) && !did_actionkeys)
                         {
                                 gint action_count, i;
                                 did_actionkeys = TRUE;
 -                               AccessibleAction *action =
                                         Accessible_getAction (pNodeAccessible->paccessible);
                                 if (!action)
                                         break;
 --- 2519,2527 ----
                         else if ((pKeyboard->search_type == GOK_SPY_SEARCH_ACTIONABLE) && !did_actionkeys)
                         {
                                 gint action_count, i;
 +                               AccessibleAction *action;
                                 did_actionkeys = TRUE;
 +                               action =
                                         Accessible_getAction (pNodeAccessible->paccessible);
                                 if (!action)
                                   break;
 <----------------- schnapp ----------------->                                        
 
 Ports-tree is in cvsup'ed to . as time of writing.
 >> Checksum OK for gnome2/gok-0.11.16.tar.bz2.
 ===>  Patching for gok-0.11.16_1
 ===>  Applying FreeBSD patches for gok-0.11.16_1
 2 out of 2 hunks failed--saving rejects to gok/main.c.rej
 >> Patch patch-gok_main.c failed to apply cleanly.
 >> Patch(es) patch-gok_gok-keyboard.c applied cleanly.
 *** Error code 1
 
 Stop in /usr/ports/accessibility/gok.
 ** Command failed [exit code 1]: /usr/bin/script -qa /tmp/portupgrade64158.0 make
 ** Fix the problem and try again.
 ** Listing the failed packages (*:skipped / !:failed)
         ! accessibility/gok (gok-0.11.14)       (patch error)
 --->  Packages processed: 0 done, 0 ignored, 0 skipped and 1 failed
 <----------------- schnapp ----------------->