Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 958C41A9239 for ; Fri, 3 Dec 2021 17:45:36 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id CD06E84F19; Fri, 3 Dec 2021 17:45:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1230C84F0B for ; Fri, 3 Dec 2021 17:45:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id hn9p_8s3CZui for ; Fri, 3 Dec 2021 17:45:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7E41D84EB6 for ; Fri, 3 Dec 2021 17:45:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 77DC6FAEC; Fri, 3 Dec 2021 17:45:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1638553534149390" MIME-Version: 1.0 Date: Fri, 3 Dec 2021 17:45:34 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/sysutils/cdrtools To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20211203174534.77DC6FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1638553534149390 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Fri Dec 3 17:45:34 UTC 2021 Modified Files: pkgsrc/sysutils/cdrtools: Makefile pkgsrc/sysutils/cdrtools/files: INSTALL.pkgsrc Log Message: cdrtools: Simplify SUBSTs for files/INSTALL.pkgsrc and replace LOCALBASE too To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 pkgsrc/sysutils/cdrtools/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1638553534149390 Content-Disposition: inline Content-Length: 2152 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/cdrtools/Makefile diff -u pkgsrc/sysutils/cdrtools/Makefile:1.123 pkgsrc/sysutils/cdrtools/Makefile:1.124 --- pkgsrc/sysutils/cdrtools/Makefile:1.123 Fri Dec 3 15:13:26 2021 +++ pkgsrc/sysutils/cdrtools/Makefile Fri Dec 3 17:45:34 2021 @@ -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_CLASSES+= install 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" Index: pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc diff -u pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc:1.1 pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc:1.2 --- pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc:1.1 Fri Dec 3 15:13:27 2021 +++ pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc Fri Dec 3 17:45:34 2021 @@ -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 --_----------=_1638553534149390--