kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

erlang, amavisd, policyd: remove redundant replace-interpreter

Browse source 
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.
This commit is contained in:
rillig 2020-05-22 18:12:15 +00:00
parent 33d263eaa0
commit b935597127
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/erlang/Makefile
View file

@ -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

4
mail/amavisd-new/Makefile
View file

@ -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

4
mail/policyd-weight/Makefile
View file

@ -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