From 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
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.
---
 security/base/Makefile                 | 4 ++--
 security/chkrootkit/Makefile           | 4 ++--
 security/dropbear/Makefile             | 4 ++--
 security/duo-unix/Makefile             | 4 ++--
 security/easy-rsa/Makefile             | 4 ++--
 security/gpgme/Makefile                | 4 ++--
 security/ike-scan/Makefile             | 4 ++--
 security/libprelude/Makefile.common    | 4 ++--
 security/nikto/Makefile                | 8 ++++----
 security/opendnssec/Makefile           | 4 ++--
 security/openvas-server/Makefile       | 4 ++--
 security/p5-Crypt-GPG/Makefile         | 4 ++--
 security/p5-pcsc/Makefile              | 4 ++--
 security/pam-tacplus/Makefile          | 4 ++--
 security/password-store/Makefile       | 4 ++--
 security/pcsc-tools/Makefile           | 4 ++--
 security/pks/Makefile                  | 4 ++--
 security/prelude-lml/Makefile          | 6 +++---
 security/prelude-manager/Makefile      | 4 ++--
 security/prelude-pflogger/Makefile     | 6 +++---
 security/py-prewikka/Makefile          | 4 ++--
 security/py-requests-kerberos/Makefile | 4 ++--
 security/qca2-gnupg/Makefile           | 4 ++--
 security/qca2-ossl/Makefile            | 4 ++--
 security/qca2-qt5-gnupg/Makefile       | 4 ++--
 security/qca2-qt5-ossl/Makefile        | 4 ++--
 security/qca2/Makefile.common          | 4 ++--
 security/skey/hacks.mk                 | 6 +++---
 security/snortsnarf/Makefile           | 4 ++--
 security/softhsm/Makefile              | 4 ++--
 security/uvscan/Makefile               | 4 ++--
 31 files changed, 67 insertions(+), 67 deletions(-)

(limited to 'security')

diff --git a/security/base/Makefile b/security/base/Makefile
index c4b5e38b2d0..2a07a5e395f 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/02/21 12:25:23 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	base-1.4.3.1
 PKGREVISION=	12
@@ -58,7 +58,7 @@ CONF_FILES_PERMS=	${EGDIR}/base_conf.php ${BASE_DIR}/base_conf.php \
 BUILD_DEFS+=		APACHE_USER APACHE_GROUP
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	base.conf base_conf.php.dist
 SUBST_SED.conf=		-e "s|@BASE_DIR@|${BASE_DIR}|g"
 SUBST_SED.conf+=	-e "s|@DBTYPE@|${DBTYPE}|g"
diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index b8a7eed4ffb..8c15296a4f1 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/04/29 15:55:47 christos Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:33 jperkin Exp $
 #
 
 DISTNAME=		chkrootkit-0.50
@@ -19,7 +19,7 @@ PROGRAMS=	chkdirs chklastlog chkproc chkwtmp ifpromisc strings-static \
 DOCDIR=		${PREFIX}/share/doc/chkrootkit
 
 SUBST_CLASSES+=		helper
-SUBST_STAGE.helper=	post-patch
+SUBST_STAGE.helper=	pre-configure
 SUBST_FILES.helper=	chkrootkit
 SUBST_SED.helper=	-e "s|./chklastlog|${PREFIX}/bin/chklastlog|g"
 SUBST_SED.helper+=	-e "s|./chkproc|${PREFIX}/bin/chkproc|g"
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 078c4989acc..7f93ad49257 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/11/09 19:00:25 snj Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	dropbear-2017.75
 CATEGORIES=	security
@@ -25,7 +25,7 @@ PKG_SUPPORTED_OPTIONS=	pam
 CONFIGURE_ARGS+=	--enable-pam
 SUBST_CLASSES+=		pam
 SUBST_MESSAGE.pam=	Enabling PAM in options.h
-SUBST_STAGE.pam=	post-patch
+SUBST_STAGE.pam=	pre-configure
 SUBST_FILES.pam=	options.h
 SUBST_SED.pam=		-e "s/ENABLE_SVR_PASSWORD_AUTH/ENABLE_SVR_PAM_AUTH/"
 .endif
