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