Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc erlang, amavisd, policyd: remove redundant replace-int...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a6d351b1ec7
branches:  trunk
changeset: 432478:2a6d351b1ec7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri May 22 18:12:15 2020 +0000

description:
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.

diffstat:

 lang/erlang/Makefile         |  4 +---
 mail/amavisd-new/Makefile    |  4 +---
 mail/policyd-weight/Makefile |  4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diffs (54 lines):

diff -r b90b5d6d2f35 -r 2a6d351b1ec7 lang/erlang/Makefile
--- a/lang/erlang/Makefile      Fri May 22 18:08:46 2020 +0000
+++ b/lang/erlang/Makefile      Fri May 22 18:12:15 2020 +0000
@@ -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 @@
 
 MAKE_ENV+=             DESTDIR=${DESTDIR}
 
-do-configure-post-hook: replace-interpreter
-
 REPLACE_INTERPRETER+=  escript
 REPLACE.escript.old=   .*escript
 REPLACE.escript.new=   ${PREFIX}/bin/escript
diff -r b90b5d6d2f35 -r 2a6d351b1ec7 mail/amavisd-new/Makefile
--- a/mail/amavisd-new/Makefile Fri May 22 18:08:46 2020 +0000
+++ b/mail/amavisd-new/Makefile Fri May 22 18:12:15 2020 +0000
@@ -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 @@
 
 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 -r b90b5d6d2f35 -r 2a6d351b1ec7 mail/policyd-weight/Makefile
--- a/mail/policyd-weight/Makefile      Fri May 22 18:08:46 2020 +0000
+++ b/mail/policyd-weight/Makefile      Fri May 22 18:12:15 2020 +0000
@@ -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,"/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



Home | Main Index | Thread Index | Old Index