diff --git a/security/duo-unix/Makefile b/security/duo-unix/Makefile
index 1870b4c9576..cf6d6ab20a5 100644
--- a/security/duo-unix/Makefile
+++ b/security/duo-unix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/02/16 07:20:56 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=	duo_unix-1.10.1
@@ -32,7 +32,7 @@ CONF_FILES_PERMS+=	share/examples/duo-unix/login_duo.conf	\
 SPECIAL_PERMS+=		sbin/login_duo ${SETUID_ROOT_PERMS}
 
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_MESSAGE.man=	Fixing sysconfdir references
 SUBST_FILES.man=	login_duo/login_duo.8 pam_duo/pam_duo.8
 SUBST_SED.man=		-e 's,/etc/duo,${PKG_SYSCONFDIR},g'
diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile
index c1347b0a3e3..7e451554c28 100644
--- a/security/easy-rsa/Makefile
+++ b/security/easy-rsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/06/24 07:31:09 adam Exp $
+# $NetBSD: Makefile,v 1.7 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	EasyRSA-3.0.4
 PKGNAME=	${DISTNAME:S/EasyRSA/easy-rsa/}
@@ -29,7 +29,7 @@ REQD_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 SUBST_CLASSES+=		sysconf
-SUBST_STAGE.sysconf=	post-patch
+SUBST_STAGE.sysconf=	pre-configure
 SUBST_FILES.sysconf=	easyrsa vars.example
 SUBST_SED.sysconf=	-e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|"
 
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index ecf546436a9..0c6d64aee48 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2018/07/04 12:46:29 adam Exp $
+# $NetBSD: Makefile,v 1.89 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	gpgme-1.11.1
 CATEGORIES=	security
@@ -21,7 +21,7 @@ SUBST_CLASSES+=		pthread
 SUBST_FILES.pthread=	src/gpgme-config.in
 SUBST_SED.pthread+=	-e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
 SUBST_SED.pthread+=	-e 's,@PTHREAD_CFLAGS@,${PTHREAD_CFLAGS},g'
-SUBST_STAGE.pthread=	post-patch
+SUBST_STAGE.pthread=	pre-configure
 
 CPPFLAGS.Darwin=	-D_POSIX_C_SOURCE=200809L
 LIBS.SunOS+=		-lnsl -lsocket
diff --git a/security/ike-scan/Makefile b/security/ike-scan/Makefile
index 4cab24da3aa..0086c522853 100644
--- a/security/ike-scan/Makefile
+++ b/security/ike-scan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/08/16 20:45:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	ike-scan-1.9
 PKGREVISION=	5
@@ -13,7 +13,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	ike-scan.1
 SUBST_SED.man=		-e "s|/usr/local|${PREFIX}|g"
 SUBST_MESSAGE.man=	Fixing man pages.
diff --git a/security/libprelude/Makefile.common b/security/libprelude/Makefile.common
index f0d05d81cf2..1a7588e21ab 100644
--- a/security/libprelude/Makefile.common
+++ b/security/libprelude/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2017/09/12 06:14:08 dholland Exp $
+# $NetBSD: Makefile.common,v 1.13 2018/07/04 13:40:34 jperkin Exp $
 #
 # used by security/libprelude/Makefile
 # used by security/libprelude-lua/Makefile
@@ -50,7 +50,7 @@ MAKE_DIRS=		${PKG_SYSCONFDIR}/default ${PKG_SYSCONFDIR}/profile
 MAKE_DIRS_PERMS+=	${PKG_SYSCONFDIR}/profile ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0711
 
 SUBST_CLASSES+=		make
-SUBST_STAGE.make=	post-patch
+SUBST_STAGE.make=	pre-configure
 SUBST_FILES.make=	Makefile.in
 SUBST_SED.make=		-e 's,@EGDIR@,${EGDIR},g'
 
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index dd60ee23872..32ad89c7f99 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2017/09/03 08:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	nikto-2.1.5
 PKGREVISION=	2
