From b9355971277efa7f29de483bc6ea0c2b5e497116 Mon Sep 17 00:00:00 2001 From: rillig Date: Fri, 22 May 2020 18:12:15 +0000 Subject: [PATCH] erlang, amavisd, policyd: remove redundant replace-interpreter Since do-configure-pre-hook already depends on replace-interpreter, there is no point in making any other stage depend on that as well. At best, it has no effect. At worst it creates a hard-to-find difference between builds that run "bmake install" directly and builds that split the build into "bmake configure && bmake build && bmake install", as bulk builds do. --- lang/erlang/Makefile | 4 +--- mail/amavisd-new/Makefile | 4 +--- mail/policyd-weight/Makefile | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 1ea87c540739..377665da0f08 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2020/02/27 13:46:39 jperkin Exp $ +# $NetBSD: Makefile,v 1.100 2020/05/22 18:12:15 rillig Exp $ DISTNAME= erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH} PKGNAME= ${DISTNAME:S/OTP-/erlang-/} @@ -34,8 +34,6 @@ CONFIGURE_ARGS+= --enable-threads MAKE_ENV+= DESTDIR=${DESTDIR} -do-configure-post-hook: replace-interpreter - REPLACE_INTERPRETER+= escript REPLACE.escript.old= .*escript REPLACE.escript.new= ${PREFIX}/bin/escript diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile index 77a097f11186..08ef52022962 100644 --- a/mail/amavisd-new/Makefile +++ b/mail/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/08/11 13:21:24 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2020/05/22 18:12:15 rillig Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -79,8 +79,6 @@ CONF_FILES= ${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf USE_LANGUAGES= # none, not even C -do-build: replace-interpreter - SUBST_CLASSES+= amavisd SUBST_STAGE.amavisd= pre-build SUBST_FILES.amavisd= amavisd amavisd.conf diff --git a/mail/policyd-weight/Makefile b/mail/policyd-weight/Makefile index a256a3d1fbad..58da96e82132 100644 --- a/mail/policyd-weight/Makefile +++ b/mail/policyd-weight/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2020/05/16 15:20:35 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2020/05/22 18:12:15 rillig Exp $ # DISTNAME= policyd-weight-0.1.14.17 @@ -42,8 +42,6 @@ SUBST_SED.fix-paths= -e 's,"/var/run/,"${VARBASE}/run/,g' SUBST_SED.fix-paths+= -e 's,"/etc/policyd-weight\.conf","${PKG_SYSCONFDIR}/policyd-weight.conf",g' SUBST_SED.fix-paths+= -e 's,"polw";,"${POLICYD_WEIGHT_USER}";,g' -do-build: replace-interpreter - do-install: ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/policyd-weight ${DESTDIR}${PREFIX}/sbin