*: 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.

4 files changed, 8 insertions, 8 deletions

diff --git a/filesystems/fuse-afpfs-ng/Makefile b/filesystems/fuse-afpfs-ng/Makefile
index 2532ba65b4c..acdac225fb3 100644
--- a/filesystems/fuse-afpfs-ng/Makefile
+++ b/filesystems/fuse-afpfs-ng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/01/01 11:52:15 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	afpfs-ng-0.8.1
 PKGNAME=	fuse-${DISTNAME}
@@ -21,7 +21,7 @@ REPLACE_SH+=	fuse/afpfs
 .include "../../mk/readline.buildlink3.mk"
 
 SUBST_CLASSES+=		termcap
-SUBST_STAGE.termcap=	post-patch
+SUBST_STAGE.termcap=	pre-configure
 SUBST_FILES.termcap=	configure.ac configure cmdline/Makefile.*
 .if ${TERMCAP_TYPE} == none
 SUBST_SED.termcap+=	-e 's|ncurses||'
diff --git a/filesystems/fuse-gmailfs/Makefile b/filesystems/fuse-gmailfs/Makefile
index 72f83c9c796..ef30e33c42a 100644
--- a/filesystems/fuse-gmailfs/Makefile
+++ b/filesystems/fuse-gmailfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/07/03 05:03:16 adam Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	gmailfs-0.7.2
 PKGREVISION=	3
@@ -18,7 +18,7 @@ CONF_FILES=		${PREFIX}/share/examples/gmailfs/gmailfs.conf \
 			${PKG_SYSCONFDIR}/gmailfs.conf
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	gmailfs.py mount.gmailfs
 SUBST_SED.config=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_SED.config+=	-e "s|@PREFIX@|${PREFIX}|g"
diff --git a/filesystems/fuse-svnfs/Makefile b/filesystems/fuse-svnfs/Makefile
index 2ef3850294e..c40b87491f9 100644
--- a/filesystems/fuse-svnfs/Makefile
+++ b/filesystems/fuse-svnfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/04/14 07:34:20 adam Exp $
+# $NetBSD: Makefile,v 1.40 2018/07/04 13:40:18 jperkin Exp $
 #
 
 DISTNAME=	svnfs-0.4
@@ -22,7 +22,7 @@ REPLACE_PERL=	svn-config.pl
 SUBST_CLASSES+=		svn
 SUBST_FILES.svn=	svn-config.pl
 SUBST_MESSAGE.svn=	Fixing subversion pathnames in ${SUBST_FILES.svn}
-SUBST_STAGE.svn=	post-patch
+SUBST_STAGE.svn=	pre-configure
 SUBST_VARS.svn=		LOCALBASE
 
 BUILDLINK_ABI_DEPENDS.subversion-base+=	subversion-base>=1.4.3nb2
diff --git a/filesystems/fuse-wikipediafs/Makefile b/filesystems/fuse-wikipediafs/Makefile
index 6a4072d4236..509dcc4920f 100644
--- a/filesystems/fuse-wikipediafs/Makefile
+++ b/filesystems/fuse-wikipediafs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/07/03 05:03:16 adam Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	wikipediafs-0.4
 PKGNAME=	fuse-${DISTNAME}
@@ -14,7 +14,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-fuse-bindings
 EGG_NAME=	wikipediafs-0.0.0
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	setup.py
 SUBST_SED.config+=	-e "s|/usr/share/man/man1/|${PKGMANDIR}/man1/|g"
 SUBST_MESSAGE.config=   Fixing paths.