How do I include two patches for the same file?

[Paul Schmehl]

I'm the maintainer for security/sancp.

Recently a new patch was released that patches the decode.cc file.  A 
previous, still valid, patch, *also* patches the decode.cc file.  If I 
include both patches, the make fails with an error about decode.cc

decode.cc: In function `void decode(cnx*, int, const u_char*)':
decode.cc:74: error: 'struct os_info' has no member named 'wscale'
*** Error code 1

Stop in /usr/ports/security/sancp/work/sancp-1.6.1.
*** Error code 1

Stop in /usr/ports/security/sancp.

How do I include both patches so that they are both applied?

Here's the relevant section of the Makefile:

Old Makefile:

PATCH_SITES=    http://sancp.sourceforge.net/
PATCHFILES=     sancp-1.6.1.fix200511.a.patch \
                           sancp-1.6.1.fix200511.b.patch
PATCH_DIST_STRIP=-p1

New Makefile:

PATCH_SITES=    http://sancp.sourceforge.net/
PATCHFILES=     sancp-1.6.1.fix200511.a.patch \
                           sancp-1.6.1.fix200511.b.patch \
                           sancp-1.6.1.fix200601.c.patch \
                           sancp-1.6.1.fix200606.d.patch
PATCH_DIST_STRIP=-p1

-- 
Paul Schmehl (pauls at utdallas.edu)
Adjunct Information Security Officer
The University of Texas at Dallas
http://www.utdallas.edu/ir/security/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 5007 bytes
Desc: S/MIME Cryptographic Signature
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20060628/6ce07c48/smime.bin