View | Details | Raw Unified | Return to bug 215726
Collapse All | Expand All

(-)/home/jelischer/p4/FreeBSD-ports-PZ/head/Mk/bsd.port.mk (+35 lines)
Lines 749-754 Link Here
749
#				  The patches specified by this variable will be
749
#				  The patches specified by this variable will be
750
#				  applied after the normal distribution patches but
750
#				  applied after the normal distribution patches but
751
#				  before those in ${PATCHDIR}.
751
#				  before those in ${PATCHDIR}.
752
# EXTRA_PATCH_TREE - where to find extra 'out-of-tree' patches
753
#				  Points to a directory hierarchy with the same layout
754
#				  as the ports tree, where local patches can be found.
755
#				  This allows a third party to keep their patches in
756
#				  some other source control system if needed.
752
# PATCH_WRKSRC	- Directory to apply patches in.
757
# PATCH_WRKSRC	- Directory to apply patches in.
753
#				  Default: ${WRKSRC}
758
#				  Default: ${WRKSRC}
754
#
759
#
Lines 3145-3150 Link Here
3145
			done; \
3150
			done; \
3146
		fi; \
3151
		fi; \
3147
	fi
3152
	fi
3153
.if defined(EXTRA_PATCH_TREE)
3154
	@set -e ;\
3155
	if [ -d ${EXTRA_PATCH_TREE}/${PKGORIGIN} ]; then \
3156
		if [ "`${ECHO_CMD} ${EXTRA_PATCH_TREE}/${PKGORIGIN}/patch-*`" != "${EXTRA_PATCH_TREE}/${PKGORIGIN}/patch-*" ]; then \
3157
			${ECHO_MSG} "===>  Applying local patches for ${PKGNAME}" ; \
3158
			PATCHES_APPLIED="" ; \
3159
			for i in ${EXTRA_PATCH_TREE}/${PKGORIGIN}/patch-*; do \
3160
				case $$i in \
3161
					*.orig|*.rej|*~|*,v) \
3162
						${ECHO_MSG} "===>   Ignoring local patchfile $$i" ; \
3163
						;; \
3164
					*) \
3165
						if [ ${PATCH_DEBUG_TMP} = yes ]; then \
3166
							${ECHO_MSG} "===>   Applying local patch $$i" ; \
3167
						fi; \
3168
						if ${PATCH} ${PATCH_ARGS} < $$i ; then \
3169
							PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
3170
						else \
3171
							${ECHO_MSG} `${ECHO_CMD} "=> Local patch $$i failed to apply cleanly." | ${SED} "s|${EXTRA_PATCH_TREE}/${PKGORIGIN}/||"` ; \
3172
							if [ x"$$PATCHES_APPLIED" != x"" -a ${PATCH_SILENT} != "yes" ]; then \
3173
								${ECHO_MSG} `${ECHO_CMD} "=> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${EXTRA_PATCH_TREE}/${PKGORIGIN}/||g"` ; \
3174
							fi; \
3175
							${FALSE} ; \
3176
						fi; \
3177
						;; \
3178
				esac; \
3179
			done; \
3180
		fi; \
3181
	fi
3182
.endif
3148
.endif
3183
.endif
3149
3184
3150
.if !target(run-autotools-fixup)
3185
.if !target(run-autotools-fixup)

Return to bug 215726