From nobody Mon Dec 20 20:53:19 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D098C19004A4; Mon, 20 Dec 2021 20:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JHsHg4Dpmz3Ccd; Mon, 20 Dec 2021 20:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 710CD1D112; Mon, 20 Dec 2021 20:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BKKrJKM090910; Mon, 20 Dec 2021 20:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKKrJg6090909; Mon, 20 Dec 2021 20:53:19 GMT (envelope-from git) Date: Mon, 20 Dec 2021 20:53:19 GMT Message-Id: <202112202053.1BKKrJg6090909@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Marius Strobl Subject: git: 0a6f1823129e - main - sysutils/cdrdao: drop use of lorder(1) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a6f1823129e631da6f11368836f8b2fd5483096 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640033599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fV1ybc0sfJg1sGXYR6xpGbHpqxrDiUaaPBuSWlq2wrM=; b=nEAyKWeX0WECovyPbhrxWx1+o6sAKr7Pu9600dSOlwCJSUoBCm8K9IQiNmIJ/kaNG2w70d 7avRuy93FISCWIUszAebCXpQg55BwPsbPHTXfVehApTlVNpp/OCJyPnix8UNopTxa2XdDl 9Zrum14JXE0LpWBLzq84R9eLZgF7DsijvU/b9cQgcfNUOO+w1rAwQ7kDmZzGkCaVVjrxzQ FO1kp9z9+0yl+xwhkiTsY0FDnuXuInI8NyVpR5DAVYDsAqUN5kCteplYG8P93mt4DnvdqP mvOk08fwLknFIgoc/X7/y3pdAtwbZU/muHX93HuvWE3/b7jHdt3/QAlJSPfVXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640033599; a=rsa-sha256; cv=none; b=yRq40xmQ27nk9pGkVHBAT83e0Kt67koUGCIwV05qSe3NUJGdWGxQn9kwm74fkfN9YaTNi+ NCbVSVTAKbAg84/xZrtjKwq5Vjn7OD16pQ8vwGlofnMOb+3RZ/HrPl+weVpB75B+DAil2H wvNyIogV07cpCjWB0sZICD632lhxcCb266SVx1Kh/6l1iW6GulTY6W6U4VwouF/6NKYODh lP1Ly9/5bq0Q42U4wOi9u/3UDya+9OcuHaB8mGMSQRiY14cTT+tw5J2J5kkSVu1+SqPhwU 6eQnm+NMlQl74OmR/NbZpmz/cmrHxeb4kDTyhJdo4vz/UTkTwtrc6AF6aPBaFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a6f1823129e631da6f11368836f8b2fd5483096 commit 0a6f1823129e631da6f11368836f8b2fd5483096 Author: Marius Strobl AuthorDate: 2021-12-20 20:36:30 +0000 Commit: Marius Strobl 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 -.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