diff options
| author | mat <mat@FreeBSD.org> | 2017-01-17 00:47:00 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2017-01-17 00:47:00 +0800 |
| commit | a910cc17afab15cfc4090a2681968937a99ddcfa (patch) | |
| tree | 3b8ea3a783597953a4328bd04ea5a6b9b48b5db6 /mail | |
| parent | 9bf7d5a787467dacc8f0c2c2fd1cc2be3fa69e06 (diff) | |
| download | freebsd-ports-gnome-a910cc17afab15cfc4090a2681968937a99ddcfa.tar.gz freebsd-ports-gnome-a910cc17afab15cfc4090a2681968937a99ddcfa.tar.zst freebsd-ports-gnome-a910cc17afab15cfc4090a2681968937a99ddcfa.zip | |
Extract do-patch into a separate script.
PR: 215761
Submitted by: mat
Exp-run by: antoine
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D9029
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mutt/Makefile | 16 | ||||
| -rw-r--r-- | mail/mutt14/Makefile | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 3a038ff6f137..d68f40ddf801 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -247,34 +247,34 @@ CFLAGS+= ${CFLAGS_ADD} LDFLAGS+= ${LDFLAGS_ADD} pre-patch-PARENT_CHILD_MATCH_PATCH-on: - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match + @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match pre-patch-COMPRESSED_FOLDERS-on: @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed @${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \ ${WRKDIR}/patch-compressed - @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed + @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed pre-patch-NNTP-on: @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp @${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \ ${WRKDIR}/patch-nntp - @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp + @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp post-patch-NNTP-on: .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp + @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp .endif .if ${PORT_OPTIONS:MFORCEBASE64} - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp + @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp .endif post-patch-NNTP-off: .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime + @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime .endif .if ${PORT_OPTIONS:MFORCEBASE64} - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64 + @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64 .endif post-install: @@ -284,7 +284,7 @@ post-install-NNTP-on: ${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR} post-patch-IFDEF_PATCH-on: - @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef + @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index ce45594ce281..72271c7f3fd0 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -153,7 +153,7 @@ post-patch: .if ${PORT_OPTIONS:MDOCS} post-build: @${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref + @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref @${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \ -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \ -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \ |