source@mandoc.bsd.lv
 help / color / mirror / Atom feed
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: cvsweb: Switch the order of the name and the section in the $mancgi
Date: Thu, 21 Mar 2019 14:32:38 -0500 (EST)	[thread overview]
Message-ID: <e3fc85b9dc5ae1b7@fantadrom.bsd.lv> (raw)

Log Message:
-----------
Switch the order of the name and the section
in the $mancgi configuration variable.
For the new man.openbsd.org URI syntax, the name must come first.
For the old query syntax, both orders work just fine.

Also switch the default man.cgi site to OpenBSD
because FreeBSD no longer uses CVSweb.

Tags:
----
FreeBSD-cvsweb-2_0-branch

Modified Files:
--------------
    cvsweb:
        cvsweb.cgi
        cvsweb.conf
        cvsweb.conf-freebsd
        cvsweb.conf-netbsd
        cvsweb.conf-openbsd

Revision Data
-------------
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 3.119.2.13
retrieving revision 3.119.2.14
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r3.119.2.13 -r3.119.2.14
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -1352,7 +1352,7 @@ sub htmlify($;$) {
 		 }{
 		     my($text, $name, $section) = ($1, $2, defined($3) ? $3 : $4);
 			 ($name =~ /[A-Za-z]/ && $name !~ /\.(:|$)/)
-			     ? &link($text, sprintf($mancgi, $section, $name))
+			     ? &link($text, sprintf($mancgi, $name, $section))
 				 : $text;
 		 }egx;
 			    }
Index: cvsweb.conf-netbsd
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.conf-netbsd,v
retrieving revision 3.7
retrieving revision 3.7.2.1
diff -Lcvsweb.conf-netbsd -Lcvsweb.conf-netbsd -u -p -r3.7 -r3.7.2.1
--- cvsweb.conf-netbsd
+++ cvsweb.conf-netbsd
@@ -65,7 +65,7 @@ $prcgi = "http://www.NetBSD.org/cgi-bin/
 
 $prkeyword = "PR";
 
-$mancgi = "http://www.flame.org/cgi-bin/uncgi/hman?sect=%s&page=%s&arch=i386";
+$mancgi = "http://www.flame.org/cgi-bin/uncgi/hman?page=%s&sect=%s&arch=i386";
 
 # Allow downloading a tarball of a pkgsrc
 $allow_tar = ($where =~ m,^pkgsrc/[^/]+/[^/]+/,);
Index: cvsweb.conf
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.conf,v
retrieving revision 3.36.2.5
retrieving revision 3.36.2.6
diff -Lcvsweb.conf -Lcvsweb.conf -u -p -r3.36.2.5 -r3.36.2.6
--- cvsweb.conf
+++ cvsweb.conf
@@ -81,8 +81,7 @@ $cvstreedefault = $CVSrepositories[2 * 0
 ##############
 # Manual gateway
 ##############
-$mancgi =
-    "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html";
+$mancgi = "https://man.openbsd.org/%s.%s";
 
 ##############
 # Defaults for UserSettings
Index: cvsweb.conf-freebsd
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.conf-freebsd,v
retrieving revision 3.7.2.1
retrieving revision 3.7.2.2
diff -Lcvsweb.conf-freebsd -Lcvsweb.conf-freebsd -u -p -r3.7.2.1 -r3.7.2.2
--- cvsweb.conf-freebsd
+++ cvsweb.conf-freebsd
@@ -38,7 +38,7 @@ $prcgi = "http://www.FreeBSD.org/cgi/que
 $prkeyword = "PR";
 
 $mancgi =
-    "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html";
+    "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&query=%s&sektion=%s&manpath=FreeBSD+5.0-current&format=html";
 
 # Allow downloading a tarball of a port or a project directory
 $allow_tar = ($where =~ m,^(ports/[^/]+/[^/]+/|projects/[^/]+/),);
Index: cvsweb.conf-openbsd
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.conf-openbsd,v
retrieving revision 3.7
retrieving revision 3.7.2.1
diff -Lcvsweb.conf-openbsd -Lcvsweb.conf-openbsd -u -p -r3.7 -r3.7.2.1
--- cvsweb.conf-openbsd
+++ cvsweb.conf-openbsd
@@ -35,8 +35,7 @@ $prcgi = "http://cvs.openbsd.org/cgi-bin
 
 $prkeyword = "PR";
 
-$mancgi =
-    "http://www.openbsd.org/cgi-bin/man.cgi?apropos=0&sektion=%s&query=%s&manpath=OpenBSD+Current&arch=i386&format=html";
+$mancgi = "https://man.openbsd.org/%s.%s";
 
 # Allow downloading a tarball of a port
 $allow_tar = ($where =~ m,^ports/[^/]+/[^/]+/,);
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv

                 reply	other threads:[~2019-03-21 19:32 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e3fc85b9dc5ae1b7@fantadrom.bsd.lv \
    --to=schwarze@mandoc.bsd.lv \
    --cc=source@mandoc.bsd.lv \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).