On Sat, Jul 26, 2014 at 12:57:25PM +0200, Christian Weisgerber wrote:
> Only overdue by four months: Fix devel/cvsweb's chroot instructions
> to work with the perl version we actually ship with in 5.6.
>
> While here, drop some obsolete configuration examples and tweak the
> default man.cgi URL.
>
> OK or not important?
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/cvsweb/Makefile,v
> retrieving revision 1.51
> diff -u -p -r1.51 Makefile
> --- Makefile 13 Nov 2013 19:53:08 -0000 1.51
> +++ Makefile 26 Jul 2014 10:47:12 -0000
> @@ -3,7 +3,7 @@
> COMMENT= CGI script to browse CVS repository trees
>
> DISTNAME= cvsweb-2.0.6
> -REVISION= 17
> +REVISION= 18
> CATEGORIES= devel www
> HOMEPAGE= http://www.freebsd.org/projects/cvsweb.html
>
> @@ -20,8 +20,6 @@ PKG_ARCH= *
> PREFIX= ${VARBASE}/www
> CONFDIR= ${PREFIX}/conf
>
> -CONFFILES= cvsweb.conf cvsweb.conf-freebsd cvsweb.conf-netbsd \
> - cvsweb.conf-openbsd cvsweb.conf-ruby
> ICONS= back.gif dir.gif text.gif \
> miniback.gif minidir.gif minitext.gif
>
> @@ -34,9 +32,7 @@ do-install:
> ${INSTALL_SCRIPT_DIR} ${PREFIX}/cgi-bin
> ${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/cgi-bin/cvsweb
> ${INSTALL_DATA_DIR} ${CONFDIR}/cvsweb
> -.for file in ${CONFFILES}
> - ${INSTALL_DATA} ${WRKSRC}/${file} ${CONFDIR}/cvsweb/${file}.dist
> -.endfor
> + ${INSTALL_DATA} ${WRKSRC}/cvsweb.conf ${CONFDIR}/cvsweb/cvsweb.conf.dist
> ${INSTALL_DATA_DIR} ${PREFIX}/htdocs/cvsweb/icons
> .for file in ${ICONS}
> ${INSTALL_DATA} ${WRKSRC}/icons/${file} ${PREFIX}/htdocs/cvsweb/icons/
> Index: patches/patch-cvsweb_conf
> ===================================================================
> RCS file: /cvs/ports/devel/cvsweb/patches/patch-cvsweb_conf,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-cvsweb_conf
> --- patches/patch-cvsweb_conf 29 Oct 2013 16:30:16 -0000 1.12
> +++ patches/patch-cvsweb_conf 26 Jul 2014 10:47:12 -0000
> @@ -1,16 +1,17 @@
> $OpenBSD: patch-cvsweb_conf,v 1.12 2013/10/29 16:30:16 naddy Exp $
> --- cvsweb.conf.orig Mon Sep 23 07:30:17 2002
> -+++ cvsweb.conf Mon Oct 28 23:27:17 2013
> -@@ -82,7 +82,7 @@ $cvstreedefault = $CVSrepositories[2 * 0]; # The fi
> ++++ cvsweb.conf Sat Jul 26 03:08:50 2014
> +@@ -81,8 +81,7 @@ $cvstreedefault = $CVSrepositories[2 * 0]; # The fi
> + ##############
> # Manual gateway
> ##############
> - $mancgi =
> +-$mancgi =
> -
> "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html";;
> -+
> "http://www.OpenBSD.org/cgi-bin/man.cgi?apropos=0&sektion=%s&query=%s&manpath=OpenBSD+Current&arch=i386&format=html";;
> ++$mancgi = "http://www.openbsd.org/cgi-bin/man.cgi?&sec=%s&query=%s";;
>
> ##############
> # Defaults for UserSettings
> -@@ -115,7 +115,6 @@ $mancgi =
> +@@ -115,7 +114,6 @@ $mancgi =
> # h Human readable
> # u Unified diff
> # c Context diff
> @@ -18,7 +19,7 @@ $OpenBSD: patch-cvsweb_conf,v 1.12 2013/
> "f" => "u",
>
> # hidecvsroot: Don't show the CVSROOT directory
> -@@ -200,7 +199,7 @@ EOT
> +@@ -200,7 +198,7 @@ EOT
> # These default icons are coming with apache.
> # If these icons are too large, check out the miniicons in the
> # icons/ directory; they have a width/height of 16/16
> @@ -27,7 +28,7 @@ $OpenBSD: patch-cvsweb_conf,v 1.12 2013/
>
> # format: TEXT ICON-URL width height
> %ICONS = (
> -@@ -290,19 +289,6 @@ $use_descriptions = 0;
> +@@ -290,19 +288,6 @@ $use_descriptions = 0;
> # exceed the width of the browser
> $hr_breakable = 1;
>
> @@ -47,7 +48,7 @@ $OpenBSD: patch-cvsweb_conf,v 1.12 2013/
> # ignore whitespaces for human readable diffs
> # (indendation and stuff ..)
> # ( '-w' option to diff)
> -@@ -335,7 +321,7 @@ $inputTextSize = 12;
> +@@ -335,7 +320,7 @@ $inputTextSize = 12;
> # cvsweb to guess the correct mime-type on
> # checkout; you can use the mime.types from
> # apache here:
> Index: patches/patch-cvsweb_conf-netbsd
> ===================================================================
> RCS file: patches/patch-cvsweb_conf-netbsd
> diff -N patches/patch-cvsweb_conf-netbsd
> --- patches/patch-cvsweb_conf-netbsd 7 Apr 2013 20:07:24 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-cvsweb_conf-netbsd,v 1.2 2013/04/07 20:07:24 naddy Exp $
> ---- cvsweb.conf-netbsd.orig Tue May 7 10:51:22 2002
> -+++ cvsweb.conf-netbsd Sun Apr 7 14:09:30 2013
> -@@ -65,7 +65,7 @@ $prcgi = "http://www.NetBSD.org/cgi-bin/query-pr-singl
> -
> - $prkeyword = "PR";
> -
> --$mancgi =
> "http://www.flame.org/cgi-bin/uncgi/hman?sect=%s&page=%s&arch=i386";;
> -+$mancgi = 'http://man.netbsd.org/cgi-bin/man-cgi?%2$s+%1$s+NetBSD-current';
> -
> - # Allow downloading a tarball of a pkgsrc
> - $allow_tar = ($where =~ m,^pkgsrc/[^/]+/[^/]+/,);
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/cvsweb/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 29 Oct 2013 16:30:16 -0000 1.8
> +++ pkg/PLIST 26 Jul 2014 10:47:12 -0000
> @@ -1,10 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.8 2013/10/29 16:30:16 naddy Exp $
> cgi-bin/cvsweb
> conf/cvsweb/
> -conf/cvsweb/cvsweb.conf-freebsd.dist
> -conf/cvsweb/cvsweb.conf-netbsd.dist
> -conf/cvsweb/cvsweb.conf-openbsd.dist
> -conf/cvsweb/cvsweb.conf-ruby.dist
> conf/cvsweb/cvsweb.conf.dist
> @sample ${CONFDIR}/cvsweb/cvsweb.conf
> htdocs/cvsweb/
> Index: pkg/README
> ===================================================================
> RCS file: /cvs/ports/devel/cvsweb/pkg/README,v
> retrieving revision 1.8
> diff -u -p -r1.8 README
> --- pkg/README 13 Nov 2013 19:53:08 -0000 1.8
> +++ pkg/README 26 Jul 2014 10:47:12 -0000
> @@ -22,7 +22,7 @@ cd /var/www/usr
> mkdir -p bin lib libdata/perl5 libexec
>
> cd /var/www/usr/libdata/perl5
> -mkdir -p File IPC Time warnings `arch -s`-openbsd/5.16.3/auto/Fcntl unicore
> +mkdir -p File IPC Time warnings `arch -s`-openbsd/5.18.2/auto/Fcntl unicore
>
> # The "annotate" function requires this empty file:
> #
> @@ -64,12 +64,12 @@ cp -p /usr/libdata/perl5/Time/Local.pm .
> cp -p /usr/libdata/perl5/warnings/register.pm ./warnings/
> cp -p /usr/libdata/perl5/XSLoader.pm .
>
> -cd /var/www/usr/libdata/perl5/`arch -s`-openbsd/5.16.3
> -cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.16.3/{Config,Cwd}.pm .
> -cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.16.3/Config_{git,heavy}.pl .
> -cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.16.3/DynaLoader.pm .
> -cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.16.3/Fcntl.pm .
> -cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.16.3/auto/Fcntl/Fcntl.{bs,so} \
> +cd /var/www/usr/libdata/perl5/`arch -s`-openbsd/5.18.2
> +cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.18.2/{Config,Cwd}.pm .
> +cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.18.2/Config_{git,heavy}.pl .
> +cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.18.2/DynaLoader.pm .
> +cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.18.2/Fcntl.pm .
> +cp -p /usr/libdata/perl5/`arch -s`-openbsd/5.18.2/auto/Fcntl/Fcntl.{bs,so} \
> ./auto/Fcntl/
>
> # Editing cvsweb and cvsweb.conf
> --
> Christian "naddy" Weisgerber na...@mips.inka.de
Sure
