From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 15 15:30:14 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8793716A405 for ; Sat, 15 Apr 2006 15:30:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F37C443D46 for ; Sat, 15 Apr 2006 15:30:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3FFUDjs056111 for ; Sat, 15 Apr 2006 15:30:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3FFUDed056110; Sat, 15 Apr 2006 15:30:13 GMT (envelope-from gnats) Resent-Date: Sat, 15 Apr 2006 15:30:13 GMT Resent-Message-Id: <200604151530.k3FFUDed056110@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dominic Mitchell Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4221E16A400 for ; Sat, 15 Apr 2006 15:25:07 +0000 (UTC) (envelope-from dom@happygiraffe.net) Received: from happygiraffe.net (happygiraffe.net [81.6.215.59]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8111343D48 for ; Sat, 15 Apr 2006 15:25:06 +0000 (GMT) (envelope-from dom@happygiraffe.net) Received: from localhost (localhost.happygiraffe.net [127.0.0.1]) by happygiraffe.net (Postfix) with ESMTP id 5BABAB84C for ; Sat, 15 Apr 2006 16:25:05 +0100 (BST) Received: from happygiraffe.net ([127.0.0.1]) by localhost (gimli.happygiraffe.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id DowzX7vq8l-Q for ; Sat, 15 Apr 2006 16:25:03 +0100 (BST) Received: by happygiraffe.net (Postfix, from userid 1001) id CA348B830; Sat, 15 Apr 2006 16:25:01 +0100 (BST) Message-Id: <20060415152501.CA348B830@happygiraffe.net> Date: Sat, 15 Apr 2006 16:25:01 +0100 (BST) From: Dominic Mitchell To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95809: Version bump for www/p5-Apache-MP3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dominic Mitchell List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 15:30:14 -0000 >Number: 95809 >Category: ports >Synopsis: Version bump for www/p5-Apache-MP3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Apr 15 15:30:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dominic Mitchell >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD gimli.happygiraffe.net 6.0-STABLE FreeBSD 6.0-STABLE #4: Sun Jan 29 22:47:07 GMT 2006 root@gimli.happygiraffe.net:/usr/obj/usr/src/sys/GIMLI i386 perl 5.8.8 Apache 2.2 mod_perl 2.0.2 >Description: This is the latest version of Apache::MP3. >How-To-Repeat: n/a >Fix: Here's the patch. Please note that the files directory and patches inside are no longer required. NB: This version is now only compatible with Apache 2. diff -burN /usr/ports/www/p5-Apache-MP3/Makefile p5-Apache-MP3/Makefile --- /usr/ports/www/p5-Apache-MP3/Makefile Thu Feb 2 23:08:51 2006 +++ p5-Apache-MP3/Makefile Sat Apr 15 16:13:48 2006 @@ -6,8 +6,7 @@ # PORTNAME= Apache-MP3 -PORTVERSION= 3.05 -PORTREVISION= 1 +PORTVERSION= 4.00 CATEGORIES= www audio perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR=Apache @@ -17,8 +16,10 @@ COMMENT= MP3 browsing and streaming under mod_perl and Apache BUILD_DEPENDS= ${SITE_PERL}/Audio/Wav.pm:${PORTSDIR}/audio/p5-Audio-Wav \ + ${SITE_PERL}/CGI/Session.pm:${PORTSDIR}/www/p5-CGI-Session \ ${SITE_PERL}/MPEG/MP3Info.pm:${PORTSDIR}/audio/p5-MP3-Info \ - ${SITE_PERL}/${PERL_ARCH}/Ogg/Vorbis.pm:${PORTSDIR}/audio/p5-libvorbis + ${SITE_PERL}/${PERL_ARCH}/Ogg/Vorbis/Header.pm:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \ + ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= YES @@ -41,13 +42,7 @@ RUN_DEPENDS+= ${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext .endif -.if defined(WITH_APACHE2) -BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache22/mod_perl.so:${PORTSDIR}/www/mod_perl2 -RUN_DEPENDS+= ${LOCALBASE}/libexec/apache22/mod_perl.so:${PORTSDIR}/www/mod_perl2 -EXTRA_PATCHES= ${PATCHDIR}/mod_perl2.patch -.else -BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl -.endif +BUILD_DEPENDS+= +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 .include diff -burN /usr/ports/www/p5-Apache-MP3/distinfo p5-Apache-MP3/distinfo --- /usr/ports/www/p5-Apache-MP3/distinfo Tue Jan 24 03:13:39 2006 +++ p5-Apache-MP3/distinfo Sat Apr 15 15:47:04 2006 @@ -1,3 +1,3 @@ -MD5 (Apache-MP3-3.05.tar.gz) = f2009b0ddc7f17c1c1ccee391d187935 -SHA256 (Apache-MP3-3.05.tar.gz) = 8ceb7c99dd26e8342fa073b1000a6997cf9181904263e74477fb84dbcbc6475d -SIZE (Apache-MP3-3.05.tar.gz) = 330594 +MD5 (Apache-MP3-4.00.tar.gz) = 78a30a3e889a9b4a11387d6342bfc82f +SHA256 (Apache-MP3-4.00.tar.gz) = 041c3331d301bff88395d0848002b601acf9a9c84140ec8b0d029593e88796a2 +SIZE (Apache-MP3-4.00.tar.gz) = 328384 diff -burN /usr/ports/www/p5-Apache-MP3/files/mod_perl2.patch p5-Apache-MP3/files/mod_perl2.patch --- /usr/ports/www/p5-Apache-MP3/files/mod_perl2.patch Fri Jun 10 11:42:18 2005 +++ p5-Apache-MP3/files/mod_perl2.patch Thu Jan 1 01:00:00 1970 @@ -1,57 +0,0 @@ ---- MP3.pm.orig Mon Oct 6 16:06:10 2003 -+++ MP3.pm Thu Jun 9 15:37:04 2005 -@@ -5,11 +5,11 @@ - - BEGIN { - require mod_perl; -- require Apache::compat if $mod_perl::VERSION >= 1.99; -+ require Apache2::compat if $mod_perl::VERSION >= 1.99; - } - - use Apache; --use Apache::Constants qw(:common REDIRECT HTTP_NO_CONTENT DIR_MAGIC_TYPE HTTP_NOT_MODIFIED); -+use Apache::Constants qw(:common REDIRECT HTTP_NO_CONTENT HTTP_NOT_MODIFIED); - use Apache::MP3::L10N; - use IO::File; - use Socket 'sockaddr_in'; -@@ -25,6 +25,8 @@ - - use constant DEBUG => 0; - -+use constant DIR_MAGIC_TYPE => 'httpd/unix-directory'; -+ - # defaults: - use constant BASE_DIR => '/apache_mp3'; - use constant STYLESHEET => 'apache_mp3.css'; -@@ -75,7 +77,7 @@ - } - END - --sub handler ($$) { -+sub handler : method { - my $class = shift; - my $obj = $class->new(@_) or die "Can't create object: $!"; - return $obj->run(); -@@ -415,14 +417,14 @@ - my $self = shift; - my $dir = shift; - -- unless ($self->r->path_info){ -- #Issue an external redirect if the dir isn't tailed with a '/' -- my $uri = $self->r->uri; -- my $query = $self->r->args; -- $query = "?" . $query if defined $query; -- $self->r->header_out(Location => "$uri/$query"); -- return REDIRECT; -- } -+# unless ($self->r->path_info){ -+# #Issue an external redirect if the dir isn't tailed with a '/' -+# my $uri = $self->r->uri; -+# my $query = $self->r->args; -+# $query = "?" . $query if defined $query; -+# $self->r->header_out(Location => "$uri/$query"); -+# return REDIRECT; -+# } - - return $self->list_directory($dir); - } >Release-Note: >Audit-Trail: >Unformatted: