From 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 4 Jul 2018 13:40:07 +0000 Subject: *: Move SUBST_STAGE from post-patch to pre-configure Performing substitutions during post-patch breaks tools such as mkpatches, making it very difficult to regenerate correct patches after making changes, and often leading to substituted string replacements being committed. --- mail/akonadi/options.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/akonadi') diff --git a/mail/akonadi/options.mk b/mail/akonadi/options.mk index d2f04cf60e9..20e3eea2d6a 100644 --- a/mail/akonadi/options.mk +++ b/mail/akonadi/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2013/09/19 05:07:11 obache Exp $ +# $NetBSD: options.mk,v 1.3 2018/07/04 13:40:22 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.akonadi @@ -27,7 +27,7 @@ CMAKE_ARGS+= -DAKONADI_BUILD_QSQLITE=off PKG_FAIL_RESASON+= "Unknown MySQL version: ${_MYSQL_VERSION}" . endif SUBST_CLASSES+= mysql -SUBST_STAGE.mysql= post-patch +SUBST_STAGE.mysql= pre-configure SUBST_MESSAGE.mysql= Fix mysqld path. SUBST_FILES.mysql= server/CMakeLists.txt SUBST_SED.mysql= -e "s:MYSQLD_EXECUTABLE mysqld:MYSQLD_EXECUTABLE mysqld ${PREFIX}/libexec:" -- cgit v1.2.3