@@ -17,20 +17,20 @@ NO_BUILD=	yes
 AUTO_MKDIRS=	yes
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	nikto.pl docs/nikto.1
 SUBST_SED.conf=		-e "s|/etc/nikto\.conf|${PKG_SYSCONFDIR}/nikto.conf|g"
 SUBST_SED.conf+=	-e "s|/etc/nikto\\\&\.conf|${PKG_SYSCONFDIR}/nikto\\\\\\&.conf|g"
 SUBST_MESSAGE.conf=	Fixing path to nikto.conf
 
 SUBST_CLASSES+=		execdir
-SUBST_STAGE.execdir=	post-patch
+SUBST_STAGE.execdir=	pre-configure
 SUBST_FILES.execdir=	nikto.conf
 SUBST_SED.execdir=	-e "s|^\# EXECDIR=/opt/nikto|EXECDIR=${PREFIX}/libdata/nikto|g"
 SUBST_MESSAGE.execdir=	Fixing path to EXECDIR
 
 SUBST_CLASSES+=		manual
-SUBST_STAGE.manual=	post-patch
+SUBST_STAGE.manual=	pre-configure
 SUBST_FILES.manual=	docs/nikto.1
 SUBST_SED.manual=	-e "s|/usr/local/bin/nikto|nikto|g"
 SUBST_MESSAGE.manual=	Fixing path to nikto
diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile
index b38cec2e2bb..e8c5e04ddc8 100644
--- a/security/opendnssec/Makefile
+++ b/security/opendnssec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2018/04/14 07:34:39 adam Exp $
+# $NetBSD: Makefile,v 1.71 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=	opendnssec-1.4.13
@@ -50,7 +50,7 @@ PKG_SYSCONFSUBDIR=	opendnssec
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKSRC}/conf/Makefile.in
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_SED.paths=	-e 's,@EGDIR@,${EGDIR},'
 
 CXXFLAGS.NetBSD+=	-D_NETBSD_SOURCE
diff --git a/security/openvas-server/Makefile b/security/openvas-server/Makefile
index 1b6551365ab..22d46fe1283 100644
--- a/security/openvas-server/Makefile
+++ b/security/openvas-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/04/17 22:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=	openvas-server-2.0.0
@@ -18,7 +18,7 @@ USE_TOOLS+=	pkg-config gettext:run
 RCD_SCRIPTS=	openvasd
 
 SUBST_CLASSES+=		user
-SUBST_STAGE.user=	post-patch
+SUBST_STAGE.user=	pre-configure
 SUBST_FILES.user=	openvas-adduser.in openvas-mkcert-client.in
 SUBST_FILES.user+=	openvas-mkcert.in openvas-rmuser.in
 SUBST_SED.user=		-e "s|/usr/bin/gettext|${BUILDLINK_PREFIX.gettext}/bin/gettext|g"
diff --git a/security/p5-Crypt-GPG/Makefile b/security/p5-Crypt-GPG/Makefile
index 8fc544acc02..f788934c6c3 100644
--- a/security/p5-Crypt-GPG/Makefile
+++ b/security/p5-Crypt-GPG/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/06/05 14:24:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=		Crypt-GPG-1.64
@@ -21,7 +21,7 @@ DEPENDS+=		p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 SUBST_CLASSES+=		local
 SUBST_FILES.local=	GPG.pm
 SUBST_SED.local=	-e s,/usr/local,${PREFIX},
