Port changes:
- Install icons.
- Additional MASTER_SITES.
Update to 1.104.1.55:
- Move configuration files to cvsweb subdirectory.
- Add cvsweb.conf-{freebsd,netbsd,openbsd,ruby} examples.
- Add $prkeyword variable to specify the bug report identifier.
- Run under perl -T.
- Turn $allow_compress off by default.
- Miscellaneous fixes.
This commit is contained in:
naddy
parent
464f24c4b6
commit
3fda67d88c
@ -1,7 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2000/12/30 15:39:13 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2001/01/03 00:51:40 naddy Exp $
|
||||
# $FreeBSD: ports/devel/cvsweb/Makefile,v 1.28 2000/09/23 20:48:45 knu Exp $
|
||||
|
||||
DISTNAME= cvsweb-1.104.1.52
|
||||
DISTNAME= cvsweb-1.104.1.55
|
||||
CATEGORIES= devel www
|
||||
NEED_VERSION= 1.340
|
||||
HOMEPAGE= http://stud.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi/
|
||||
@ -13,7 +13,10 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/knu/
|
||||
MASTER_SITES= ftp://ftp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
|
||||
ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
|
||||
ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
|
||||
MASTER_SITE_SUBDIR= ports/local-distfiles/knu
|
||||
|
||||
NO_BUILD= Yes
|
||||
WRKDIST= ${WRKDIR}/cvsweb
|
||||
@ -21,13 +24,24 @@ WRKDIST= ${WRKDIR}/cvsweb
|
||||
PREFIX= /var/www
|
||||
SYSCONFDIR= ${PREFIX}/conf
|
||||
|
||||
CONFFILES= cvsweb.conf cvsweb.conf-ruby \
|
||||
cvsweb.conf-freebsd cvsweb.conf-openbsd cvsweb.conf-netbsd
|
||||
ICONS= back.gif dir.gif text.gif \
|
||||
miniback.gif minidir.gif minitext.gif
|
||||
|
||||
do-configure:
|
||||
perl -i -pe 's@%%SYSCONFDIR%%@${SYSCONFDIR}@g' ${WRKSRC}/cvsweb.cgi
|
||||
@perl -i -pe 's@%%SYSCONFDIR%%@${SYSCONFDIR}@g' ${WRKSRC}/cvsweb.cgi
|
||||
|
||||
do-install:
|
||||
${INSTALL_SCRIPT_DIR} ${PREFIX}/cgi-bin
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/cgi-bin/cvsweb
|
||||
${INSTALL_DATA_DIR} ${SYSCONFDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/cvsweb.conf ${SYSCONFDIR}/cvsweb.conf-dist
|
||||
${INSTALL_DATA_DIR} ${SYSCONFDIR}/cvsweb
|
||||
.for file in ${CONFFILES}
|
||||
${INSTALL_DATA} ${WRKSRC}/${file} ${SYSCONFDIR}/cvsweb/${file}.dist
|
||||
.endfor
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/icons/cvsweb
|
||||
.for file in ${ICONS}
|
||||
${INSTALL_DATA} ${WRKSRC}/icons/${file} ${PREFIX}/icons/cvsweb/${file}
|
||||
.endfor
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (cvsweb-1.104.1.52.tar.gz) = 970ca8be46c72003bfa62788f8211ebb
|
||||
RMD160 (cvsweb-1.104.1.52.tar.gz) = 1dda9b2f304a259880c67fc9a79be5e6222e66a9
|
||||
SHA1 (cvsweb-1.104.1.52.tar.gz) = 16c371680cfe493f5dbdde59002f88bf5a10e35a
|
||||
MD5 (cvsweb-1.104.1.55.tar.gz) = 673b28f85d9c69803124331017b91c6a
|
||||
RMD160 (cvsweb-1.104.1.55.tar.gz) = 68ab1d6c87a498300caad9fb689a801743d20be4
|
||||
SHA1 (cvsweb-1.104.1.55.tar.gz) = eed08cbf079c034495ecbfbd31328cbbdc5c2e79
|
||||
|
||||
@ -1,18 +1,12 @@
|
||||
$OpenBSD: patch-cvsweb_cgi,v 1.4 2000/12/30 15:39:13 naddy Exp $
|
||||
--- cvsweb.cgi.orig Sat Dec 30 00:56:39 2000
|
||||
+++ cvsweb.cgi Sat Dec 30 14:59:57 2000
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/perl5 -ws
|
||||
+#!/usr/bin/perl -ws
|
||||
#
|
||||
# cvsweb - a CGI interface to CVS trees.
|
||||
#
|
||||
@@ -136,7 +136,7 @@ use Cwd;
|
||||
$OpenBSD: patch-cvsweb_cgi,v 1.5 2001/01/03 00:51:41 naddy Exp $
|
||||
--- cvsweb.cgi.orig Tue Jan 2 22:59:29 2001
|
||||
+++ cvsweb.cgi Tue Jan 2 23:08:01 2001
|
||||
@@ -138,7 +138,7 @@ use File::Basename;
|
||||
# Locations to search for user configuration, in order:
|
||||
for (
|
||||
$ENV{CVSWEB_CONFIG},
|
||||
- '/usr/local/etc/cvsweb.conf',
|
||||
+ '%%SYSCONFDIR%%/cvsweb.conf',
|
||||
getcwd() . '/cvsweb.conf'
|
||||
(dirname $0) . '/cvsweb.conf',
|
||||
- '/usr/local/etc/cvsweb.conf'
|
||||
+ '%%SYSCONFDIR%%/cvsweb/cvsweb.conf'
|
||||
) {
|
||||
$config = $_ if defined($_) && -r $_;
|
||||
if (defined($_) && -r $_) {
|
||||
($config) = /(.*)/; # untaint
|
||||
|
||||
@ -1,79 +1,16 @@
|
||||
$OpenBSD: patch-cvsweb_conf,v 1.2 2000/12/30 15:39:13 naddy Exp $
|
||||
--- cvsweb.conf.orig Sat Dec 30 00:42:29 2000
|
||||
+++ cvsweb.conf Sat Dec 30 15:00:14 2000
|
||||
@@ -26,12 +26,12 @@
|
||||
# 'symbolic_name' 'path_to_the_actual_repository'
|
||||
%CVSROOT = (
|
||||
'local' => '/home/cvs',
|
||||
- 'freebsd' => '/home/ncvs',
|
||||
+ 'openbsd' => '/home/ncvs',
|
||||
);
|
||||
|
||||
%CVSROOTdescr = (
|
||||
'local' => 'Local Repository',
|
||||
- 'freebsd' => 'FreeBSD',
|
||||
+ 'openbsd' => 'OpenBSD',
|
||||
);
|
||||
|
||||
# This tree is enabled by default when
|
||||
@@ -42,28 +42,32 @@ $cvstreedefault = 'local';
|
||||
# PR categoties
|
||||
##############
|
||||
@prcategories = qw(
|
||||
- advocacy
|
||||
- alpha
|
||||
- bin
|
||||
- conf
|
||||
- docs
|
||||
- gnu
|
||||
- i386
|
||||
- kern
|
||||
- misc
|
||||
+ system
|
||||
+ user
|
||||
+ library
|
||||
+ documentation
|
||||
ports
|
||||
+ kernel
|
||||
sparc
|
||||
+ i386
|
||||
+ m68k
|
||||
+ mips
|
||||
+ ppc
|
||||
+ arm
|
||||
+ alpha
|
||||
+ ns32k
|
||||
+ vax
|
||||
);
|
||||
|
||||
##############
|
||||
# query-pr.cgi
|
||||
##############
|
||||
-$prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi?pr=%s";
|
||||
+$prcgi = "http://cvs.openbsd.org/cgi-bin/wwwgnats.pl/full?pr=%s";
|
||||
|
||||
##############
|
||||
# man.cgi
|
||||
##############
|
||||
-$mancgi = "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html";
|
||||
+$mancgi = "http://www.openbsd.org/cgi-bin/man.cgi?apropos=0&sektion=%s&query=%s&manpath=OpenBSD+Current&format=html";
|
||||
|
||||
##############
|
||||
# Defaults for UserSettings
|
||||
@@ -194,9 +198,9 @@ EOT
|
||||
$OpenBSD: patch-cvsweb_conf,v 1.3 2001/01/03 00:51:41 naddy Exp $
|
||||
--- cvsweb.conf.orig Tue Jan 2 23:10:01 2001
|
||||
+++ cvsweb.conf Wed Jan 3 00:04:41 2001
|
||||
@@ -200,7 +200,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
|
||||
# format: TEXT ICON-URL width height
|
||||
-my $iconsdir = "/icons";
|
||||
+my $iconsdir = "/icons/cvsweb";
|
||||
# format: TEXT ICON-URL width height
|
||||
%ICONS = (
|
||||
- back => [ ("[BACK]", "/icons/cvsweb/back.gif", 20, 22) ],
|
||||
- dir => [ ("[DIR]", "/icons/cvsweb/dir.gif", 20, 22) ],
|
||||
- file => [ ("[TXT]", "/icons/cvsweb/text.gif", 20, 22) ],
|
||||
+ back => [ ("[BACK]", "/icons/back.gif", 20, 22) ],
|
||||
+ dir => [ ("[DIR]", "/icons/dir.gif", 20, 22) ],
|
||||
+ file => [ ("[TXT]", "/icons/text.gif", 20, 22) ],
|
||||
);
|
||||
|
||||
# the length to which the last logentry should
|
||||
@@ -309,7 +313,7 @@ $inputTextSize = 12;
|
||||
back => [ ("[BACK]", "$iconsdir/back.gif", 20, 22) ],
|
||||
@@ -320,7 +320,7 @@ $inputTextSize = 12;
|
||||
# cvsweb to guess the correct mime-type on
|
||||
# checkout; you can use the mime.types from
|
||||
# apache here:
|
||||
@ -82,7 +19,16 @@ $OpenBSD: patch-cvsweb_conf,v 1.2 2000/12/30 15:39:13 naddy Exp $
|
||||
|
||||
# quick mime-type lookup; maps file-suffices to
|
||||
# mime-types for displaying checkouts in the browser.
|
||||
@@ -438,7 +442,7 @@ $allow_tar = '';
|
||||
@@ -392,7 +392,7 @@ $edit_option_form = (not $dirtable);
|
||||
# cvs, rlog, rcsdiff
|
||||
# gzip (if you enable $allow_compress)
|
||||
# tar,rm (if you enable $allow_tar)
|
||||
-$ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
|
||||
+$ENV{'PATH'} = '/bin:/usr/bin';
|
||||
|
||||
# If you have files which automatically refers to other files
|
||||
# (such as HTML) then this allows you to browse the checked
|
||||
@@ -451,7 +451,7 @@ $allow_tar = '';
|
||||
# GNU tar has some useful options against unexpected errors.
|
||||
|
||||
# Options to pass to cvs(1).
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: DEINSTALL,v 1.1.1.1 2000/10/01 19:18:53 naddy Exp $
|
||||
# $OpenBSD: DEINSTALL,v 1.2 2001/01/03 00:51:41 naddy Exp $
|
||||
#
|
||||
# De-installation setup of cvsweb
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
set -e
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
PREFIX=${PKG_PREFIX:-/var/www}
|
||||
CONFIG_FILE=${SYSCONFDIR}/cvsweb.conf
|
||||
CONFIG_DIR=${SYSCONFDIR}/cvsweb
|
||||
|
||||
# Function: tell the user what they need to do to delete the port completely
|
||||
#
|
||||
@ -16,13 +16,13 @@ do_notice()
|
||||
{
|
||||
echo
|
||||
echo "+---------------"
|
||||
echo "| To completely deinstall the $1 package you need to perform"
|
||||
echo "| these steps as root:"
|
||||
echo "| To completely deinstall the $1 package"
|
||||
echo "| you need to perform these steps as root:"
|
||||
echo "|"
|
||||
echo "| rm -f ${CONFIG_FILE}"
|
||||
echo "| rm -rf ${CONFIG_DIR}"
|
||||
echo "|"
|
||||
echo "| Do not do this if you plan on re-installing $1"
|
||||
echo "| at some future time."
|
||||
echo "| Do not do this if you plan on re-installing"
|
||||
echo "| $1 at some future time."
|
||||
echo "+---------------"
|
||||
echo
|
||||
}
|
||||
@ -38,7 +38,7 @@ fi
|
||||
#
|
||||
case $2 in
|
||||
DEINSTALL)
|
||||
if [ -f ${CONFIG_FILE} ]; then
|
||||
if [ -e ${CONFIG_DIR} ]; then
|
||||
do_notice "$1"
|
||||
fi
|
||||
;;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: INSTALL,v 1.1.1.1 2000/10/01 19:18:53 naddy Exp $
|
||||
# $OpenBSD: INSTALL,v 1.2 2001/01/03 00:51:41 naddy Exp $
|
||||
#
|
||||
# Pre/post-installation setup of cvsweb
|
||||
|
||||
@ -8,8 +8,9 @@
|
||||
set -e
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
PREFIX=${PKG_PREFIX:-/var/www}
|
||||
CONFIG_FILE=${SYSCONFDIR}/cvsweb.conf
|
||||
SAMPLE_CONFIG_FILE=${CONFIG_FILE}-dist
|
||||
CONFIG_DIR=${SYSCONFDIR}/cvsweb
|
||||
CONFIG_FILE=$CONFIG_DIR/cvsweb.conf
|
||||
SAMPLE_CONFIG_FILE=$CONFIG_FILE.dist
|
||||
|
||||
# Function: tell the user what they need to do to use the port just installed
|
||||
#
|
||||
@ -17,9 +18,11 @@ do_notice()
|
||||
{
|
||||
echo
|
||||
echo "+---------------"
|
||||
echo "| The existing $1 configuration file, ${CONFIG_FILE},"
|
||||
echo "| has NOT been changed. You may want to compare it to the"
|
||||
echo "| current sample file ${SAMPLE_CONFIG_FILE}"
|
||||
echo "| The existing $1 configuration file,"
|
||||
echo "| $CONFIG_FILE,"
|
||||
echo "| has NOT been changed. You may want to"
|
||||
echo "| compare it to the current sample file"
|
||||
echo "| $SAMPLE_CONFIG_FILE"
|
||||
echo "| and update your configuration as needed."
|
||||
echo "+---------------"
|
||||
echo
|
||||
@ -29,12 +32,14 @@ do_notice()
|
||||
#
|
||||
do_install()
|
||||
{
|
||||
install -o root -g wheel ${SAMPLE_CONFIG_FILE} ${CONFIG_FILE}
|
||||
install -o root -g wheel -d $CONFIG_DIR
|
||||
install -o root -g wheel $SAMPLE_CONFIG_FILE $CONFIG_FILE
|
||||
echo
|
||||
echo "+---------------"
|
||||
echo "| The $1 configuration file, ${CONFIG_FILE},"
|
||||
echo "| has been installed. Please view this file and change"
|
||||
echo "| the configuration to meet your needs"
|
||||
echo "| The $1 configuration file,"
|
||||
echo "| $CONFIG_FILE,"
|
||||
echo "| has been installed. Please view this file and"
|
||||
echo "| change the configuration to meet your needs"
|
||||
echo "+---------------"
|
||||
echo
|
||||
}
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2000/10/01 19:18:53 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2001/01/03 00:51:41 naddy Exp $
|
||||
cgi-bin/cvsweb
|
||||
conf/cvsweb.conf-dist
|
||||
conf/cvsweb/cvsweb.conf.dist
|
||||
conf/cvsweb/cvsweb.conf-freebsd.dist
|
||||
conf/cvsweb/cvsweb.conf-netbsd.dist
|
||||
conf/cvsweb/cvsweb.conf-openbsd.dist
|
||||
conf/cvsweb/cvsweb.conf-ruby.dist
|
||||
icons/cvsweb/back.gif
|
||||
icons/cvsweb/dir.gif
|
||||
icons/cvsweb/miniback.gif
|
||||
icons/cvsweb/minidir.gif
|
||||
icons/cvsweb/minitext.gif
|
||||
icons/cvsweb/text.gif
|
||||
@dirrm icons/cvsweb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user