git: 0a6f1823129e - main - sysutils/cdrdao: drop use of lorder(1)

The branch main has been updated by marius:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0a6f1823129e631da6f11368836f8b2fd5483096

commit 0a6f1823129e631da6f11368836f8b2fd5483096
Author:     Marius Strobl <marius@FreeBSD.org>
AuthorDate: 2021-12-20 20:36:30 +0000
Commit:     Marius Strobl <marius@FreeBSD.org>
CommitDate: 2021-12-20 20:52:44 +0000

    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
---
 sysutils/cdrdao/Makefile                           | 15 +++++-------
 sysutils/cdrdao/files/patch-dao_cdrdao.man         | 27 +++++++++++++++-------
 .../files/patch-scsilib_RULES_i386-freebsd-cc.rul  |  8 ++++---
 sysutils/cdrdao/pkg-plist                          |  2 +-
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 95b4bb22b73f..2850e9a52eab 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,8 +1,8 @@
 # Created by: futatuki
 
-PORTNAME?=	cdrdao
+PORTNAME=	cdrdao
 PORTVERSION=	1.2.4
-PORTREVISION?=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils audio
 MASTER_SITES=	SF/cdrdao
 DISTNAME=	cdrdao-${PORTVERSION}
@@ -18,11 +18,6 @@ USES=		alias compiler:c++11-lang gmake tar:bzip2
 GNU_CONFIGURE=	yes
 USE_CXXSTD=	c++11
 
-MP3OGG_LIB_DEPENDS=	libao.so:audio/libao \
-			libmad.so:audio/libmad \
-			libvorbis.so:audio/libvorbis
-
-.if ${PORTNAME} == "cdrdao"
 OPTIONS_DEFINE=		DOCS TOC2MP3 MP3OGG
 
 OPTIONS_DEFAULT=	MP3OGG
@@ -30,7 +25,6 @@ MP3OGG_DESC=		Build with MP3/Ogg support (for sysutils/gcdmaster)
 TOC2MP3_DESC=		Build with toc2mp3 (requires audio/lame)
 
 .include <bsd.port.options.mk>
-.endif
 
 CONFIGURE_ARGS+=	--with-gcdmaster=no
 .if ${PORT_OPTIONS:MTOC2MP3}
@@ -45,7 +39,10 @@ PLIST_SUB+=		TOC2MP3="@comment "
 .endif
 .if ${PORT_OPTIONS:MMP3OGG}
 USES+=			pkgconfig
-LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS}
+LIB_DEPENDS+=		libao.so:audio/libao \
+			libmad.so:audio/libmad \
+			libvorbis.so:audio/libvorbis
+
 CONFIGURE_ENV+=		AO_CFLAGS=-I${LOCALBASE}/include \
 			AO_LIBS="-L${LOCALBASE}/lib -lao" \
 			MAD_CFLAGS=-I${LOCALBASE}/include \
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
diff --git a/sysutils/cdrdao/pkg-plist b/sysutils/cdrdao/pkg-plist
index 63a04182b4e6..be2ca724326c 100644
--- a/sysutils/cdrdao/pkg-plist
+++ b/sysutils/cdrdao/pkg-plist
@@ -3,7 +3,7 @@ bin/cue2toc
 bin/toc2cddb
 bin/toc2cue
 %%TOC2MP3%%bin/toc2mp3
-@unexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi
+@postunexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi
 man/man1/cdrdao.1.gz
 man/man1/cue2toc.1.gz
 man/man1/toc2cddb.1.gz