This patch is pretty self explanatory.
it allows us to keep patches for various ports separately in a sparse
hierarchy while not having to write to the ports tree itself.
In case the list scrubs hte text attachment (diff) here's the
description part of the diff.
>==== //depot/bugatti/FreeBSD-ports-PZ/10.1/Mk/bsd.port.mk#2 (text) ====
@@ -791,6 +791,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}
#
If anyone thinks this is a good idea, I'd like it to go in as we have
to maintain it..
I could commit it myself but haven't had my ports wings awarded yet..
Change 47442 by jelischer@jre-porridge-1 on 2015/03/25 08:30:42
Add suport for local patches
Affected files ...
... //depot/bugatti/FreeBSD-ports-PZ/10.1/Mk/bsd.port.mk#2 edit
Differences ...
==== //depot/bugatti/FreeBSD-ports-PZ/10.1/Mk/bsd.port.mk#2 (text) ====
@@ -791,6 +791,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}
#
@@ -3397,6 +3402,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)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "[email protected]"
