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

9 files changed, 22 insertions, 22 deletions

diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index a6c071aeb33..1c48f9067bb 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/10/03 15:12:42 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:32 jperkin Exp $
 
 DISTNAME=	apsfilter-7.2.8
 PKGREVISION=	1
@@ -33,7 +33,7 @@ CONF_FILES=	${PREFIX}/share/apsfilter/template/apsfilterrc \
 		${PKG_SYSCONFDIR}/apsfilterrc
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	bin/apsfilter.in SETUP.in tools/prtmgmt
 SUBST_SED.prefix=	-e 's,/usr/local,${LOCALBASE},g'
 SUBST_SED.prefix+=	-e 's,/usr/X11R6,${X11BASE},g'
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 6c57bfa0d47..573d2cf1cbb 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/06/22 14:12:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:33 jperkin Exp $
 
 .include "../../print/cups/Makefile.common"
 PKGREVISION=1
@@ -115,20 +115,20 @@ OWN_DIRS_PERMS+=	${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/cups.pam
 SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 SUBST_CLASSES+=		rpathfix
 SUBST_FILES.rpathfix=	cups-config.in
 SUBST_MESSAGE.rpathfix=	Adding rpath to cups-config.
 SUBST_SED.rpathfix=	-e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
-SUBST_STAGE.rpathfix=	post-patch
+SUBST_STAGE.rpathfix=	pre-configure
 
 .if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
 SUBST_CLASSES+=		piefix
 SUBST_FILES.piefix=	Makedefs.in
 SUBST_MESSAGE.piefix=	Removing PIE flags
 SUBST_SED.piefix=	-e 's|@PIEFLAGS@||g'
-SUBST_STAGE.piefix=	post-patch
+SUBST_STAGE.piefix=	pre-configure
 .endif
 
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} ${MIMEDIR}
diff --git a/print/cups15/Makefile b/print/cups15/Makefile
index 1cf76841ff3..d5673adeab4 100644
--- a/print/cups15/Makefile
+++ b/print/cups15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/08/20 23:55:54 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:33 jperkin Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -143,20 +143,20 @@ OWN_DIRS_PERMS+=	${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/cups.pam
 SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 SUBST_CLASSES+=		rpathfix
 SUBST_FILES.rpathfix=	cups-config.in
 SUBST_MESSAGE.rpathfix=	Adding rpath to cups-config.
 SUBST_SED.rpathfix=	-e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
-SUBST_STAGE.rpathfix=	post-patch
+SUBST_STAGE.rpathfix=	pre-configure
 
 .if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
 SUBST_CLASSES+=		piefix
 SUBST_FILES.piefix=	Makedefs.in
 SUBST_MESSAGE.piefix=	Removing PIE flags
 SUBST_SED.piefix=	-e 's|@PIEFLAGS@||g'
-SUBST_STAGE.piefix=	post-patch
+SUBST_STAGE.piefix=	pre-configure
 .endif
 
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} ${MIMEDIR}
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index bb8b664ede7..f1353557faa 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/28 16:42:03 rumko Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/04 13:40:33 jperkin Exp $
 #
 
 DISTNAME=	foo2zjs
@@ -25,7 +25,7 @@ SUBST_FILES.paths=	Makefile icc2ps/Makefile
 SUBST_SED.paths=	-e "s,@PREFIX@,${DESTDIR}${PREFIX},"
 SUBST_SED.paths+=	-e "s,@PKGMANDIR@,${DESTDIR}${PREFIX}/${PKGMANDIR},"
 SUBST_SED.paths+=	-e "s,@RUNPREFIX@,${PREFIX},"
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 do-build:
 	cd ${WRKSRC} && ${GMAKE} ${PROGS}
diff --git a/print/indexinfo/Makefile b/print/indexinfo/Makefile
index 268403bce6a..f8f187b8e79 100644
--- a/print/indexinfo/Makefile
+++ b/print/indexinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/12/05 19:54:15 marino Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:33 jperkin Exp $
 
 PKGNAME=	indexinfo-0.2.6
 CATEGORIES=	print
@@ -17,7 +17,7 @@ pre-install:
 
 .if ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly"
 SUBST_CLASSES+=		reallocf
-SUBST_STAGE.reallocf=	post-patch
+SUBST_STAGE.reallocf=	pre-configure
 SUBST_FILES.reallocf=	indexinfo.c
 SUBST_SED.reallocf=	-e "s|reallocf|realloc|"
 SUBST_MESSAGE.reallocf=	Replace reallocf with realloc on ${OPSYS}
diff --git a/print/pdfmod/Makefile b/print/pdfmod/Makefile
index afba593f185..1e7ff3047eb 100644
--- a/print/pdfmod/Makefile
+++ b/print/pdfmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/04/16 14:35:06 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	pdfmod-0.9.1
 PKGREVISION=	20
@@ -20,7 +20,7 @@ REPLACE_SH=		icon-theme-installer
 INSTALLATION_DIRS+=	lib/pdfmod
 
 SUBST_CLASSES+=		fix-mcs
-SUBST_STAGE.fix-mcs=	post-patch
+SUBST_STAGE.fix-mcs=	pre-configure
 SUBST_MESSAGE.fix-mcs=	Fix compiler name
 SUBST_FILES.fix-mcs=	configure
 SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 94ff73e6148..a4b38343b99 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2018/04/17 22:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	pycups-1.9.73
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -19,7 +19,7 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fix cups paths.
 SUBST_FILES.paths=	cupsconnection.c
 SUBST_SED.paths=	-e 's:"/usr/share/cups":"${BUILDLINK_PREFIX.cups-base}/share/cups/", "/usr/share/cups":'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 .include "../../lang/python/distutils.mk"
 .include "../../print/cups-base/buildlink3.mk"
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index c411fceaea0..02608b68c67 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/04/21 13:38:06 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	xpdf-korean-2011-sep-02
 PKGNAME=	xpdf-korean-20110902
@@ -22,7 +22,7 @@ INSTALLATION_DIRS+=	share/xpdf/korean/CMap
 
 SUBST_CLASSES+=		xpdfrc
 SUBST_MESSAGE.xpdfrc=	Adjusting xpdfrc wedge.
-SUBST_STAGE.xpdfrc=	post-patch
+SUBST_STAGE.xpdfrc=	pre-configure
 SUBST_FILES.xpdfrc=	add-to-xpdfrc
 SUBST_SED.xpdfrc+=	-e 's,/usr/\.\.\.\.,'${PREFIX}'/share/fonts/X11/TTF,' \
 			-e 's:/usr/local:'${PREFIX}':g' \
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index a01ba745c19..8a80b3f282c 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2018/04/21 13:38:06 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	xpdf-3.04
 CATEGORIES=	print
@@ -40,7 +40,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths+=	doc/sample-xpdfrc doc/xpdf.1 doc/xpdfrc.5
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 OWN_DIRS=		share/xpdf