-SUBST_STAGE.local=	post-patch
+SUBST_STAGE.local=	pre-configure
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Crypt/GPG/.packlist
diff --git a/security/p5-pcsc/Makefile b/security/p5-pcsc/Makefile
index 644c8a6db6b..bd68bd2c618 100644
--- a/security/p5-pcsc/Makefile
+++ b/security/p5-pcsc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/06/05 14:24:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	pcsc-perl-1.4.14
 PKGNAME=	p5-${DISTNAME:S/-perl//}
@@ -15,7 +15,7 @@ PERL5_MODULE_TYPE=	MakeMaker
 LICENSE=		gnu-gpl-v2
 
 SUBST_CLASSES+=		perl
-SUBST_STAGE.perl=	post-patch
+SUBST_STAGE.perl=	pre-configure
 SUBST_FILES.perl=	Card/t/test.t examples/test_iso_error.pl examples/gsm_directory.pl t/test.t test/multiple_readers.pl test/single_reader.pl
 SUBST_SED.perl=		-e 's,/usr/bin/perl,${PERL5},'
 
diff --git a/security/pam-tacplus/Makefile b/security/pam-tacplus/Makefile
index 63e493b10cb..7f64aa9ee2b 100644
--- a/security/pam-tacplus/Makefile
+++ b/security/pam-tacplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 18:16:49 asau Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=	pam_tacplus-1.3.6
@@ -17,7 +17,7 @@ EGDIR=		${PREFIX}/share/examples/pam_tacplus
 GNU_CONFIGURE=yes
 
 SUBST_CLASSES+=		egdir
-SUBST_STAGE.egdir=	post-patch
+SUBST_STAGE.egdir=	pre-configure
 SUBST_FILES.egdir=	Makefile.in
 SUBST_SED.egdir=	-e "s,@EGDIR@,${EGDIR},"
 
diff --git a/security/password-store/Makefile b/security/password-store/Makefile
index d719c22383e..b31d9621716 100644
--- a/security/password-store/Makefile
+++ b/security/password-store/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/06/14 16:08:39 leot Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	password-store-1.7.2
 CATEGORIES=	security
@@ -26,7 +26,7 @@ REPLACE_BASH+=	src/password-store.sh
 REPLACE_BASH+=	tests/*.sh
 
 SUBST_CLASSES+=		fixsh
-SUBST_STAGE.fixsh=	post-patch
+SUBST_STAGE.fixsh=	pre-configure
 SUBST_MESSAGE.fixsh=	Fixing shell script
 SUBST_FILES.fixsh=	src/password-store.sh
 SUBST_SED.fixsh+=	-e 's,GETOPT="getopt",GETOPT="${PREFIX}/bin/getopt",'
diff --git a/security/pcsc-tools/Makefile b/security/pcsc-tools/Makefile
index 77b038c3feb..037d43265d0 100644
--- a/security/pcsc-tools/Makefile
+++ b/security/pcsc-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/02/16 14:47:56 gdt Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:35 jperkin Exp $
 
 DISTNAME=	pcsc-tools-1.4.27
 CATEGORIES=	security
@@ -19,7 +19,7 @@ DESTDIR_VARNAME=	# empty
 INSTALL_ENV+=		DESTDIR=${DESTDIR}${PREFIX:Q}
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	ATR_analysis ./ATR_analysis.1p
 SUBST_SED.prefix=	-e 's,/usr/local/pcsc,${PREFIX}/share/pcsc,'
 
diff --git a/security/pks/Makefile b/security/pks/Makefile
index fcd3db2c93d..fbb4130e5c3 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/09/03 08:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:35 jperkin Exp $
 
 DISTNAME=	pks-0.9.4
 PKGREVISION=	5
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${EGDIR:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	pks-commands.html
 SUBST_SED.paths=	-e "s|localhost|${PKS_SERVER}|g"
 
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 36eec6a80a5..8f95dbcde92 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2018/04/17 22:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2018/07/04 13:40:35 jperkin Exp $
 #
 
 DISTNAME=		prelude-lml-0.9.15
@@ -49,13 +49,13 @@ FILES_SUBST+=	PRELUDE_USER=${PRELUDE_USER:Q}
 FILES_SUBST+=	PRELUDE_GROUP=${PRELUDE_GROUP:Q}
 
 SUBST_CLASSES+=		code
-SUBST_STAGE.code=	post-patch
+SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-lml.c
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
 
 SUBST_CLASSES+=		make
-SUBST_STAGE.make=	post-patch
+SUBST_STAGE.make=	pre-configure
 SUBST_FILES.make=	Makefile.in
 SUBST_SED.make=		-e 's,@EGDIR@,${EGDIR},g'
 
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 86ce78d8c51..52bbed97b99 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2018/04/17 22:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2018/07/04 13:40:35 jperkin Exp $
 #
 
 DISTNAME=		prelude-manager-0.9.15
@@ -48,7 +48,7 @@ FILES_SUBST+=		PRELUDE_USER=${PRELUDE_USER:Q}
 FILES_SUBST+=		PRELUDE_GROUP=${PRELUDE_USER:Q}
 
 SUBST_CLASSES+=		code
-SUBST_STAGE.code=	post-patch
+SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-manager.c
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
diff --git a/security/prelude-pflogger/Makefile b/security/prelude-pflogger/Makefile
index ee7d2f1085b..936d22565b4 100644
--- a/security/prelude-pflogger/Makefile
+++ b/security/prelude-pflogger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/04/17 22:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:35 jperkin Exp $
 #
 
 DISTNAME=	prelude-pflogger-0.9.0-rc2
@@ -43,13 +43,13 @@ MESSAGE_SUBST+=	PRELUDE_USER=${PRELUDE_USER:Q}
 MESSAGE_SUBST+=	PRELUDE_GROUP=${PRELUDE_GROUP:Q}
 
 SUBST_CLASSES+=		code
-SUBST_STAGE.code=	post-patch
+SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-pflogger.c
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
 
 SUBST_CLASSES+=         make
-SUBST_STAGE.make=       post-patch
+SUBST_STAGE.make=       pre-configure
 SUBST_FILES.make=       Makefile.am
 SUBST_SED.make=         -e 's,@EGDIR@,${EGDIR},g'
 
diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile
index 0a00b3e7605..9bf6f567e7b 100644
--- a/security/py-prewikka/Makefile
+++ b/security/py-prewikka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2018/07/03 05:03:32 adam Exp $
+# $NetBSD: Makefile,v 1.48 2018/07/04 13:40:35 jperkin Exp $
 
 DISTNAME=		prewikka-${VERSION}
 PKGNAME=		${PYPKGPREFIX}-prewikka-${VERSION}
@@ -42,7 +42,7 @@ PKG_GROUPS_VARS+=	PREWIKKA_GROUP
 PKG_USERS_VARS+=	PREWIKKA_USER
 
 SUBST_CLASSES+=		code
-SUBST_STAGE.code=	post-patch
+SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	runPrewikka.c
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PREWIKKA_USER@,${PREWIKKA_USER},g'
diff --git a/security/py-requests-kerberos/Makefile b/security/py-requests-kerberos/Makefile
index 66a6f737a93..b8cd1b9b316 100644
--- a/security/py-requests-kerberos/Makefile
+++ b/security/py-requests-kerberos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/05/02 10:59:49 markd Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:35 jperkin Exp $
 
 DISTNAME=	requests-kerberos-0.12.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-requests>=1.1.0:../../devel/py-requests
 USE_LANGUAGES=	# none
 
 SUBST_CLASSES+=		requires
-SUBST_STAGE.requires=	post-patch
+SUBST_STAGE.requires=	pre-configure
 SUBST_FILES.requires=	setup.py
 SUBST_SED.requires=	-e 's/pykerberos/kerberos/'
 
diff --git a/security/qca2-gnupg/Makefile b/security/qca2-gnupg/Makefile
index bb3ac616a87..14a85a608a6 100644
--- a/security/qca2-gnupg/Makefile
+++ b/security/qca2-gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2018/03/12 11:17:30 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:35 jperkin Exp $
 
 PKGNAME=	qca2-gnupg-${DISTNAME:C/.*-//}
 PKGREVISION=	1
@@ -17,7 +17,7 @@ CMAKE_ARGS+=	-DBUILD_TOOLS=OFF
 CMAKE_ARGS+=	-DINST_QCA_LIB_NAME=-lqca
 
 SUBST_CLASSES+=		libname
-SUBST_STAGE.libname=	post-patch
+SUBST_STAGE.libname=	pre-configure
 SUBST_MESSAGE.libname=	Use installed lib.
 SUBST_FILES.libname=	plugins/qca-gnupg/CMakeLists.txt
 SUBST_SED.libname=	-e 's:{QCA_LIB_NAME}:{INST_QCA_LIB_NAME}:'
diff --git a/security/qca2-ossl/Makefile b/security/qca2-ossl/Makefile
index 9bdfa48a39f..b6ffe9e83fb 100644
--- a/security/qca2-ossl/Makefile
+++ b/security/qca2-ossl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/03/12 11:17:30 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2018/07/04 13:40:35 jperkin Exp $
 
 PKGNAME=	qca2-ossl-${DISTNAME:C/.*-//}
 PKGREVISION=	1
@@ -15,7 +15,7 @@ CMAKE_ARGS+=	-DBUILD_TOOLS=OFF
 CMAKE_ARGS+=	-DINST_QCA_LIB_NAME=-lqca
 
 SUBST_CLASSES+=		libname
-SUBST_STAGE.libname=	post-patch
+SUBST_STAGE.libname=	pre-configure
 SUBST_MESSAGE.libname=	Use installed lib.
 SUBST_FILES.libname=	plugins/qca-ossl/CMakeLists.txt
 SUBST_SED.libname=	-e 's:{QCA_LIB_NAME}:{INST_QCA_LIB_NAME}:'
diff --git a/security/qca2-qt5-gnupg/Makefile b/security/qca2-qt5-gnupg/Makefile
index ac12bac398a..676ed15c182 100644
--- a/security/qca2-qt5-gnupg/Makefile
+++ b/security/qca2-qt5-gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/04/14 07:34:39 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:35 jperkin Exp $
 
 PKGNAME=	qca2-qt5-gnupg-${DISTNAME:C/.*-//}
 PKGREVISION=	2
@@ -16,7 +16,7 @@ CMAKE_ARGS+=	-DBUILD_TOOLS=OFF
 CMAKE_ARGS+=	-DINST_QCA_LIB_NAME=-lqca-qt5
 
 SUBST_CLASSES+=		libname
-SUBST_STAGE.libname=	post-patch
+SUBST_STAGE.libname=	pre-configure
 SUBST_MESSAGE.libname=	Use installed lib.
 SUBST_FILES.libname=	plugins/qca-gnupg/CMakeLists.txt
 SUBST_SED.libname=	-e 's:{QCA_LIB_NAME}:{INST_QCA_LIB_NAME}:'
diff --git a/security/qca2-qt5-ossl/Makefile b/security/qca2-qt5-ossl/Makefile
index df8b22281a9..a29318b8e9c 100644
--- a/security/qca2-qt5-ossl/Makefile
+++ b/security/qca2-qt5-ossl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/04/14 07:34:40 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:35 jperkin Exp $
 
 PKGNAME=	qca2-qt5-ossl-${DISTNAME:C/.*-//}
 PKGREVISION=	2
@@ -14,7 +14,7 @@ CMAKE_ARGS+=	-DBUILD_TOOLS=OFF
 CMAKE_ARGS+=	-DINST_QCA_LIB_NAME=-lqca-qt5
 
 SUBST_CLASSES+=		libname
-SUBST_STAGE.libname=	post-patch
+SUBST_STAGE.libname=	pre-configure
 SUBST_MESSAGE.libname=	Use installed lib.
 SUBST_FILES.libname=	plugins/qca-ossl/CMakeLists.txt
 SUBST_SED.libname=	-e 's:{QCA_LIB_NAME}:{INST_QCA_LIB_NAME}:'
diff --git a/security/qca2/Makefile.common b/security/qca2/Makefile.common
index f94e46c8a87..c5e4b187227 100644
--- a/security/qca2/Makefile.common
+++ b/security/qca2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2018/01/31 09:14:55 markd Exp $
+# $NetBSD: Makefile.common,v 1.2 2018/07/04 13:40:36 jperkin Exp $
 
 DISTNAME=	qca-2.1.3
 CATEGORIES=	security
@@ -22,6 +22,6 @@ CMAKE_ARGS+=	-DOSX_FRAMEWORK=OFF
 CMAKE_ARGS+=	-DBUILD_TESTS=OFF
 
 SUBST_CLASSES+=		certs 
-SUBST_STAGE.certs=	post-patch
+SUBST_STAGE.certs=	pre-configure
 SUBST_FILES.certs=	CMakeLists.txt
 SUBST_VARS.certs=	PREFIX
diff --git a/security/skey/hacks.mk b/security/skey/hacks.mk
index bbaea03491e..3697f3121ec 100644
--- a/security/skey/hacks.mk
+++ b/security/skey/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2008/12/13 12:07:54 obache Exp $
+# $NetBSD: hacks.mk,v 1.5 2018/07/04 13:40:36 jperkin Exp $
 
 .if !defined(SKEY_HACKS_MK)
 SKEY_HACKS_MK=	# defined
@@ -11,7 +11,7 @@ PKG_HACKS+=		enforce-troff-style-man-pages
 CONFIGURE_ARGS+=	--with-catman=man
 SUBST_CLASSES+=		tsmp
 SUBST_MESSAGE.tsmp=	enforce use of troff style man pages
-SUBST_STAGE.tsmp=	post-patch
+SUBST_STAGE.tsmp=	pre-configure
 SUBST_FILES.tsmp=	configure
 SUBST_SED.tsmp=		-e 's,$$(CATMAN),$$(TROFFMAN),g'
 
@@ -22,7 +22,7 @@ SUBST_SED.tsmp=		-e 's,$$(CATMAN),$$(TROFFMAN),g'
 PKG_HACKS+=		use-sginap-instead-of-usleep
 SUBST_CLASSES+=		sginap
 SUBST_MESSAGE.sginap=	use sginap() instead of usleep()
-SUBST_STAGE.sginap=	post-patch
+SUBST_STAGE.sginap=	pre-configure
 SUBST_FILES.sginap=	skeyinit.c skeylogin.c
 SUBST_SED.sginap=	-e 's,usleep(100000),sginap(CLK_TCK/10),g'
 .endif
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index bc51f6fd6e8..4f4d4e1926a 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/08/01 14:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:36 jperkin Exp $
 #
 
 DISTNAME=	SnortSnarf-050314.1
@@ -20,7 +20,7 @@ REPLACE_PERL=	snortsnarf.pl include/ann_xml.pl include/web_utils.pl	\
 		include/xml_help.pl
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	snortsnarf.pl
 SUBST_SED.paths=	-e "s|./include|${PREFIX}/share/snortsnarf|g"
 SUBST_MESSAGE.paths=	Fixing paths.
diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile
index 556b3bb9b91..477c5fba454 100644
--- a/security/softhsm/Makefile
+++ b/security/softhsm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2018/04/14 07:34:01 adam Exp $
+# $NetBSD: Makefile,v 1.39 2018/07/04 13:40:36 jperkin Exp $
 #
 
 DISTNAME=	softhsm-1.3.7
@@ -24,7 +24,7 @@ EGDIR=			${PREFIX}/share/examples/softhsm
 
 SUBST_CLASSES+=         paths
 SUBST_FILES.paths=      ${WRKSRC}/Makefile.in
-SUBST_STAGE.paths=      post-patch
+SUBST_STAGE.paths=      pre-configure
 SUBST_SED.paths=        -e 's,@EGDIR@,${EGDIR},'
 
 CXXFLAGS.NetBSD+=	-D_NETBSD_SOURCE
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index b710c0bfce5..1b5f722752c 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2015/03/06 23:22:25 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2018/07/04 13:40:36 jperkin Exp $
 
 # See here for new version: http://www.mcafee.com/apps/downloads/free-evaluations/default.aspx?pc=aaad13320&plat=linux&pid=&eid=&ilv=LatestVersions&sz=25&pg=1&segment=false&region=us
 BROKEN=			distfile is gone, package must be updated to version 6.0.4
@@ -51,7 +51,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	update_dat.sh uvscan.sh
 SUBST_VARS.paths=	AWK BASENAME CP DATFILES ECHO GTAR MKDIR MV	\
 			PREFIX RM SED UVSCANDIR
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-extract:
 	${CP} ${FILESDIR}/update_dat.sh ${WRKSRC}/update_dat.sh
-- 
cgit v1.2.3