CVS commit: pkgsrc/shells/etsh

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Tue Dec  6 19:27:30 UTC 2022

Modified Files:
        pkgsrc/shells/etsh: Makefile

Log Message:
shells/etsh: Makefile revision.

* Replace the SUBST routine with REPLACE_INTERPRETER.
* Replace MAKEFLAGS with MAKE_FLAGS.
* Corrently set INSTALL_ENV in the post-install target.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/shells/etsh/Makefile

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

Modified files:

Index: pkgsrc/shells/etsh/Makefile
diff -u pkgsrc/shells/etsh/Makefile:1.2 pkgsrc/shells/etsh/Makefile:1.3
--- pkgsrc/shells/etsh/Makefile:1.2     Tue Dec  6 14:41:38 2022
+++ pkgsrc/shells/etsh/Makefile Tue Dec  6 19:27:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/12/06 14:41:38 vins Exp $
+# $NetBSD: Makefile,v 1.3 2022/12/06 19:27:30 vins Exp $
 
 DISTNAME=      etsh-5.4.0
 CATEGORIES=    shells
@@ -17,23 +17,25 @@ PKG_SHELL=  bin/etsh
 EXPDIR:=       ${PREFIX}/share/examples/etsh
 DOCDIR:=       ${PREFIX}/share/doc/etsh
 
-MAKEFLAGS+=    PREFIX=${PREFIX}
-MAKEFLAGS+=    DESTDOCDIR=${DESTDIR}${DOCDIR}
-MAKEFLAGS+=    DESTEXPDIR=${DESTDIR}${EXPDIR}
-MAKEFLAGS+=    MANGRP:='' BINGRP:=''
-
-SUBST_CLASSES+=                paths
-SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths+=    libexec.etsh/etshdir
-SUBST_FILES.paths+=    libexec.etsh/history
-SUBST_FILES.paths+=    libexec.etsh/pev
-SUBST_SED.paths=       -e 's|/usr/bin/env |${PREFIX}/bin/|'
+REPLACE_INTERPRETER+=  tsh
+REPLACE.tsh.old=       .*/bin/env etsh
+REPLACE.tsh.new=       ${PREFIX}/bin/etsh
+REPLACE_FILES.tsh+=    libexec.etsh/etshdir
+REPLACE_FILES.tsh+=    libexec.etsh/history
+REPLACE_FILES.tsh+=    libexec.etsh/pev
+
+MAKE_FLAGS+=   PREFIX=${PREFIX}
+MAKE_FLAGS+=   DESTDOCDIR=${DESTDIR}${DOCDIR}
+MAKE_FLAGS+=   DESTEXPDIR=${DESTDIR}${EXPDIR}
+
+INSTALL_ENV+=  MANGRP=''
+INSTALL_ENV+=  BINGRP=''
 
 post-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} exp
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM:Q} exp
 
 post-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install-exp \
-       install-doc
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV}                    \
+               ${MAKE_PROGRAM:Q} install-exp install-doc
 
 .include "../../mk/bsd.pkg.mk"