* [gentoo-commits] repo/gentoo:master commit in: app-text/mandoc/, app-text/mandoc/files/
@ 2020-12-11 12:22 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2020-12-11 12:22 UTC (permalink / raw
To: gentoo-commits
commit: 21fccd433a95f545ac5407c0f58020bd010a38c6
Author: epsilonKNOT <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun Nov 29 01:47:52 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 12:22:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fccd43
app-text/mandoc: allow mandoc as default man provider
only supports using gzip
Add musl patch from
Wolfgang Mueller <wolf+gentoo <AT> oriole.systems>
Closes: https://bugs.gentoo.org/616776
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/mandoc-1.14.5-r1-www-install.patch | 19 ++++
app-text/mandoc/files/mandoc.cron-r0 | 6 ++
app-text/mandoc/mandoc-1.14.5-r1.ebuild | 118 +++++++++++++++++++++
app-text/mandoc/metadata.xml | 4 +
4 files changed, 147 insertions(+)
diff --git a/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch b/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch
new file mode 100644
index 00000000000..2395f1ce66b
--- /dev/null
+++ b/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile b/Makefile
+index f4e2954..191c7e2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -535,9 +535,11 @@ soelim: $(SOELIM_OBJS)
+ # --- maintainer targets ---
+
+ www-install: www
+- $(INSTALL_DATA) mandoc.css $(HTDOCDIR)
+- $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man
+- $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
++ mkdir -p $(DESTDIR)$(HTDOCDIR)/man
++ mkdir -p $(DESTDIR)$(HTDOCDIR)/includes
++ $(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
++ $(INSTALL_DATA) $(WWW_MANS) $(DESTDIR)$(HTDOCDIR)/man
++ $(INSTALL_DATA) $(WWW_INCS) $(DESTDIR)$(HTDOCDIR)/includes
+
+ depend: config.h
+ mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
diff --git a/app-text/mandoc/files/mandoc.cron-r0 b/app-text/mandoc/files/mandoc.cron-r0
new file mode 100644
index 00000000000..78556490176
--- /dev/null
+++ b/app-text/mandoc/files/mandoc.cron-r0
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# need MANPATH
+. /etc/profile.env
+
+exec nice makewhatis -T utf8 2>/dev/null
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
new file mode 100644
index 00000000000..f138ef991ac
--- /dev/null
+++ b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of tools compiling mdoc and man"
+HOMEPAGE="https://mdocml.bsd.lv/"
+SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cgi system-man"
+
+RDEPEND="sys-libs/zlib
+ system-man? ( !sys-apps/man-db )
+"
+DEPEND="${RDEPEND}
+ cgi? ( sys-libs/zlib[static-libs] )
+"
+BDEPEND="
+ cgi? ( app-text/highlight )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch )
+
+pkg_pretend() {
+ if use system-man ; then
+ # only support uncompressed and gzip
+ [[ -n ${PORTAGE_COMPRESS+unset} ]] && \
+ [[ "${PORTAGE_COMPRESS}" == "gzip" || "${PORTAGE_COMPRESS}" == "" ]] || \
+ ewarn "only PORTAGE_COMPRESS=gzip or '' is supported, man pages will not be indexed"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # The db-install change is to support parallel installs.
+ sed -i \
+ -e '/ar rs/s:ar:$(AR):' \
+ -e '/^db-install:/s:$: base-install:' \
+ Makefile || die
+
+ # make-4.3 doesn't like the CC line (bug #706024)
+ # and "echo -n" is not portable
+ sed \
+ -e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \
+ -e 's@echo -n@printf@g' \
+ -i configure || die
+
+ cat <<-EOF > "configure.local"
+ PREFIX="${EPREFIX}/usr"
+ BINDIR="${EPREFIX}/usr/bin"
+ SBINDIR="${EPREFIX}/usr/sbin"
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+ MANDIR="${EPREFIX}/usr/share/man"
+ INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
+ EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
+ MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
+
+ CFLAGS="${CFLAGS} ${CPPFLAGS}"
+ LDFLAGS="${LDFLAGS}"
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ # The STATIC variable is only used by man.cgi.
+ STATIC=
+
+ # conflicts with sys-apps/groff
+ BINM_SOELIM=msoelim
+ MANM_ROFF=mandoc_roff
+ # conflicts with sys-apps/man-pages
+ MANM_MAN=mandoc_man
+
+ # fix utf-8 locale on musl
+ $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+ EOF
+ use system-man || cat <<-EOF >> "configure.local"
+ BINM_MAN=mman
+ BINM_APROPOS=mapropos
+ BINM_WHATIS=mwhatis
+ BINM_MAKEWHATIS=mmakewhatis
+ MANM_MDOC=mandoc_mdoc
+ MANM_EQN=mandoc_eqn
+ MANM_TBL=mandoc_tbl
+ MANM_MANCONF=mman.conf
+ EOF
+ if use cgi; then
+ cp cgi.h{.example,} || die
+ fi
+ if [[ -n "${MANDOC_CGI_H}" ]]; then
+ cp "${MANDOC_CGI_H}" cgi.h || die
+ fi
+}
+
+src_compile() {
+ default
+ use cgi && emake man.cgi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ use cgi && emake DESTDIR="${D}" cgi-install www-install
+
+ if use system-man ; then
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}"/mandoc.cron-r0 mandoc
+ fi
+}
+
+pkg_postinst() {
+ if use system-man ; then
+ elog "Generating mandoc database"
+ makewhatis || die
+ fi
+}
diff --git a/app-text/mandoc/metadata.xml b/app-text/mandoc/metadata.xml
index aebca33be17..814b35c6240 100644
--- a/app-text/mandoc/metadata.xml
+++ b/app-text/mandoc/metadata.xml
@@ -4,4 +4,8 @@
<maintainer type="project">
<email>base-system@gentoo.org</email>
</maintainer>
+ <use>
+ <flag name="cgi">build man.cgi web plugin for viewing man pages</flag>
+ <flag name="system-man">set as the default man provider</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mandoc/, app-text/mandoc/files/
@ 2021-01-03 9:58 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2021-01-03 9:58 UTC (permalink / raw
To: gentoo-commits
commit: 01e4c90edad0b1b378df8c70219190177c8f1646
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 09:58:12 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 09:58:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e4c90e
app-text/mandoc: tweak for gcc-10
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/707254
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-text/mandoc/files/mandoc-1.14.5-gcc10.patch | 54 +++++++++++++++++++++++++
app-text/mandoc/mandoc-1.14.5-r1.ebuild | 5 ++-
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch b/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
new file mode 100644
index 00000000000..6d976683772
--- /dev/null
+++ b/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
@@ -0,0 +1,54 @@
+https://cvsweb.bsd.lv/mandoc/compat_reallocarray.c.diff?r1=1.4&r2=1.5
+https://cvsweb.bsd.lv/mandoc/compat_getline.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
+
+https://bugs.gentoo.org/707254
+--- mandoc/compat_reallocarray.c 2014/12/11 09:05:01 1.4
++++ mandoc/compat_reallocarray.c 2020/06/15 01:37:15 1.5
+@@ -1,8 +1,0 @@
+-#include "config.h"
+-
+-#if HAVE_REALLOCARRAY
+-
+-int dummy;
+-
+-#else
+-
+@@ -23,6 +15,7 @@ int dummy;
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
++#include "config.h"
+
+ #include <sys/types.h>
+ #include <errno.h>
+@@ -45,5 +38,3 @@ reallocarray(void *optr, size_t nmemb, size_t size)
+ }
+ return realloc(optr, size * nmemb);
+ }
+-
+-#endif /*!HAVE_REALLOCARRAY*/
+--- mandoc/compat_getline.c 2015/11/07 20:52:52 1.1
++++ mandoc/compat_getline.c 2020/06/15 01:37:14 1.2
+@@ -1,8 +1,0 @@
+-#include "config.h"
+-
+-#if HAVE_GETLINE
+-
+-int dummy;
+-
+-#else
+-
+@@ -22,6 +14,7 @@ int dummy;
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
++#include "config.h"
+
+ #include <sys/types.h>
+ #include <errno.h>
+@@ -64,5 +57,3 @@ getline(char **buf, size_t *bufsz, FILE *fp)
+ return pos;
+ }
+ }
+-
+-#endif
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
index 21e0f962475..cdc81d93654 100644
--- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild
+++ b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
@@ -24,7 +24,10 @@ BDEPEND="
cgi? ( app-text/highlight )
"
-PATCHES=( "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch
+ "${FILESDIR}"/${PN}-1.14.5-gcc10.patch
+)
pkg_pretend() {
if use system-man ; then
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/mandoc/, app-text/mandoc/files/
@ 2022-04-17 17:06 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-04-17 17:06 UTC (permalink / raw
To: gentoo-commits
commit: 03301500197ceaa629438401d02b373a1298d03b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 16:57:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 17:05:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03301500
app-text/mandoc: drop 1.14.5-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/mandoc/Manifest | 1 -
app-text/mandoc/files/mandoc-1.14.5-gcc10.patch | 54 ----------
app-text/mandoc/mandoc-1.14.5-r1.ebuild | 125 ------------------------
3 files changed, 180 deletions(-)
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index a8738ed240ba..fbfe6541cf5b 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,2 +1 @@
-DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
DIST mandoc-1.14.6.tar.gz 697150 BLAKE2B e9f6087e9df977901815b1231f68e381502c7392b0ac65a060ce0ef270da3b76540a17931a076b700865a02f9ca1a8ca044a54dbf6318756931c29e6b1deb228 SHA512 54286070812a47b629f68757046d3c9a1bdd2b5d1c3b84a5c8e4cb92f1331afa745443f7238175835d8cfbe5b8dd442e00c75c3a5b5b8f8efd8d2ec8f636dad4
diff --git a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch b/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
deleted file mode 100644
index 6d976683772c..000000000000
--- a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://cvsweb.bsd.lv/mandoc/compat_reallocarray.c.diff?r1=1.4&r2=1.5
-https://cvsweb.bsd.lv/mandoc/compat_getline.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
-
-https://bugs.gentoo.org/707254
---- mandoc/compat_reallocarray.c 2014/12/11 09:05:01 1.4
-+++ mandoc/compat_reallocarray.c 2020/06/15 01:37:15 1.5
-@@ -1,8 +1,0 @@
--#include "config.h"
--
--#if HAVE_REALLOCARRAY
--
--int dummy;
--
--#else
--
-@@ -23,6 +15,7 @@ int dummy;
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-+#include "config.h"
-
- #include <sys/types.h>
- #include <errno.h>
-@@ -45,5 +38,3 @@ reallocarray(void *optr, size_t nmemb, size_t size)
- }
- return realloc(optr, size * nmemb);
- }
--
--#endif /*!HAVE_REALLOCARRAY*/
---- mandoc/compat_getline.c 2015/11/07 20:52:52 1.1
-+++ mandoc/compat_getline.c 2020/06/15 01:37:14 1.2
-@@ -1,8 +1,0 @@
--#include "config.h"
--
--#if HAVE_GETLINE
--
--int dummy;
--
--#else
--
-@@ -22,6 +14,7 @@ int dummy;
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-+#include "config.h"
-
- #include <sys/types.h>
- #include <errno.h>
-@@ -64,5 +57,3 @@ getline(char **buf, size_t *bufsz, FILE *fp)
- return pos;
- }
- }
--
--#endif
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
deleted file mode 100644
index e23baa856a58..000000000000
--- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="https://mdocml.bsd.lv/"
-SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cgi system-man"
-
-RDEPEND="sys-libs/zlib
- system-man? ( !sys-apps/man-db )
-"
-DEPEND="${RDEPEND}
- cgi? ( sys-libs/zlib[static-libs] )
-"
-BDEPEND="
- cgi? ( app-text/highlight )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch
- "${FILESDIR}"/${PN}-1.14.5-gcc10.patch
-)
-
-pkg_pretend() {
- if use system-man ; then
- # only support uncompressed and gzip
- [[ -n ${PORTAGE_COMPRESS+unset} ]] && \
- [[ "${PORTAGE_COMPRESS}" == "gzip" || "${PORTAGE_COMPRESS}" == "" ]] || \
- ewarn "only PORTAGE_COMPRESS=gzip or '' is supported, man pages will not be indexed"
- fi
-}
-
-src_prepare() {
- default
-
- # The db-install change is to support parallel installs.
- sed -i \
- -e '/ar rs/s:ar:$(AR):' \
- -e '/^db-install:/s:$: base-install:' \
- Makefile || die
-
- # make-4.3 doesn't like the CC line (bug #706024)
- # and "echo -n" is not portable
- sed \
- -e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \
- -e 's@echo -n@printf@g' \
- -i configure || die
-
- cat <<-EOF > "configure.local"
- PREFIX="${EPREFIX}/usr"
- BINDIR="${EPREFIX}/usr/bin"
- SBINDIR="${EPREFIX}/usr/sbin"
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- MANDIR="${EPREFIX}/usr/share/man"
- INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
- EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
- MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
-
- CFLAGS="${CFLAGS} ${CPPFLAGS}"
- LDFLAGS="${LDFLAGS}"
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- # The STATIC variable is only used by man.cgi.
- STATIC=
-
- # conflicts with sys-apps/groff
- BINM_SOELIM=msoelim
- MANM_ROFF=mandoc_roff
- # conflicts with sys-apps/man-pages
- MANM_MAN=mandoc_man
-
- # fix utf-8 locale on musl
- $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
- EOF
- use system-man || cat <<-EOF >> "configure.local"
- BINM_MAN=mman
- BINM_APROPOS=mapropos
- BINM_WHATIS=mwhatis
- BINM_MAKEWHATIS=mmakewhatis
- MANM_MDOC=mandoc_mdoc
- MANM_EQN=mandoc_eqn
- MANM_TBL=mandoc_tbl
- MANM_MANCONF=mman.conf
- EOF
- if use cgi; then
- cp cgi.h{.example,} || die
- fi
- if [[ -n "${MANDOC_CGI_H}" ]]; then
- cp "${MANDOC_CGI_H}" cgi.h || die
- fi
-
- # ./configure does not propagate all configure.local
- # settings to Makefile.local settings.
- tc-export AR
-}
-
-src_compile() {
- default
- use cgi && emake man.cgi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- use cgi && emake DESTDIR="${D}" cgi-install www-install
-
- if use system-man ; then
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/mandoc.cron-r0 mandoc
- fi
-}
-
-pkg_postinst() {
- if use system-man ; then
- elog "Generating mandoc database"
- makewhatis || die
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-17 17:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-03 9:58 [gentoo-commits] repo/gentoo:master commit in: app-text/mandoc/, app-text/mandoc/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2022-04-17 17:06 Sam James
2020-12-11 12:22 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox