cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More perl 5.16 fixes:

Browse Source 
* Add further modules to README so that "annotate" will work.
* Fix a deprecation warning.
ok tobias@, sthen@
This commit is contained in:
naddy 2013-04-07 20:07:24 +00:00
parent 8b0159cc91
commit 264af6cd73
5 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/cvsweb/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.45 2013/04/01 20:20:22 tobias Exp $
# $OpenBSD: Makefile,v 1.46 2013/04/07 20:07:24 naddy Exp $
COMMENT= WWW CGI script to browse CVS repository trees
DISTNAME= cvsweb-2.0.6
REVISION = 12
REVISION = 13
CATEGORIES= devel www
HOMEPAGE= http://www.freebsd.org/projects/cvsweb.html

23
devel/cvsweb/patches/patch-cvsweb_cgi
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-cvsweb_cgi,v 1.12 2006/02/04 17:01:36 naddy Exp $
$OpenBSD: patch-cvsweb_cgi,v 1.13 2013/04/07 20:07:24 naddy Exp $
--- cvsweb.cgi.orig Thu Sep 26 22:56:05 2002
+++ cvsweb.cgi Sat Feb 4 17:33:35 2006
+++ cvsweb.cgi Sun Apr 7 14:15:55 2013
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!/usr/bin/perl -w
@ -16,7 +16,7 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/02/04 17:01:36 naddy Exp $
if (defined($_) && -r $_) {
$config = $_;
last;
@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{T
@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{TMPDIR} : "/var
$LOG_FILESEPARATOR = q/^={77}$/;
$LOG_REVSEPARATOR = q/^-{28}$/;
@ -37,11 +37,10 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/02/04 17:01:36 naddy Exp $
);
@LOGSORTKEYS = qw(cvs date rev);
@@ -2013,20 +2008,6 @@ sub doDiff($$$$$$) {
@@ -2014,20 +2009,6 @@ sub doDiff($$$$$$) {
my @difftype = @{$difftype->{'opts'}};
my $human_readable = $difftype->{'colored'};
-
- # apply special options
- if ($showfunc) {
- push @difftype, '-p' if $f ne 's';
@ -55,6 +54,16 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/02/04 17:01:36 naddy Exp $
- }
- }
- }
-
if ($human_readable) {
if ($hr_ignwhite) {
push @difftype, '-w';
@@ -2658,7 +2639,7 @@ sub printLog($;$) {
if (/^1\.1\.1\.\d+$/) {
print " <i>(vendor branch)</i>";
}
- if (defined @mytz) {
+ if (@mytz) {
my ($est) = $mytz[(localtime($date{$_}))[8]];
print ", <i>", scalar localtime($date{$_}), " $est</i> (";
} else {

6
devel/cvsweb/patches/patch-cvsweb_conf
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cvsweb_conf,v 1.10 2006/02/04 17:01:36 naddy Exp $
$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 Sat Feb 4 17:51:39 2006
@@ -82,7 +82,7 @@ $cvstreedefault = $CVSrepositories[2 * 0
+++ cvsweb.conf Sun Apr 7 14:09:30 2013
@@ -82,7 +82,7 @@ $cvstreedefault = $CVSrepositories[2 * 0]; # The fi
# Manual gateway
##############
$mancgi =

8
devel/cvsweb/patches/patch-cvsweb_conf-netbsd
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cvsweb_conf-netbsd,v 1.1 2006/02/04 17:01:36 naddy Exp $
--- cvsweb.conf-netbsd.orig Sat Feb 4 17:41:58 2006
+++ cvsweb.conf-netbsd Sat Feb 4 17:42:17 2006
@@ -65,7 +65,7 @@ $prcgi = "http://www.NetBSD.org/cgi-bin/
$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";

9
devel/cvsweb/pkg/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.4 2013/04/01 20:20:22 tobias Exp $
$OpenBSD: README,v 1.5 2013/04/07 20:07:24 naddy Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -20,7 +20,7 @@ $ cd /var/www/usr
# mkdir -p {bin,lib,libdata/perl5,libexec}
$ cd /var/www/usr/libdata/perl5
# mkdir -p {File,IPC,Time,warnings,`machine`-openbsd/5.16.3,unicore}
# mkdir -p {File,IPC,Time,warnings,`machine`-openbsd/5.16.3/auto/Fcntl,unicore}
The "annotate" function requires this empty file:
@ -60,10 +60,15 @@ $ cd /var/www/usr/libdata/perl5
# cp -p /usr/libdata/perl5/IPC/Open{2,3}.pm ./IPC/
# cp -p /usr/libdata/perl5/Time/Local.pm ./Time/
# cp -p /usr/libdata/perl5/warnings/register.pm ./warnings/
# cp -p /usr/libdata/perl5/XSLoader.pm .
$ cd /var/www/usr/libdata/perl5/`machine`-openbsd/5.16.3
# cp -p /usr/libdata/perl5/`machine`-openbsd/5.16.3/{Config,Cwd}.pm .
# cp -p /usr/libdata/perl5/`machine`-openbsd/5.16.3/Config_{git,heavy}.pl .
# cp -p /usr/libdata/perl5/`machine`-openbsd/5.16.3/DynaLoader.pm .
# cp -p /usr/libdata/perl5/`machine`-openbsd/5.16.3/Fcntl.pm .
# cp -p /usr/libdata/perl5/`machine`-openbsd/5.16.3/auto/Fcntl/Fcntl.{bs,so} \
./auto/Fcntl/
Editing cvsweb and cvsweb.conf
------------------------------