diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
| commit | 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 (patch) | |
| tree | 4b7c9cc25a344fafc9d2f536ba6e474a9bb281e6 /net/vpnc | |
| parent | 063580a062ba10ffba035c8d96b541b5ce7a426d (diff) | |
| download | pkgsrc-3cc59ce5299d6358f3c1487cc9da3d48ef0a0647.tar.gz | |
*: 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.
Diffstat (limited to 'net/vpnc')
| -rw-r--r-- | net/vpnc/Makefile | 4 | ||||
| -rw-r--r-- | net/vpnc/options.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index 7c7fb842f37..8dbb029dec9 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2017/09/06 09:03:03 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2018/07/04 13:40:31 jperkin Exp $ # DISTNAME= vpnc-0.5.3 @@ -21,7 +21,7 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/vpnc SUBST_CLASSES+= paths SUBST_MESSAGE.paths= fixing pathnames -SUBST_STAGE.paths= post-patch +SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= config.c vpnc-script.in makeman.pl pcf2vpnc SUBST_FILES.paths+= vpnc.8.template vpnc-disconnect SUBST_SED.paths= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' diff --git a/net/vpnc/options.mk b/net/vpnc/options.mk index 5ec04782c0a..a0af1cc7f01 100644 --- a/net/vpnc/options.mk +++ b/net/vpnc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2012/02/15 13:02:31 obache Exp $ +# $NetBSD: options.mk,v 1.4 2018/07/04 13:40:31 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openvpnc PKG_SUPPORTED_OPTIONS= openssl # off by default @@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS= .include "../../security/openssl/buildlink3.mk" SUBST_CLASSES+= openssl SUBST_MESSAGE.openssl= adding openssl option -SUBST_STAGE.openssl= post-patch +SUBST_STAGE.openssl= pre-configure SUBST_FILES.openssl= Makefile SUBST_SED.openssl= -e 's/^.OPENSSL_GPL_VIOLATION/OPENSSL_GPL_VIOLATION/' SUBST_SED.openssl+= -e 's/^.OPENSSLLIBS/OPENSSLLIBS/' |