From nobody Wed Dec 29 08:49:38 2021 X-Original-To: dev-commits-ports-main@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 601501916537; Wed, 29 Dec 2021 08:49:39 +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 4JP4pW0tMFz4dM7; Wed, 29 Dec 2021 08:49:39 +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 EDF2D21D51; Wed, 29 Dec 2021 08:49:38 +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 1BT8ncSt040242; Wed, 29 Dec 2021 08:49:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BT8ncxT040241; Wed, 29 Dec 2021 08:49:38 GMT (envelope-from git) Date: Wed, 29 Dec 2021 08:49:38 GMT Message-Id: <202112290849.1BT8ncxT040241@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 1996f8415cf4 - main - audio/alsa-utils: fix MANPAGES option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1996f8415cf47c9c7dd1ff3197d7fd0f57a23700 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640767779; 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=5aye1ShIjY77amxswIGsITUD0cF+u/s3vXlzbYarhm0=; b=ZAaBdQOnArPNABKjuaDQK8ZF5yy0tezQUTIYkGEGQcBRJRL1/UmUb69z5nkuLf9hJJ3NDy LUthMB+sw1aOPMBPROrAaw/f6CkJ0SSlHlaWe+FE94+poz0G6WhLdUnatLzFeu0bxEqFsF V/gadZCpDD/KggfHjJyP9VzWGQvwe7DUcpnifopWGVF+w/zCHt4KWMt4HsX3Qt0jceLvcX hHuyFpieE2jZT/APw7E5/tVx2eYvm/h800V4sjKs4U7R4joYlfJCX00YOtJQAyeIKSugZX NrVfgoL04bfp/lFAPn910Cub7D6bqlhsmCqgns/SmRlehsmrjVvSjIAd1i9pbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640767779; a=rsa-sha256; cv=none; b=WnOWF4t0gBrFm4ULwWTNPJ1olCU9uggMAdOPSLb2iWOvEhJWT3ZBzp2rWkenfty/ZWgLDM 9DWOJPHmi/BLZGyi0JIcYH02wJnwj6S42tFVtPoTA3I/BKY0muTYwuSo6k7rFMmxXfc30h PGNX0BzzMikTktsmu4ktXBhgGO7z6E+4fKfefxaMFe4iMGEZYdqpi573n4/hnh+PUh3rqq XFk7mnDktHlvfuT2SIlSFg0ve7ic7dsbabkSYNSE9vHgsJi4zxnm3mJ9epDx3QtO/1/U1X Pdfz8auz4wPSowkVl//TMaxmvEesjNwjssbMr8tdwzBWVZjm55Lqiedt+2v8Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=1996f8415cf47c9c7dd1ff3197d7fd0f57a23700 commit 1996f8415cf47c9c7dd1ff3197d7fd0f57a23700 Author: John Hein AuthorDate: 2021-12-29 08:45:45 +0000 Commit: Fernando Apesteguía CommitDate: 2021-12-29 08:47:29 +0000 audio/alsa-utils: fix MANPAGES option * MANPAGES off still installed them * Installed xmlto broke build PR: 260268 Reported by: jcfyecrayz@liamekaens.com --- audio/alsa-utils/Makefile | 21 +++++------ audio/alsa-utils/files/patch-alsactl_Makefile.am | 8 ----- audio/alsa-utils/pkg-plist | 45 +++++++++++++----------- 3 files changed, 35 insertions(+), 39 deletions(-) diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile index a5ce784d9bfd..68c9bd214d5f 100644 --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -2,15 +2,11 @@ PORTNAME= alsa-utils PORTVERSION= 1.2.2 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= GH -USE_GITHUB= yes -GH_ACCOUNT= alsa-project -GH_PROJECT= ${PORTNAME} - MAINTAINER= ports@FreeBSD.org COMMENT= ALSA compatibility utilities @@ -24,27 +20,32 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl USES= autoreconf gettext-tools gmake libtool localbase ncurses shebangfix \ tar:bzip2 pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= alsa-project +GH_PROJECT= ${PORTNAME} +SHEBANG_FILES= alsa-info/alsa-info.sh alsaconf/alsaconf.in bat/alsabat-test.sh + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-udev-rules-dir="\$${prefix}/lib/udev" -SHEBANG_FILES= alsa-info/alsa-info.sh alsaconf/alsaconf.in bat/alsabat-test.sh INSTALL_TARGET= install-strip -CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files CFLAGS+= -Dlseek64=lseek -DSCHED_IDLE=SCHED_OTHER \ -I${LOCALBASE}/include/libepoll-shim +CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files LDFLAGS+= -linotify -lepoll-shim -OPTIONS_SUB= yes OPTIONS_DEFINE= BAT MANPAGES NLS SAMPLERATE OPTIONS_DEFAULT= BAT MANPAGES +OPTIONS_SUB= yes BAT_DESC= Basic Audio Tester support BAT_LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float BAT_CONFIGURE_ENABLE= bat -MANPAGES_BUILD_DEPENDS= minixmlto:textproc/minixmlto -MANPAGES_CONFIGURE_ENV= ac_cv_prog_xmlto=minixmlto +MANPAGES_BUILD_DEPENDS= minixmlto:textproc/minixmlto \ + rst2man:textproc/py-docutils MANPAGES_CONFIGURE_ENABLE= xmlto +MANPAGES_BINARY_ALIAS= xmlto=minixmlto NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls diff --git a/audio/alsa-utils/files/patch-alsactl_Makefile.am b/audio/alsa-utils/files/patch-alsactl_Makefile.am deleted file mode 100644 index 43e54d03abe3..000000000000 --- a/audio/alsa-utils/files/patch-alsactl_Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ ---- alsactl/Makefile.am.orig 2020-02-19 12:02:10 UTC -+++ alsactl/Makefile.am -@@ -66,4 +66,4 @@ CLEANFILES = \ - 90-alsa-restore.rules - - %.7: %.xml -- xmlto man $? -+ $(xmlto) man $? diff --git a/audio/alsa-utils/pkg-plist b/audio/alsa-utils/pkg-plist index 125e57deb7bd..8a0a7d38bd96 100644 --- a/audio/alsa-utils/pkg-plist +++ b/audio/alsa-utils/pkg-plist @@ -17,27 +17,30 @@ bin/iecset bin/speaker-test lib/udev/89-alsa-ucm.rules lib/udev/90-alsa-restore.rules -man/fr/man8/alsaconf.8.gz -man/man1/aconnect.1.gz -man/man1/alsa-info.sh.1.gz -%%BAT%%man/man1/alsabat.1.gz -man/man1/alsactl.1.gz -man/man1/alsaloop.1.gz -man/man1/alsamixer.1.gz -man/man1/amidi.1.gz -man/man1/amixer.1.gz -man/man1/aplay.1.gz -man/man1/aplaymidi.1.gz -man/man1/arecord.1.gz -man/man1/arecordmidi.1.gz -man/man1/aseqdump.1.gz -man/man1/aseqnet.1.gz -man/man1/axfer-list.1.gz -man/man1/axfer-transfer.1.gz -man/man1/axfer.1.gz -man/man1/iecset.1.gz -man/man1/speaker-test.1.gz -man/man8/alsaconf.8.gz +%%MANPAGES%%man/fr/man8/alsaconf.8.gz +%%MANPAGES%%man/man1/aconnect.1.gz +%%MANPAGES%%man/man1/alsa-info.sh.1.gz +%%MANPAGES%%%%BAT%%man/man1/alsabat.1.gz +%%MANPAGES%%man/man1/alsactl.1.gz +%%MANPAGES%%man/man1/alsaloop.1.gz +%%MANPAGES%%man/man1/alsamixer.1.gz +%%MANPAGES%%man/man1/alsatplg.1.gz +%%MANPAGES%%man/man1/alsaucm.1.gz +%%MANPAGES%%man/man1/amidi.1.gz +%%MANPAGES%%man/man1/amixer.1.gz +%%MANPAGES%%man/man1/aplay.1.gz +%%MANPAGES%%man/man1/aplaymidi.1.gz +%%MANPAGES%%man/man1/arecord.1.gz +%%MANPAGES%%man/man1/arecordmidi.1.gz +%%MANPAGES%%man/man1/aseqdump.1.gz +%%MANPAGES%%man/man1/aseqnet.1.gz +%%MANPAGES%%man/man1/axfer-list.1.gz +%%MANPAGES%%man/man1/axfer-transfer.1.gz +%%MANPAGES%%man/man1/axfer.1.gz +%%MANPAGES%%man/man1/iecset.1.gz +%%MANPAGES%%man/man1/speaker-test.1.gz +%%MANPAGES%%man/man7/alsactl_init.7.gz +%%MANPAGES%%man/man8/alsaconf.8.gz sbin/alsa-info.sh %%BAT%%sbin/alsabat-test.sh sbin/alsaconf