diff --git a/community/heirloom-doctools/APKBUILD b/community/heirloom-doctools/APKBUILD index 92fca1a7f39a0982649783c33b1d077718a01853..209c9449193ffe151bf590654571a07de7be1196 100644 --- a/community/heirloom-doctools/APKBUILD +++ b/community/heirloom-doctools/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Sören Tempel pkgname=heirloom-doctools pkgver=191015 -pkgrel=1 +pkgrel=2 pkgdesc="The Heirloom Documentation Tools" url="http://n-t-roff.github.io/heirloom/doctools.html" arch="all !mips !mips64" # FTBFS on mips due to missing yyval() license="CDDL" -depends="!coreutils !util-linux !mdocml-soelim" +depends="!coreutils !util-linux !mandoc-soelim" # TODO: Switch to bison makedepends="flex byacc" subpackages="$pkgname-doc" @@ -42,7 +42,7 @@ package() { make -j1 ROOT="$pkgdir" $_makeargs \ -C "$builddir" install - # Don't conflict with mdocml-doc + # Don't conflict with mandoc-doc rm -f "$pkgdir"/usr/share/man/man1/soelim.1 \ "$pkgdir"/usr/share/man/man7/man.7 \ "$pkgdir"/usr/share/man/man7/mdoc.7 diff --git a/community/mate-sensors-applet/APKBUILD b/community/mate-sensors-applet/APKBUILD index 34da525c5b51ba778b2fd4f3ead0f158bae20a05..5a8dde486e7c29dd3561fc31ae1b5df7403036be 100644 --- a/community/mate-sensors-applet/APKBUILD +++ b/community/mate-sensors-applet/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Alan Lacerda pkgname=mate-sensors-applet pkgver=1.24.0 -pkgrel=0 +pkgrel=1 pkgdesc="Applet for the MATE Panel to display readings from hardware sensors" url="https://github.com/mate-desktop/mate-sensors-applet" arch="all !s390x !mips !mips64" # Limited by mate-panel license="GPL-2.0-or-later" depends="perl-xml-parser" makedepends="intltool glib-dev gtk+3.0-dev mate-panel-dev libxslt-dev - itstool libxml2-utils mdocml-dev libnotify-dev" + itstool libxml2-utils mandoc-dev libnotify-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-sensors-applet-$pkgver.tar.xz" diff --git a/community/notmuch/APKBUILD b/community/notmuch/APKBUILD index 8f0ed7b70d77a357a9bd7426eaa03af8ab32701c..952e36ebf7d4ff66693e8b494c96acb0c3240740 100644 --- a/community/notmuch/APKBUILD +++ b/community/notmuch/APKBUILD @@ -3,14 +3,14 @@ # Maintainer: Stefan Wagner pkgname=notmuch pkgver=0.29.3 -pkgrel=0 +pkgrel=1 pkgdesc="E-Mail index, search and tagging" url="https://notmuchmail.org/" arch="all" license="GPL-3.0-or-later" makedepends="bash-completion gmime-dev gzip perl py3-requests py3-sphinx python3-dev talloc-dev xapian-core-dev" -checkdepends="bash coreutils dtach mdocml sed tar" +checkdepends="bash coreutils dtach mandoc sed tar" subpackages=" py3-$pkgname:py3:noarch $pkgname-doc diff --git a/community/vifm/APKBUILD b/community/vifm/APKBUILD index b025374e5e88bac740ac47ddca7c55ad6638ef4a..722b0c5156fa09f5b4a12701298e8b6e5e638239 100644 --- a/community/vifm/APKBUILD +++ b/community/vifm/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Milan P. Stanić pkgname=vifm pkgver=0.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="ncurses vi-like file manager" options="!check" # runtests.log: make[4]: *** [Makefile:331: misc] Segmentation fault url="https://vifm.info/" arch="all" license="GPL-2.0-or-later" -makedepends="ncurses-dev coreutils mdocml" +makedepends="ncurses-dev coreutils mandoc perl" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/vifm/vifm/archive/v$pkgver.tar.gz perl-interpreter-fix.patch" diff --git a/community/x2goserver/APKBUILD b/community/x2goserver/APKBUILD index d8293b63ffd124c7e5c6f20cb6ecb7767b2045d9..4d9a9b4a2ae9f7f54edb99469e81f912dc97393b 100644 --- a/community/x2goserver/APKBUILD +++ b/community/x2goserver/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Francesco Colista pkgname=x2goserver pkgver=4.1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="X2Go enables you to access a graphical desktop of a computer over a low bandwidth (or high bandwidth) connection" options="!check" # No option to run testsuite in make url="https://wiki.x2go.org/doku.php" @@ -14,7 +14,7 @@ options="suid" depends="perl perl-config-simple perl-dbi perl-file-readbackwards perl-capture-tiny perl-dbd-sqlite bash iproute2 makepasswd openssh lsof xauth perl-file-basedir mcookie nx-libs perl-file-which" -makedepends="libssh2-dev mdocml" +makedepends="libssh2-dev mandoc" install="$pkgname.pre-install $pkgname.post-install" subpackages="$pkgname-doc $pkgname-openrc" source="http://code.x2go.org/releases/source/x2goserver/x2goserver-$pkgver.tar.gz diff --git a/main/docs/APKBUILD b/main/docs/APKBUILD index 83c4bda38a41913a1949167a97b8b98cb2958762..a46f5297a03fe2808cb64ad90d6ff291834b8428 100644 --- a/main/docs/APKBUILD +++ b/main/docs/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa pkgname=docs pkgver=0.2 -pkgrel=2 +pkgrel=3 pkgdesc="Meta package for pulling in all documentation" url="https://alpinelinux.org" arch="all" license="MIT" -depends="mdocml" # It was previously called man +depends="mandoc" # It was previously called man package() { mkdir -p "$pkgdir" diff --git a/main/libasr/APKBUILD b/main/libasr/APKBUILD index 2bcda5c8581136e96a3d6606ee740ed15f989857..e3074649489118d034197269f56334c52aeb10a4 100644 --- a/main/libasr/APKBUILD +++ b/main/libasr/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="libasr is a free, simple and portable asynchronous resolver library" url="https://www.opensmtpd.org" arch="all" license="ISC" -makedepends="mdocml bison openssl-dev automake autoconf libtool libbsd-dev" +makedepends="mandoc bison openssl-dev automake autoconf libtool libbsd-dev" subpackages="$pkgname-dbg $pkgname-static $pkgname-dev" source="https://github.com/OpenSMTPD/libasr/archive/$pkgver/libasr-$pkgver.tar.gz 0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD index e810d9538403f46c54b72adf8c7dcf9e5e072175..3cb2da6ad5c666ab363f8b0beddc0e768dd637e0 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD @@ -3,7 +3,7 @@ pkgname=man-pages pkgver=5.06 _posixver=2013-a -pkgrel=0 +pkgrel=1 pkgdesc="Linux man pages" url="https://www.kernel.org/doc/man-pages/" arch="noarch" @@ -31,7 +31,7 @@ package() { # provided by libiconv-doc rm -f "$pkgdir"/usr/share/man/man3/iconv* - # provided by mdocml + # provided by mandoc rm -f "$pkgdir"/usr/share/man/man7/man* \ "$pkgdir"/usr/share/man/man7/mdoc* diff --git a/main/mdocml/APKBUILD b/main/mandoc/APKBUILD similarity index 90% rename from main/mdocml/APKBUILD rename to main/mandoc/APKBUILD index f5ae0f2583e9d0b37b26528d547f27fbb205f516..1e49977275713a330b5961cd5cf2bf2da069db31 100644 --- a/main/mdocml/APKBUILD +++ b/main/mandoc/APKBUILD @@ -1,26 +1,26 @@ # Contributor: Leo # Maintainer: Natanael Copa -pkgname=mdocml -_pkgname=mandoc +pkgname=mandoc pkgver=1.14.5 -pkgrel=3 -pkgdesc="mdoc/man compiler" -url="http://mdocml.bsd.lv/" +pkgrel=4 +pkgdesc="mandoc (formerly mdocml) UNIX manpage compiler toolset" +url="https://mandoc.bsd.lv/" arch="all" license="ISC and BSD-2-Clause and BSD-3-Clause" makedepends="zlib-dev" checkdepends="perl" install="$pkgname.post-deinstall" triggers="$pkgname-apropos.trigger=/usr/share/man/*" +replaces="mdocml" +provides="mdocml=$pkgver-r$pkgrel" subpackages="$pkgname-doc $pkgname-dev $pkgname-apropos $pkgname-soelim" -source="http://mdocml.bsd.lv/snapshots/$_pkgname-$pkgver.tar.gz +source="https://mandoc.bsd.lv/snapshots/mandoc-$pkgver.tar.gz shared-libmandoc.patch outdated-warn-disable.patch fix-tbl-null-pointer.patch mandoc_configure.patch " -builddir="$srcdir/$_pkgname-$pkgver" prepare() { default_prepare diff --git a/main/mdocml/fix-tbl-null-pointer.patch b/main/mandoc/fix-tbl-null-pointer.patch similarity index 100% rename from main/mdocml/fix-tbl-null-pointer.patch rename to main/mandoc/fix-tbl-null-pointer.patch diff --git a/main/mdocml/mdocml-apropos.trigger b/main/mandoc/mandoc-apropos.trigger similarity index 100% rename from main/mdocml/mdocml-apropos.trigger rename to main/mandoc/mandoc-apropos.trigger diff --git a/main/mdocml/mdocml.post-deinstall b/main/mandoc/mandoc.post-deinstall similarity index 100% rename from main/mdocml/mdocml.post-deinstall rename to main/mandoc/mandoc.post-deinstall diff --git a/main/mdocml/mandoc_configure.patch b/main/mandoc/mandoc_configure.patch similarity index 100% rename from main/mdocml/mandoc_configure.patch rename to main/mandoc/mandoc_configure.patch diff --git a/main/mdocml/outdated-warn-disable.patch b/main/mandoc/outdated-warn-disable.patch similarity index 100% rename from main/mdocml/outdated-warn-disable.patch rename to main/mandoc/outdated-warn-disable.patch diff --git a/main/mdocml/shared-libmandoc.patch b/main/mandoc/shared-libmandoc.patch similarity index 100% rename from main/mdocml/shared-libmandoc.patch rename to main/mandoc/shared-libmandoc.patch diff --git a/main/opensmtpd/APKBUILD b/main/opensmtpd/APKBUILD index f1752e4084e442bea4d2e69b999110a9236f3c3b..4f848dfa1f1092491f9bf81d3c8385dd4ef63de4 100644 --- a/main/opensmtpd/APKBUILD +++ b/main/opensmtpd/APKBUILD @@ -8,13 +8,13 @@ # - CVE-2020-7247 pkgname=opensmtpd pkgver=6.6.4p1 -pkgrel=0 +pkgrel=1 pkgdesc="Secure, reliable, lean, and easy-to configure SMTP server" url="https://www.opensmtpd.org/" arch="all" license="ISC" depends="!postfix ca-certificates" -makedepends="automake autoconf libtool mdocml db-dev libasr-dev libevent-dev +makedepends="automake autoconf libtool mandoc db-dev libasr-dev libevent-dev fts-dev zlib-dev openssl-dev bison flex-dev" install="$pkgname.pre-install" subpackages="$pkgname-dbg $pkgname-doc" diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD index 9fd996aafbc1fc46c6d2fbf4fbb411fcde21fb3a..6b0a66893ad5d649f336ee177fbffa97525c823c 100644 --- a/main/sudo/APKBUILD +++ b/main/sudo/APKBUILD @@ -8,12 +8,12 @@ if [ "${pkgver%_*}" != "$pkgver" ]; then else _realver=$pkgver fi -pkgrel=0 +pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" url="https://www.sudo.ws/sudo/" arch="all" license="custom ISC" -makedepends="zlib-dev bash mdocml" +makedepends="zlib-dev bash mandoc" subpackages="$pkgname-doc $pkgname-dev" source="https://www.sudo.ws/dist/sudo-$_realver.tar.gz fix-cross-compile.patch diff --git a/testing/ejson/APKBUILD b/testing/ejson/APKBUILD index 460d1452e7b6284dd1037d7b40b0844edc239c87..56d5b5fdcf93df492c26898a28393f7f62d40eeb 100644 --- a/testing/ejson/APKBUILD +++ b/testing/ejson/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Andy McLeod pkgname=ejson pkgver=1.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="EJSON is a small library to manage encrypted secrets using asymmetric encryption." url="https://github.com/Shopify/ejson" arch="all" license="MIT" -depends="mdocml" # Requires man to show help +depends="mandoc" # Requires man to show help makedepends="go ronn" source="$pkgname-$pkgver.tar.gz::https://github.com/Shopify/$pkgname/archive/v$pkgver.tar.gz"