pkg/33783: cad/qcad patch failure on MacOS X 10.4.6

[jdbaker%mylinuxisp.com@localhost]

>Number:         33783
>Category:       pkg
>Synopsis:       cad/qcad patch failure on MacOS X 10.4.6
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jun 21 12:35:00 +0000 2006
>Originator:     John D. Baker
>Release:        MacOS X 10.4.6, pkgsrc-current
>Organization:
>Environment:
Darwin bwg3.technoskunk.fur 8.6.0 Darwin Kernel Version 8.6.0: Tue Mar  7 
16:58:48 PST 2006; root:xnu-792.6.70.obj~1/RELEASE_PPC Power Macintosh powerpc

>Description:
Following the update of cad/qcad to 2.0.x, the build fails in the
patch phase as follows:

[...]
===> Overriding tools for qcad-2.0.5.0
===> Extracting for qcad-2.0.5.0
===> Patching for qcad-2.0.5.0
=> Applying pkgsrc patches for qcad-2.0.5.0
1 out of 1 hunk FAILED -- saving rejects to file mkspecs/defs.pro.rej
Patch /usr/pkgsrc/cad/qcad/patches/patch-ac failed
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /usr/pkgsrc/cad/qcad/patches/patch-ac
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/cad/qcad

>How-To-Repeat:
On MacOS X 10.4.6 (and probably earlier versions), update pkgsrc to
-current and attempt to build cad/qcad.
>Fix:
It appears there are some problems with '/usr/bin/patch' supplied with
MacOS X that choke on the default format of some unified diff output
used with patches.  (See pkg/29026, pkg/29939).  The workaround there
was to generate the diffs with '-U 1' (only 1 line of context rather
than 3 lines).

If possible, could patch-ac be re-generated in this format?  If the
other patches apply OK in the default (-U 3) format, they need not
be changed.