On Monday 28 October 2013 23:37:17 Christian Weisgerber wrote: > Remco <re...@d-compu.dyndns.org> wrote: > > I tried out cvsweb on OpenBSD 5.4 and noticed the icons left of the > > "File" items were missing. cvsweb installs its icons under > > /var/www/htdocs/icons/ where the base system's icons are installed in > > /var/www/icons/. Moving cvsweb's icons under /var/www/icons/ made them > > pop up in cvsweb. > > > > The CVS log shows that the icons were moved from /var/www/icons/ > > to /var/www/htdocs/icons/ in PLIST revision 1.7 and Makefile revision > > 1.47. > > Yes. /var/www/icons/ is an Apache directory. Presumably it will > disappear with the base httpd, and nginx doesn't have access to it > by default. That's why I moved the icons when I switched my cvsweb > setup to nginx. > > Alas, it completely slipped my mind that httpd still defaults to > mapping a /icons/ prefix in URLs to /var/www/icons/, so it in turn > doesn't have access to /var/www/htdocs/icons/. > > I guess the best solution is to switch to a different path. > How does /cvsweb/icons/ sound? >
With Apache's /icons/ mapping in mind, I think this is fine. Your patch works for me, thanks > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/cvsweb/Makefile,v > retrieving revision 1.49 > diff -u -p -r1.49 Makefile > --- Makefile 13 Aug 2013 16:47:25 -0000 1.49 > +++ Makefile 28 Oct 2013 22:34:52 -0000 > @@ -3,7 +3,7 @@ > COMMENT= CGI script to browse CVS repository trees > > DISTNAME= cvsweb-2.0.6 > -REVISION = 15 > +REVISION = 16 > CATEGORIES= devel www > HOMEPAGE= http://www.freebsd.org/projects/cvsweb.html > > @@ -37,9 +37,9 @@ do-install: > .for file in ${CONFFILES} > ${INSTALL_DATA} ${WRKSRC}/${file} ${CONFDIR}/cvsweb/${file}.dist > .endfor > - ${INSTALL_DATA_DIR} ${PREFIX}/htdocs/icons/cvsweb > + ${INSTALL_DATA_DIR} ${PREFIX}/htdocs/cvsweb/icons > .for file in ${ICONS} > - ${INSTALL_DATA} ${WRKSRC}/icons/${file} ${PREFIX}/htdocs/icons/cvsweb/ > + ${INSTALL_DATA} ${WRKSRC}/icons/${file} ${PREFIX}/htdocs/cvsweb/icons/ > .endfor > > .include <bsd.port.mk> > Index: patches/patch-cvsweb_conf > =================================================================== > RCS file: /cvs/ports/devel/cvsweb/patches/patch-cvsweb_conf,v > retrieving revision 1.11 > diff -u -p -r1.11 patch-cvsweb_conf > --- patches/patch-cvsweb_conf 7 Apr 2013 20:07:24 -0000 1.11 > +++ patches/patch-cvsweb_conf 28 Oct 2013 22:34:52 -0000 > @@ -1,6 +1,6 @@ > $OpenBSD: patch-cvsweb_conf,v 1.11 2013/04/07 20:07:24 naddy Exp $ > --- cvsweb.conf.orig Mon Sep 23 07:30:17 2002 > -+++ cvsweb.conf Sun Apr 7 14:09:30 2013 > ++++ cvsweb.conf Mon Oct 28 23:27:17 2013 > @@ -82,7 +82,7 @@ $cvstreedefault = $CVSrepositories[2 * 0]; # The fi > # Manual gateway > ############## > @@ -23,7 +23,7 @@ $OpenBSD: patch-cvsweb_conf,v 1.11 2013/ > # If these icons are too large, check out the miniicons in the > # icons/ directory; they have a width/height of 16/16 > -my $iconsdir = "/icons"; > -+my $iconsdir = "/icons/cvsweb"; > ++my $iconsdir = "/cvsweb/icons"; > > # format: TEXT ICON-URL width height > %ICONS = ( > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/devel/cvsweb/pkg/PLIST,v > retrieving revision 1.7 > diff -u -p -r1.7 PLIST > --- pkg/PLIST 2 Jun 2013 19:09:09 -0000 1.7 > +++ pkg/PLIST 28 Oct 2013 22:34:52 -0000 > @@ -7,13 +7,13 @@ conf/cvsweb/cvsweb.conf-openbsd.dist > conf/cvsweb/cvsweb.conf-ruby.dist > conf/cvsweb/cvsweb.conf.dist > @sample ${CONFDIR}/cvsweb/cvsweb.conf > -htdocs/icons/ > -htdocs/icons/cvsweb/ > -htdocs/icons/cvsweb/back.gif > -htdocs/icons/cvsweb/dir.gif > -htdocs/icons/cvsweb/miniback.gif > -htdocs/icons/cvsweb/minidir.gif > -htdocs/icons/cvsweb/minitext.gif > -htdocs/icons/cvsweb/text.gif > +htdocs/cvsweb/ > +htdocs/cvsweb/icons/ > +htdocs/cvsweb/icons/back.gif > +htdocs/cvsweb/icons/dir.gif > +htdocs/cvsweb/icons/miniback.gif > +htdocs/cvsweb/icons/minidir.gif > +htdocs/cvsweb/icons/minitext.gif > +htdocs/cvsweb/icons/text.gif > @cwd ${LOCALBASE}/share/doc/pkg-readmes > ${FULLPKGNAME}
