Attachment 178469 Details for Bug 215726 – diff against current ports

[patch] diff against current ports

x.diff (text/plain), 1.97 KB, created by Julian Elischer on 2017-01-03 10:58:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Elischer

Created: 2017-01-03 10:58:56 UTC

Size: 1.97 KB

patch

obsolete

>--- //depot/bugatti/FreeBSD-ports-PZ/head/Mk/bsd.port.mk	2017-01-03 10:27:20.000000000 -0800
>+++ /home/jelischer/p4/FreeBSD-ports-PZ/head/Mk/bsd.port.mk	2017-01-03 10:27:20.000000000 -0800
>@@ -749,6 +749,11 @@
> #				  The patches specified by this variable will be
> #				  applied after the normal distribution patches but
> #				  before those in ${PATCHDIR}.
>+# EXTRA_PATCH_TREE - where to find extra 'out-of-tree' patches
>+#				  Points to a directory hierarchy with the same layout
>+#				  as the ports tree, where local patches can be found.
>+#				  This allows a third party to keep their patches in
>+#				  some other source control system if needed.
> # PATCH_WRKSRC	- Directory to apply patches in.
> #				  Default: ${WRKSRC}
> #
>@@ -3145,6 +3150,36 @@
> 			done; \
> 		fi; \
> 	fi
>+.if defined(EXTRA_PATCH_TREE)
>+	@set -e ;\
>+	if [ -d ${EXTRA_PATCH_TREE}/${PKGORIGIN} ]; then \
>+		if [ "`${ECHO_CMD} ${EXTRA_PATCH_TREE}/${PKGORIGIN}/patch-*`" != "${EXTRA_PATCH_TREE}/${PKGORIGIN}/patch-*" ]; then \
>+			${ECHO_MSG} "===>  Applying local patches for ${PKGNAME}" ; \
>+			PATCHES_APPLIED="" ; \
>+			for i in ${EXTRA_PATCH_TREE}/${PKGORIGIN}/patch-*; do \
>+				case $$i in \
>+					*.orig|*.rej|*~|*,v) \
>+						${ECHO_MSG} "===>   Ignoring local patchfile $$i" ; \
>+						;; \
>+					*) \
>+						if [ ${PATCH_DEBUG_TMP} = yes ]; then \
>+							${ECHO_MSG} "===>   Applying local patch $$i" ; \
>+						fi; \
>+						if ${PATCH} ${PATCH_ARGS} < $$i ; then \
>+							PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \
>+						else \
>+							${ECHO_MSG} `${ECHO_CMD} "=> Local patch $$i failed to apply cleanly." | ${SED} "s|${EXTRA_PATCH_TREE}/${PKGORIGIN}/||"` ; \
>+							if [ x"$$PATCHES_APPLIED" != x"" -a ${PATCH_SILENT} != "yes" ]; then \
>+								${ECHO_MSG} `${ECHO_CMD} "=> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${EXTRA_PATCH_TREE}/${PKGORIGIN}/||g"` ; \
>+							fi; \
>+							${FALSE} ; \
>+						fi; \
>+						;; \
>+				esac; \
>+			done; \
>+		fi; \
>+	fi
>+.endif
> .endif
> 
> .if !target(run-autotools-fixup)

Actions: View | Diff

Attachments on bug 215726: 178469