CVS commit: pkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri May 22 18:12:15 UTC 2020

Modified Files:
        pkgsrc/lang/erlang: Makefile
        pkgsrc/mail/amavisd-new: Makefile
        pkgsrc/mail/policyd-weight: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/lang/erlang/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mail/amavisd-new/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/policyd-weight/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/erlang/Makefile
diff -u pkgsrc/lang/erlang/Makefile:1.99 pkgsrc/lang/erlang/Makefile:1.100
--- pkgsrc/lang/erlang/Makefile:1.99    Thu Feb 27 13:46:39 2020
+++ pkgsrc/lang/erlang/Makefile Fri May 22 18:12:15 2020
@@ -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

Index: pkgsrc/mail/amavisd-new/Makefile
diff -u pkgsrc/mail/amavisd-new/Makefile:1.26 pkgsrc/mail/amavisd-new/Makefile:1.27
--- pkgsrc/mail/amavisd-new/Makefile:1.26       Sun Aug 11 13:21:24 2019
+++ pkgsrc/mail/amavisd-new/Makefile    Fri May 22 18:12:15 2020
@@ -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-minima
 
 USE_LANGUAGES=         # none, not even C
 
-do-build:      replace-interpreter
-
 SUBST_CLASSES+=                amavisd
 SUBST_STAGE.amavisd=   pre-build
 SUBST_FILES.amavisd=   amavisd amavisd.conf

Index: pkgsrc/mail/policyd-weight/Makefile
diff -u pkgsrc/mail/policyd-weight/Makefile:1.13 pkgsrc/mail/policyd-weight/Makefile:1.14
--- pkgsrc/mail/policyd-weight/Makefile:1.13    Sat May 16 15:20:35 2020
+++ pkgsrc/mail/policyd-weight/Makefile Fri May 22 18:12:15 2020
@@ -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/,"$
 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