pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/sysutils/cdrtools cdrtools: Simplify SUBSTs for files/...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa9d1b5ce393
branches:  trunk
changeset: 770598:aa9d1b5ce393
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Dec 03 17:45:34 2021 +0000

description:
cdrtools: Simplify SUBSTs for files/INSTALL.pkgsrc and replace LOCALBASE too

diffstat:

 sysutils/cdrtools/Makefile             |   7 ++++---
 sysutils/cdrtools/files/INSTALL.pkgsrc |  10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r 6ceddf74a829 -r aa9d1b5ce393 sysutils/cdrtools/Makefile
--- a/sysutils/cdrtools/Makefile        Fri Dec 03 17:08:50 2021 +0000
+++ b/sysutils/cdrtools/Makefile        Fri Dec 03 17:45:34 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2021/12/03 15:13:26 micha Exp $
+# $NetBSD: Makefile,v 1.124 2021/12/03 17:45:34 ryoon Exp $
 
 DISTNAME=      schily-2021-09-18
 PKGNAME=       cdrtools-3.02a10
@@ -41,8 +41,9 @@
 SUBST_STAGE.install=   post-configure
 SUBST_MESSAGE.install= Preparing INSTALL.pkgsrc file ...
 SUBST_FILES.install=   ${WRKDIR}/INSTALL.pkgsrc
-SUBST_SED.install=     -e 's,PKGNAME_NOREV,${PKGNAME_NOREV},'
-SUBST_SED.install+=    -e 's,CDRECORD_CONF,${PKG_SYSCONFDIR}/cdrecord,'
+SUBST_VARS.install=    PKGNAME_NOREV
+SUBST_VARS.install+=   PKG_SYSCONFDIR
+SUBST_VARS.install+=   LOCALBASE
 
 # Shared platform specific code for schilytools (provided by smake package)
 .include "../../devel/smake/Makefile.common"
diff -r 6ceddf74a829 -r aa9d1b5ce393 sysutils/cdrtools/files/INSTALL.pkgsrc
--- a/sysutils/cdrtools/files/INSTALL.pkgsrc    Fri Dec 03 17:08:50 2021 +0000
+++ b/sysutils/cdrtools/files/INSTALL.pkgsrc    Fri Dec 03 17:45:34 2021 +0000
@@ -1,14 +1,14 @@
-The location of the PKGNAME_NOREV `defaults' file has been set to:
+The location of the @PKGNAME_NOREV@ `defaults' file has been set to:
 
-   CDRECORD_CONF
+   @PKG_SYSCONFDIR@/cdrecord
 
-This is the pkgsrc standard config file location, NOT the PKGNAME_NOREV
+This is the pkgsrc standard config file location, NOT the @PKGNAME_NOREV@
 standard location, which is /etc/default/cdrecord.
 
 The reason for this is that pkgsrc packages should not use configuration
-files outside ${LOCALBASE} unless they are explicitly set by the user.
+files outside @LOCALBASE@ unless they are explicitly set by the user.
 
 
-You will need to stop Solaris volume management before using PKGNAME_NOREV:
+You will need to stop Solaris volume management before using @PKGNAME_NOREV@:
 
     /etc/init.d/volmgt stop



Home | Main Index | Thread Index | Old Index