[Midnightbsd-cvs] mports: devel/cvsweb3: the first of possibly many perl 5.10

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Oct 11 12:12:35 EDT 2008


Log Message:
-----------
the first of possibly many perl 5.10 compatibiility patches.  What did they do

Modified Files:
--------------
    mports/devel/cvsweb3:
        Makefile (r1.3 -> r1.4)

Added Files:
-----------
    mports/devel/cvsweb3/files:
        extra-patch-perl5.10 (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/cvsweb3/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/cvsweb3/Makefile -L devel/cvsweb3/Makefile -u -r1.3 -r1.4
--- devel/cvsweb3/Makefile
+++ devel/cvsweb3/Makefile
@@ -8,8 +8,9 @@
 
 PORTNAME=	cvsweb
 PORTVERSION=	3.0.6
+PORTREVISION=	1
 CATEGORIES=	devel www
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL} \
 		http://people.FreeBSD.org/~scop/cvsweb/
 MASTER_SITE_SUBDIR=	scop
 
@@ -38,8 +39,9 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+#perl 5.10 fixes
+.if ${PERL_LEVEL} > 500800
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-perl5.10
 .endif
 
 # Specify where your repository belongs.
@@ -52,15 +54,15 @@
 TITLE?=		My CVS Repository
 
 # Specify these directories in relative paths to ${PREFIX}.
-.if exists(${PREFIX}/www/cgi-bin)
+.if exists(${TRUE_PREFIX}/www/cgi-bin)
 CGIDIR?=	www/cgi-bin
 ICONSDIR?=	www/icons
 CSSDIR?=	www/data/css
-.elif exists(${PREFIX}/www/apache22/cgi-bin)
+.elif exists(${TRUE_PREFIX}/www/apache22/cgi-bin)
 CGIDIR?=       www/apache22/cgi-bin
 ICONSDIR?=     www/apache22/icons
 CSSDIR?=       www/apache22/data/css
-.elif exists(${PREFIX}/apache/cgi-bin)
+.elif exists(${TRUE_PREFIX}/apache/cgi-bin)
 CGIDIR?=	apache/cgi-bin
 ICONSDIR?=	apache/icons
 CSSDIR?=	apache/data/css
--- /dev/null
+++ devel/cvsweb3/files/extra-patch-perl5.10
@@ -0,0 +1,29 @@
+--- c2	Sat Oct 11 11:57:36 2008
++++ cvsweb.cgi	Sat Oct 11 11:59:44 2008
+@@ -294,7 +294,7 @@
+              $ENV{SCRIPT_NAME});
+ }
+ 
+-$scriptname    = '' unless defined($scriptname);
++$scriptname    = '' unless defined($scriptwhere);
+ 
+ $where         =  $pathinfo;
+ $doCheckout    =  $where =~ s|^/$CheckoutMagic/|/|o;
+@@ -1718,7 +1718,7 @@
+   my ($command) = @_;
+   for my $d (@command_path) {
+     my $cmd = catfile($d, $command);
+-    return $cmd if (-x $cmd && !-d _);
++    return $cmd if (-x $cmd && !-d $cmd);
+   }
+   return '';
+ }
+@@ -4458,7 +4458,7 @@
+               crc    => 0,
+               len    => 0,
+             };
+-  my ($header) = pack("c10",
++  my ($header) = pack("C10",
+                       MAGIC1, MAGIC2, Compress::Zlib::Z_DEFLATED(),
+                       0, 0, 0, 0, 0, 0, OSCODE);
+   print {$o->{handle}} $header;


More information about the Midnightbsd-cvs mailing list