diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2021-12-20 20:36:30 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2021-12-20 20:52:44 +0000 |
| commit | 0a6f1823129e631da6f11368836f8b2fd5483096 (patch) | |
| tree | 33f0e2161aaa499c02079495d6d1e80d583fc5d2 /sysutils/cdrdao/files | |
| parent | 5413c1b4d75306753bd93741abe40a1d892898fe (diff) | |
| download | ports-0a6f1823129e631da6f11368836f8b2fd5483096.tar.gz ports-0a6f1823129e631da6f11368836f8b2fd5483096.zip | |
sysutils/cdrdao: drop use of lorder(1)
While at it, switch pkg-plist to @postunexec and remove remnants of the
gcdmaster slave missed in db5b4a8694f902fef50919c2744ee2ee31fcd89b.
PR: 259254
Diffstat (limited to 'sysutils/cdrdao/files')
| -rw-r--r-- | sysutils/cdrdao/files/patch-dao_cdrdao.man | 27 | ||||
| -rw-r--r-- | sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul | 8 |
2 files changed, 24 insertions, 11 deletions
diff --git a/sysutils/cdrdao/files/patch-dao_cdrdao.man b/sysutils/cdrdao/files/patch-dao_cdrdao.man index 3a99f83ae347..625e0afa497b 100644 --- a/sysutils/cdrdao/files/patch-dao_cdrdao.man +++ b/sysutils/cdrdao/files/patch-dao_cdrdao.man @@ -1,24 +1,35 @@ --- dao/cdrdao.man.orig 2018-05-16 10:46:39 UTC +++ dao/cdrdao.man -@@ -798,13 +798,9 @@ following locations. The files will be r +@@ -798,15 +798,11 @@ following locations. The files will be read on startup .I cdrdao in that order: -1. /etc/cdrdao.conf -- --2. /etc/defaults/cdrdao -- --3. /etc/default/cdrdao +1. %%PREFIX%%/etc/cdrdao.conf --4. $HOME/.cdrdao +-2. /etc/defaults/cdrdao +2. $HOME/.cdrdao +-3. /etc/default/cdrdao +-4. $HOME/.cdrdao +- +- Command line options will overwrite the loaded settings. -@@ -886,4 +882,4 @@ resources may not be released. Use ipcs( + The settings file contains name - value pairs separated by a + colon. String values must be enclosed by ". The file is +@@ -876,7 +872,7 @@ Directory where temporary WAV files will be created fr + .LP + .SH BUGS + If the program is terminated during the write/simulation process used IPC +-resources may not be released. Use ipcs(8) and ipcrm(8) to delete them. ++resources may not be released. Use ipcs(1) and ipcrm(1) to delete them. + .SH AUTHOR + .ft CW + .nf +@@ -886,4 +882,4 @@ resources may not be released. Use ipcs(8) and ipcrm(8 .ft R .fi .SH SEE ALSO -.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(8), " ipcrm (8) -+.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(1), " ipcrm (1) ++.BR "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(1), " ipcrm (1) diff --git a/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul b/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul index fc1ed1dbf7db..66da9d4293b1 100644 --- a/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul +++ b/sysutils/cdrdao/files/patch-scsilib_RULES_i386-freebsd-cc.rul @@ -10,7 +10,7 @@ CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) COPTS= -@@ -57,14 +58,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGE +@@ -57,14 +58,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so FLOAT_OPTIONS= @@ -23,8 +23,10 @@ +DYNLD= $(CCCOM) +RANLIB= ranlib ARFLAGS= cr - LORDER= lorder - TSORT= tsort +-LORDER= lorder +-TSORT= tsort ++LORDER= echo ++TSORT= cat RMDEP= : -MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M |