Fri Dec 3 17:45:34 2021 UTC ()
cdrtools: Simplify SUBSTs for files/INSTALL.pkgsrc and replace LOCALBASE too


(ryoon)
diff -r1.123 -r1.124 pkgsrc/sysutils/cdrtools/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc
cvs diff -r1.123 -r1.124 pkgsrc/sysutils/cdrtools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrtools/Makefile 2021/12/03 15:13:26 1.123
+++ pkgsrc/sysutils/cdrtools/Makefile 2021/12/03 17:45:34 1.124
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.123 2021/12/03 15:13:26 micha Exp $ 1# $NetBSD: Makefile,v 1.124 2021/12/03 17:45:34 ryoon Exp $
2 2
3DISTNAME= schily-2021-09-18 3DISTNAME= schily-2021-09-18
4PKGNAME= cdrtools-3.02a10 4PKGNAME= cdrtools-3.02a10
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=schilytools/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=schilytools/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://sourceforge.net/projects/schilytools/ 10HOMEPAGE= https://sourceforge.net/projects/schilytools/
11COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray 11COMMENT= Software for creating ISO9660 images and writing CD/DVD/Blu-ray
12LICENSE= cddl-1.0 AND gnu-gpl-v2 AND gnu-lgpl-v2.1 AND 2-clause-bsd 12LICENSE= cddl-1.0 AND gnu-gpl-v2 AND gnu-lgpl-v2.1 AND 2-clause-bsd
13 13
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
@@ -31,28 +31,29 @@ AUTO_MKDIRS= yes @@ -31,28 +31,29 @@ AUTO_MKDIRS= yes
31# Configure config file location 31# Configure config file location
32SUBST_CLASSES+= fix 32SUBST_CLASSES+= fix
33SUBST_STAGE.fix= pre-configure 33SUBST_STAGE.fix= pre-configure
34SUBST_FILES.fix+= cdrecord/cdrecord.1 34SUBST_FILES.fix+= cdrecord/cdrecord.1
35SUBST_FILES.fix+= cdrecord/cdrecord.dfl 35SUBST_FILES.fix+= cdrecord/cdrecord.dfl
36SUBST_SED.fix= -e "s,/etc/default/cdrecord,${PKG_SYSCONFDIR}/cdrecord,g" 36SUBST_SED.fix= -e "s,/etc/default/cdrecord,${PKG_SYSCONFDIR}/cdrecord,g"
37SUBST_MESSAGE.fix= Replace defaults file paths. 37SUBST_MESSAGE.fix= Replace defaults file paths.
38 38
39# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE) 39# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
40SUBST_CLASSES+= install 40SUBST_CLASSES+= install
41SUBST_STAGE.install= post-configure 41SUBST_STAGE.install= post-configure
42SUBST_MESSAGE.install= Preparing INSTALL.pkgsrc file ... 42SUBST_MESSAGE.install= Preparing INSTALL.pkgsrc file ...
43SUBST_FILES.install= ${WRKDIR}/INSTALL.pkgsrc 43SUBST_FILES.install= ${WRKDIR}/INSTALL.pkgsrc
44SUBST_SED.install= -e 's,PKGNAME_NOREV,${PKGNAME_NOREV},' 44SUBST_VARS.install= PKGNAME_NOREV
45SUBST_SED.install+= -e 's,CDRECORD_CONF,${PKG_SYSCONFDIR}/cdrecord,' 45SUBST_VARS.install+= PKG_SYSCONFDIR
 46SUBST_VARS.install+= LOCALBASE
46 47
47# Shared platform specific code for schilytools (provided by smake package) 48# Shared platform specific code for schilytools (provided by smake package)
48.include "../../devel/smake/Makefile.common" 49.include "../../devel/smake/Makefile.common"
49 50
50do-configure: 51do-configure:
51 ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR} 52 ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
52 cd ${WRKSRC}/inc && ${SMAKE} ${MAKE_FLAGS} 53 cd ${WRKSRC}/inc && ${SMAKE} ${MAKE_FLAGS}
53 54
54do-build: 55do-build:
55 cd ${WRKSRC} && \ 56 cd ${WRKSRC} && \
56 for library in libschily libdeflt libcdrdeflt libedc libfile \ 57 for library in libschily libdeflt libcdrdeflt libedc libfile \
57 libfind libhfs_iso libmdigest libscg libscgcmd librscg \ 58 libfind libhfs_iso libmdigest libscg libscgcmd librscg \
58 libparanoia libsiconv; \ 59 libparanoia libsiconv; \
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc (expand / switch to unified diff)

--- pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc 2021/12/03 15:13:27 1.1
+++ pkgsrc/sysutils/cdrtools/files/INSTALL.pkgsrc 2021/12/03 17:45:34 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1The location of the PKGNAME_NOREV `defaults' file has been set to: 1The location of the @PKGNAME_NOREV@ `defaults' file has been set to:
2 2
3 CDRECORD_CONF 3 @PKG_SYSCONFDIR@/cdrecord
4 4
5This is the pkgsrc standard config file location, NOT the PKGNAME_NOREV 5This is the pkgsrc standard config file location, NOT the @PKGNAME_NOREV@
6standard location, which is /etc/default/cdrecord. 6standard location, which is /etc/default/cdrecord.
7 7
8The reason for this is that pkgsrc packages should not use configuration 8The reason for this is that pkgsrc packages should not use configuration
9files outside ${LOCALBASE} unless they are explicitly set by the user. 9files outside @LOCALBASE@ unless they are explicitly set by the user.
10 10
11 11
12You will need to stop Solaris volume management before using PKGNAME_NOREV: 12You will need to stop Solaris volume management before using @PKGNAME_NOREV@:
13 13
14 /etc/init.d/volmgt stop 14 /etc/init.d/volmgt stop