>Number:         20588
>Category:       pkg
>Synopsis:       PATCH_ARGS  and PATCH_DIST_ARGS should not set the same backup file extension
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Mar 05 09:31:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Nicolas Fugier
>Release:        NETBSD_1_6_1
>Organization:
>Environment:
SunOS sky 5.9 Generic_112233-05 sun4u sparc SUNW,Sun-Blade-1000
>Description:
In official mk/bsd.pkg.mk file, PATCH_ARGS and PATCH_DIST_ARGS are setting the backup file extension to the same string, ie .orig.

The problem is the following:
 - when a package contains dist patches and NetBSD patches
 - and we need to generate a new patch against a file already dist-patched,

mkpatches is not able to know the dist-patched version of the files and thus the generated patch is not usable (it includes dist-patch patch). 
>How-To-Repeat:
Try to patch a package which has dist patches and NetBSD patches. We need to try to patch an already patched file.


>Fix:
Really simple solution:

Set 
PATCH_DIST_ARGS+=	${_PATCH_BACKUP_ARG} .orig_dist
instead of
PATCH_DIST_ARGS+=	${_PATCH_BACKUP_ARG} .orig
>Release-Note:
>Audit-Trail:
>Unformatted: