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 /print/cups15 | |
| 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 'print/cups15')
| -rw-r--r-- | print/cups15/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
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} |