cdrtools: Fix config file handling

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Dec 3 15:40:08 2021 +0100
Changeset:	6b559c3b13b88bb0fb7ea5120c7689a828fc6ebd

Modified Files:
	cdrtools/Makefile
	cdrtools/TODO

Log Message:
cdrtools: Fix config file handling

PKG_SYSCONFSUBDIR does not work, must be a file.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6b559c3b13b88bb0fb7ea5120c7689a828fc6ebd

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

diffstat:
 cdrtools/Makefile | 8 ++++----
 cdrtools/TODO     | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diffs:
diff --git a/cdrtools/Makefile b/cdrtools/Makefile
index 62130a33d4..5e3e7723c6 100644
--- a/cdrtools/Makefile
+++ b/cdrtools/Makefile
@@ -24,9 +24,9 @@ MAKE_FLAGS+=	CPPOPTX=${CPPFLAGS:Q} COPTX=${CFLAGS:Q} LDOPTX=${LDFLAGS:Q}
 # The default location is /etc/default/cdrecord
 # We patch the documentation appropriately. Additionally, we also install
 # INSTALL.pkgsrc stating the reasons we do this, as required by the license.
-PKG_SYSCONFSUBDIR=	cdrecord
+#PKG_SYSCONFSUBDIR=	cdrecord
 
-CONF_FILES=	${PREFIX}/share/examples/cdrtools/cdrecord ${PKG_SYSCONFDIR}
+CONF_FILES=	${PREFIX}/share/examples/cdrtools/cdrecord ${PKG_SYSCONFDIR}/cdrecord
 SPECIAL_PERMS+=	${PREFIX}/share/examples/cdrtools/cdrecord ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
 AUTO_MKDIRS=	yes
 
@@ -35,7 +35,7 @@ SUBST_CLASSES+=		fix
 SUBST_STAGE.fix=	pre-configure
 SUBST_FILES.fix+=	cdrecord/cdrecord.1
 SUBST_FILES.fix+=	cdrecord/cdrecord.dfl
-SUBST_SED.fix=		-e "s,/etc/default/cdrecord,${PKG_SYSCONFDIR},g"
+SUBST_SED.fix=		-e "s,/etc/default/cdrecord,${PKG_SYSCONFDIR}/cdrecord,g"
 SUBST_MESSAGE.fix=	Replace defaults file paths.
 
 # Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
@@ -44,7 +44,7 @@ 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,PKG_SYSCONFDIR,${PKG_SYSCONFDIR:Q},'
+SUBST_SED.install+=	-e 's,CDRECORD_CONF,${PKG_SYSCONFDIR}/cdrecord,'
 
 # Shared platform specific code for schilytools (provided by smake package)
 .include "../../devel/smake/Makefile.common"
diff --git a/cdrtools/TODO b/cdrtools/TODO
index a18336182b..205c298967 100644
--- a/cdrtools/TODO
+++ b/cdrtools/TODO
@@ -1,4 +1 @@
-- pkglint complains that "mk/defaults/mk.conf" specifies a different config file
-  But the entry is commented out and the cdrecord source tree says "cdrecord",
-  not "cdrecord.conf". Should it be changed or removed?
 - Is "hacks.mk" still required for macOS?