View | Details | Raw Unified | Return to bug 193435 | Differences between
and this patch

Collapse All | Expand All

(-)bsd.port.mk (-13 / +25 lines)
Lines 795-801 FreeBSD_MAINTAINER= portmgr@FreeBSD.org Link Here
795
#				  ${WRKDIR}, then point EXTRA_PATCHES to them.
795
#				  ${WRKDIR}, then point EXTRA_PATCHES to them.
796
#				  The patches specified by this variable will be
796
#				  The patches specified by this variable will be
797
#				  applied after the normal distribution patches but
797
#				  applied after the normal distribution patches but
798
#				  before those in ${PATCHDIR}.
798
#				  before those in ${PATCHDIR}.  Items in this list can
799
#				  be individual patch files or directories.  In the case
800
#				  of a directory, all patch-* files in it are applied.
799
# PATCH_WRKSRC	- Directory to apply patches in.
801
# PATCH_WRKSRC	- Directory to apply patches in.
800
#				  Default: ${WRKSRC}
802
#				  Default: ${WRKSRC}
801
#
803
#
Lines 3384-3401 do-patch: Link Here
3384
.endif
3386
.endif
3385
.if defined(EXTRA_PATCHES)
3387
.if defined(EXTRA_PATCHES)
3386
	@set -e ; \
3388
	@set -e ; \
3387
	for i in ${EXTRA_PATCHES}; do \
3389
	for j in ${EXTRA_PATCHES}; do \
3388
		case $$i in \
3390
		if [ -d $$j ] ; then \
3389
		*:-p[0-9]) patch_file=$${i%:*} ; patch_strip=$${i##*:} ;; \
3391
			if [ "`${ECHO_CMD} $$j/patch-*`" == "$$j/patch-*" ]; then \
3390
		*) patch_file=$$i ;; \
3392
				continue ; \
3391
		esac ; \
3393
			fi ; \
3392
		${ECHO_MSG} "===>  Applying extra patch $$patch_file" ; \
3394
			patch_list=$$j/patch-* ; \
3393
		case $$patch_file in \
3395
		else  \
3394
		*.Z|*.gz) ${GZCAT} $$patch_file ;; \
3396
			patch_list=$$j ; \
3395
		*.bz2) ${BZCAT} $$patch_file ;; \
3397
		fi ; \
3396
		*.xz) ${XZCAT} $$patch_file ;; \
3398
		for i in $$patch_list; do \
3397
		*) ${CAT} $$patch_file ;; \
3399
			case $$i in \
3398
		esac | ${PATCH} ${PATCH_ARGS} $$patch_strip ; \
3400
			*:-p[0-9]) patch_file=$${i%:*} ; patch_strip=$${i##*:} ;; \
3401
			*) patch_file=$$i ;; \
3402
			esac ; \
3403
			${ECHO_MSG} "===>  Applying extra patch $$patch_file" ; \
3404
			case $$patch_file in \
3405
			*.Z|*.gz) ${GZCAT} $$patch_file ;; \
3406
			*.bz2) ${BZCAT} $$patch_file ;; \
3407
			*.xz) ${XZCAT} $$patch_file ;; \
3408
			*) ${CAT} $$patch_file ;; \
3409
			esac | ${PATCH} ${PATCH_ARGS} $$patch_strip ; \
3410
		done \
3399
	done
3411
	done
3400
.endif
3412
.endif
3401
	@set -e ;\
3413
	@set -e ;\

Return to bug 193435