* [PR PATCH] mdocml: package man.cgi.
@ 2020-04-02 18:32 leahneukirchen
2020-04-04 22:08 ` [PR PATCH] [Updated] " leahneukirchen
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: leahneukirchen @ 2020-04-02 18:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages mancgi
https://github.com/void-linux/void-packages/pull/20580
mdocml: package man.cgi.
A patch file from https://github.com/void-linux/void-packages/pull/20580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mancgi-20580.patch --]
[-- Type: text/x-diff, Size: 3238 bytes --]
From 2a5797e6af502acd7602f3d6923e7f4e083a450d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Apr 2020 20:30:52 +0200
Subject: [PATCH] mdocml: package man.cgi.
---
srcpkgs/mdocml/files/cgi.h | 5 +++++
srcpkgs/mdocml/files/void.css | 39 +++++++++++++++++++++++++++++++++++
srcpkgs/mdocml/template | 21 +++++++++++++++----
srcpkgs/void-man-cgi | 1 +
4 files changed, 62 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/mdocml/files/cgi.h
create mode 100644 srcpkgs/mdocml/files/void.css
create mode 120000 srcpkgs/void-man-cgi
diff --git a/srcpkgs/mdocml/files/cgi.h b/srcpkgs/mdocml/files/cgi.h
new file mode 100644
index 00000000000..2c4169abcbe
--- /dev/null
+++ b/srcpkgs/mdocml/files/cgi.h
@@ -0,0 +1,5 @@
+#define SCRIPT_NAME ""
+#define MAN_DIR "/home/void-man/man"
+#define CSS_DIR ""
+#define CUSTOMIZE_TITLE "Void Linux manpages"
+#define COMPAT_OLDURI No
diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css
new file mode 100644
index 00000000000..28914506699
--- /dev/null
+++ b/srcpkgs/mdocml/files/void.css
@@ -0,0 +1,39 @@
+
+/** Void style **/
+body { color: #333; }
+a { color: #478061; }
+a:hover { color: #000; }
+
+html { max-width: 100% }
+body { margin: 0 }
+#mandoc { max-width: 65em; margin: 0.8em }
+
+nav#void-nav {
+ width:100%;
+ min-height:50px;
+ background:#478061;
+ z-index:110;
+ font-size:14px
+}
+nav#void-nav ul {
+ float:right;
+ list-style:none;
+ margin:0
+}
+nav#void-nav ul li {
+ float:left;
+ margin:0;
+ clear:initial
+}
+nav#void-nav ul li a {
+ display:block;
+ padding:15px;
+ line-height:20px;
+ font-size:1.2em;
+ color:#fff;
+ text-decoration: none
+}
+nav#void-nav ul li a:hover,nav#void-nav ul li a:focus {
+ background:#000;
+ text-decoration:none
+}
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 302956d807e..5200eb54ce8 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,9 +1,11 @@
# Template file for 'mdocml'
pkgname=mdocml
version=1.14.5
-revision=4
+revision=5
wrksrc="mandoc-${version}"
build_style=configure
+make_build_args="all man.cgi"
+make_check_target="regress"
makedepends="less zlib-devel"
checkdepends="perl"
depends="less"
@@ -30,6 +32,8 @@ post_extract() {
sed -i 's,.Xr more,.Xr less,g' *.1
sed -i 's/^CC=.*/CC=cc/' configure
+ cat ${FILESDIR}/void.css >>mandoc.css
+ cp ${FILESDIR}/cgi.h .
}
pre_configure() {
cat >configure.local <<EOF
@@ -49,9 +53,6 @@ EOF
esac
}
-do_check() {
- make regress
-}
post_install() {
# Rename mans for alternatives
for f in apropos man whatis; do
@@ -67,3 +68,15 @@ post_install() {
vinstall ${FILESDIR}/makewhatis.cron.daily 755 etc/cron.daily makewhatis
vlicense LICENSE
}
+
+void-man-cgi_package() {
+ short_desc="CGI manpage formatter for man.voidlinux.org"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmkdir usr/libexec/mandoc
+ vinstall man.cgi 0755 usr/libexec/mandoc
+ vsconf mandoc.css
+ vman man.cgi.3
+ vman man.cgi.8
+ }
+}
diff --git a/srcpkgs/void-man-cgi b/srcpkgs/void-man-cgi
new file mode 120000
index 00000000000..1f8650c1440
--- /dev/null
+++ b/srcpkgs/void-man-cgi
@@ -0,0 +1 @@
+mdocml
\ No newline at end of file
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] mdocml: package man.cgi.
2020-04-02 18:32 [PR PATCH] mdocml: package man.cgi leahneukirchen
@ 2020-04-04 22:08 ` leahneukirchen
2020-04-04 22:09 ` the-maldridge
2020-04-06 11:38 ` [PR PATCH] [Merged]: " leahneukirchen
2 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2020-04-04 22:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages mancgi
https://github.com/void-linux/void-packages/pull/20580
mdocml: package man.cgi.
A patch file from https://github.com/void-linux/void-packages/pull/20580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mancgi-20580.patch --]
[-- Type: text/x-diff, Size: 3236 bytes --]
From 172565e845255e05fa3920e40e8498a2f1f755f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Apr 2020 20:30:52 +0200
Subject: [PATCH] mdocml: package man.cgi.
---
srcpkgs/mdocml/files/cgi.h | 5 +++++
srcpkgs/mdocml/files/void.css | 39 +++++++++++++++++++++++++++++++++++
srcpkgs/mdocml/template | 21 +++++++++++++++----
srcpkgs/void-man-cgi | 1 +
4 files changed, 62 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/mdocml/files/cgi.h
create mode 100644 srcpkgs/mdocml/files/void.css
create mode 120000 srcpkgs/void-man-cgi
diff --git a/srcpkgs/mdocml/files/cgi.h b/srcpkgs/mdocml/files/cgi.h
new file mode 100644
index 00000000000..d9cbd630b40
--- /dev/null
+++ b/srcpkgs/mdocml/files/cgi.h
@@ -0,0 +1,5 @@
+#define SCRIPT_NAME ""
+#define MAN_DIR "/var/lib/man-cgi"
+#define CSS_DIR ""
+#define CUSTOMIZE_TITLE "Void Linux manpages"
+#define COMPAT_OLDURI No
diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css
new file mode 100644
index 00000000000..28914506699
--- /dev/null
+++ b/srcpkgs/mdocml/files/void.css
@@ -0,0 +1,39 @@
+
+/** Void style **/
+body { color: #333; }
+a { color: #478061; }
+a:hover { color: #000; }
+
+html { max-width: 100% }
+body { margin: 0 }
+#mandoc { max-width: 65em; margin: 0.8em }
+
+nav#void-nav {
+ width:100%;
+ min-height:50px;
+ background:#478061;
+ z-index:110;
+ font-size:14px
+}
+nav#void-nav ul {
+ float:right;
+ list-style:none;
+ margin:0
+}
+nav#void-nav ul li {
+ float:left;
+ margin:0;
+ clear:initial
+}
+nav#void-nav ul li a {
+ display:block;
+ padding:15px;
+ line-height:20px;
+ font-size:1.2em;
+ color:#fff;
+ text-decoration: none
+}
+nav#void-nav ul li a:hover,nav#void-nav ul li a:focus {
+ background:#000;
+ text-decoration:none
+}
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 302956d807e..5200eb54ce8 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,9 +1,11 @@
# Template file for 'mdocml'
pkgname=mdocml
version=1.14.5
-revision=4
+revision=5
wrksrc="mandoc-${version}"
build_style=configure
+make_build_args="all man.cgi"
+make_check_target="regress"
makedepends="less zlib-devel"
checkdepends="perl"
depends="less"
@@ -30,6 +32,8 @@ post_extract() {
sed -i 's,.Xr more,.Xr less,g' *.1
sed -i 's/^CC=.*/CC=cc/' configure
+ cat ${FILESDIR}/void.css >>mandoc.css
+ cp ${FILESDIR}/cgi.h .
}
pre_configure() {
cat >configure.local <<EOF
@@ -49,9 +53,6 @@ EOF
esac
}
-do_check() {
- make regress
-}
post_install() {
# Rename mans for alternatives
for f in apropos man whatis; do
@@ -67,3 +68,15 @@ post_install() {
vinstall ${FILESDIR}/makewhatis.cron.daily 755 etc/cron.daily makewhatis
vlicense LICENSE
}
+
+void-man-cgi_package() {
+ short_desc="CGI manpage formatter for man.voidlinux.org"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmkdir usr/libexec/mandoc
+ vinstall man.cgi 0755 usr/libexec/mandoc
+ vsconf mandoc.css
+ vman man.cgi.3
+ vman man.cgi.8
+ }
+}
diff --git a/srcpkgs/void-man-cgi b/srcpkgs/void-man-cgi
new file mode 120000
index 00000000000..1f8650c1440
--- /dev/null
+++ b/srcpkgs/void-man-cgi
@@ -0,0 +1 @@
+mdocml
\ No newline at end of file
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: mdocml: package man.cgi.
2020-04-02 18:32 [PR PATCH] mdocml: package man.cgi leahneukirchen
2020-04-04 22:08 ` [PR PATCH] [Updated] " leahneukirchen
@ 2020-04-04 22:09 ` the-maldridge
2020-04-06 11:38 ` [PR PATCH] [Merged]: " leahneukirchen
2 siblings, 0 replies; 4+ messages in thread
From: the-maldridge @ 2020-04-04 22:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by the-maldridge on void-packages repository
https://github.com/void-linux/void-packages/pull/20580#issuecomment-609095688
Comment:
Looks good to me. Feel free to merge when things aren't on fire anymore.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: mdocml: package man.cgi.
2020-04-02 18:32 [PR PATCH] mdocml: package man.cgi leahneukirchen
2020-04-04 22:08 ` [PR PATCH] [Updated] " leahneukirchen
2020-04-04 22:09 ` the-maldridge
@ 2020-04-06 11:38 ` leahneukirchen
2 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2020-04-06 11:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
There's a merged pull request on the void-packages repository
mdocml: package man.cgi.
https://github.com/void-linux/void-packages/pull/20580
Description:
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-06 11:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-02 18:32 [PR PATCH] mdocml: package man.cgi leahneukirchen
2020-04-04 22:08 ` [PR PATCH] [Updated] " leahneukirchen
2020-04-04 22:09 ` the-maldridge
2020-04-06 11:38 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).