From 1cbaaf260f3d1ed3a45dbd50c03dd1d02be1b7e8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 25 Jul 2022 17:38:55 +0200 Subject: [PATCH 1/2] hooks/99-pkglint.sh: error if /usr/share/man/man/ is used --- common/hooks/pre-pkg/99-pkglint.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh index 325938f5d541..2710a63576a4 100644 --- a/common/hooks/pre-pkg/99-pkglint.sh +++ b/common/hooks/pre-pkg/99-pkglint.sh @@ -108,6 +108,11 @@ hook() { error=1 fi + if [[ -d ${PKGDESTDIR}/usr/share/man/man ]]; then + msg_red "${pkgver}: /usr/share/man/man is forbidden, use /usr/share/man.\n" + error=1 + fi + if [ -d ${PKGDESTDIR}/usr/doc ]; then msg_red "${pkgver}: /usr/doc is forbidden. Use /usr/share/doc.\n" error=1 From 0c326c60e7e8c14cd2a7bc9b5e8c6391ea3adb7c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 25 Jul 2022 17:39:27 +0200 Subject: [PATCH 2/2] coturn: fix man page paths Use build_style=configure as this is not a gnu-configure script. Specifically the --manprefix argument works different in gnu configure. --- srcpkgs/coturn/template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template index edfb526f4967..b55bd58fdb22 100644 --- a/srcpkgs/coturn/template +++ b/srcpkgs/coturn/template @@ -1,9 +1,12 @@ # Template file for 'coturn' pkgname=coturn version=4.5.1.3 -revision=3 -build_style=gnu-configure -configure_args="--libdir=/usr/lib" +revision=4 +build_style=configure +configure_args=" + --prefix=/usr + --manprefix=/usr/share + --sysconfdir=/etc" conf_files="/etc/turnserver.conf" makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel postgresql-libs-devel libmariadbclient-devel"