Tue Apr 21 21:26:13 2009 UTC ()
Use nbpatch, not gpatch, when the platform is missing it.
The former is known to have less issues like being able to deal with
asymmetric context and no line limits.


(joerg)
diff -r1.218 -r1.219 pkgsrc/mk/tools/replace.mk
cvs diff -r1.218 -r1.219 pkgsrc/mk/tools/replace.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/replace.mk 2009/02/05 18:44:43 1.218
+++ pkgsrc/mk/tools/replace.mk 2009/04/21 21:26:13 1.219
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: replace.mk,v 1.218 2009/02/05 18:44:43 joerg Exp $ 1# $NetBSD: replace.mk,v 1.219 2009/04/21 21:26:13 joerg Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -632,32 +632,32 @@ TOOLS_PATH.mtree= ${TOOLS_PREFIX.mtree} @@ -632,32 +632,32 @@ TOOLS_PATH.mtree= ${TOOLS_PREFIX.mtree}
632MAKEFLAGS+= TOOLS_IGNORE.openssl= 632MAKEFLAGS+= TOOLS_IGNORE.openssl=
633. elif !empty(_TOOLS_USE_PKGSRC.openssl:M[yY][eE][sS]) 633. elif !empty(_TOOLS_USE_PKGSRC.openssl:M[yY][eE][sS])
634TOOLS_DEPENDS.openssl?= openssl>=0.9.6:../../security/openssl 634TOOLS_DEPENDS.openssl?= openssl>=0.9.6:../../security/openssl
635TOOLS_CREATE+= openssl 635TOOLS_CREATE+= openssl
636TOOLS_FIND_PREFIX+= TOOLS_PREFIX.openssl=openssl 636TOOLS_FIND_PREFIX+= TOOLS_PREFIX.openssl=openssl
637TOOLS_PATH.openssl= ${TOOLS_PREFIX.openssl}/bin/openssl 637TOOLS_PATH.openssl= ${TOOLS_PREFIX.openssl}/bin/openssl
638. endif 638. endif
639.endif 639.endif
640 640
641.if !defined(TOOLS_IGNORE.patch) && !empty(_USE_TOOLS:Mpatch) 641.if !defined(TOOLS_IGNORE.patch) && !empty(_USE_TOOLS:Mpatch)
642. if !empty(PKGPATH:Mdevel/patch) 642. if !empty(PKGPATH:Mdevel/patch)
643MAKEFLAGS+= TOOLS_IGNORE.patch= 643MAKEFLAGS+= TOOLS_IGNORE.patch=
644. elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS]) 644. elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS])
645TOOLS_DEPENDS.patch?= patch>=2.2:../../devel/patch 645TOOLS_DEPENDS.patch?= nbpatch-[0-9]*:../../devel/nbpatch
646TOOLS_CREATE+= patch 646TOOLS_CREATE+= patch
647TOOLS_FIND_PREFIX+= TOOLS_PREFIX.patch=patch 647TOOLS_FIND_PREFIX+= TOOLS_PREFIX.patch=nbpatch
648TOOLS_PATH.patch= ${TOOLS_PREFIX.patch}/bin/gpatch 648TOOLS_PATH.patch= ${TOOLS_PREFIX.patch}/bin/nbpatch
649_PATCH_CAN_BACKUP= yes 649_PATCH_CAN_BACKUP= yes
650_PATCH_BACKUP_ARG?= -b -V simple -z 650_PATCH_BACKUP_ARG?= -V simple -z
651. endif 651. endif
652.endif 652.endif
653 653
654.if !defined(TOOLS_IGNORE.pax) && !empty(_USE_TOOLS:Mpax) 654.if !defined(TOOLS_IGNORE.pax) && !empty(_USE_TOOLS:Mpax)
655. if !empty(PKGPATH:Marchivers/pax) 655. if !empty(PKGPATH:Marchivers/pax)
656MAKEFLAGS+= TOOLS_IGNORE.pax= 656MAKEFLAGS+= TOOLS_IGNORE.pax=
657. elif !empty(_TOOLS_USE_PKGSRC.pax:M[yY][eE][sS]) 657. elif !empty(_TOOLS_USE_PKGSRC.pax:M[yY][eE][sS])
658TOOLS_DEPENDS.pax?= pax>=20040802:../../archivers/pax 658TOOLS_DEPENDS.pax?= pax>=20040802:../../archivers/pax
659TOOLS_CREATE+= pax 659TOOLS_CREATE+= pax
660TOOLS_FIND_PREFIX+= TOOLS_PREFIX.pax=pax 660TOOLS_FIND_PREFIX+= TOOLS_PREFIX.pax=pax
661TOOLS_PATH.pax= ${TOOLS_PREFIX.pax}/bin/pax 661TOOLS_PATH.pax= ${TOOLS_PREFIX.pax}/bin/pax
662. endif 662. endif
663.endif 663.endif