Date: Wed, 14 Mar 2001 11:37:59 -0800 (PST) From: frank@exit.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/25807: update for ports/www/p5-libapreq Message-ID: <200103141937.f2EJbxx31851@realtime.exit.com>
next in thread | raw e-mail | index | archive | help
>Number: 25807 >Category: ports >Synopsis: Update libapreq port to latest version, fix compile. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 14 11:40:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Frank Mayhar >Release: FreeBSD 4.2-STABLE i386 >Organization: Exit Consulting >Environment: N/A >Description: The libapreq port hasn't built for a while. This brings the port to the author's latest version and fixes the build problem. I've also pointed the MASTER_SITE at the author's entry on www.cpan.org, since this version isn't yet in the modules list, and I've split the patches into one per patched file. >How-To-Repeat: N/A >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # libapreq.patch # files/patch-aa # files/patch-ab # files/patch-ac # echo x - libapreq.patch sed 's/^X//' >libapreq.patch << 'END-of-libapreq.patch' XIndex: Makefile X=================================================================== XRCS file: /cvs/repos/ports/www/p5-libapreq/Makefile,v Xretrieving revision 1.6 Xdiff -u -r1.6 Makefile X--- Makefile 2001/03/01 06:39:14 1.6 X+++ Makefile 2001/03/14 19:33:19 X@@ -6,10 +6,9 @@ X # X X PORTNAME= libapreq X-PORTVERSION= 0.31 X+PORTVERSION= 0.31_03 X CATEGORIES= www perl5 devel X-MASTER_SITES= ${MASTER_SITE_PERL_CPAN} X-MASTER_SITE_SUBDIR= Apache X+MASTER_SITES= http://www.cpan.org/authors/id/J/JI/JIMW/ X PKGNAMEPREFIX= p5- X X MAINTAINER= frank@exit.com XIndex: distinfo X=================================================================== XRCS file: /cvs/repos/ports/www/p5-libapreq/distinfo,v Xretrieving revision 1.1.1.1 Xdiff -u -r1.1.1.1 distinfo X--- distinfo 2000/03/19 05:42:08 1.1.1.1 X+++ distinfo 2001/03/14 19:33:19 X@@ -1 +1 @@ X-MD5 (libapreq-0.31.tar.gz) = a40cce50e85bf090088f4fdcea3be865 X+MD5 (libapreq-0.31_03.tar.gz) = c23cb069e42643e505d4043f0eef4b9f XIndex: pkg-plist X=================================================================== XRCS file: /cvs/repos/ports/www/p5-libapreq/pkg-plist,v Xretrieving revision 1.2 Xdiff -u -r1.2 pkg-plist X--- pkg-plist 2001/03/01 06:39:14 1.2 X+++ pkg-plist 2001/03/14 19:33:19 X@@ -1,7 +1,7 @@ X lib/libapreq.so X lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include/apache_request.h X lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include/apache_cookie.h X-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include/multipart_buffer.h X+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/include/apache_multipart_buffer.h X lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/libapreq.bs X lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libapreq/libapreq.so X lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Request/Request.so END-of-libapreq.patch echo x - files/patch-aa sed 's/^X//' >files/patch-aa << 'END-of-files/patch-aa' X--- c/Makefile.PL.orig Wed Mar 29 22:22:28 2000 X+++ c/Makefile.PL Wed Mar 14 11:21:17 2001 X@@ -7,49 +7,23 @@ X win32_setup(); X } X else { X- require Apache::src; X- my $src = Apache::src->new; X+ my $inc1 = `apxs -q INCLUDEDIR`; X+ my $inc2 = $inc1 ."/modules/perl"; X X use Cwd; X my $pwd = fastcwd; X my @objs = qw(apache_request.o apache_cookie.o apache_multipart_buffer.o); X- $MY_LD_RUN_PATH = "$Config{installsitearch}/auto/libapreq:$pwd"; X X WriteMakefile( X- #grr, problems with things finding libapreq.so, sort out later. X 'LINKTYPE' => 'static', X-# 'SKIP' => [qw(dynamic_lib dynamic_bs)], X 'NAME' => 'libapreq', X- 'INC' => $src->inc, X- 'TYPEMAPS' => $src->typemaps, X+ 'INC' => "-I$inc1 -I$inc2", X 'OBJECT' => "@objs", X ); X } X X use Cwd; X my $pwd = fastcwd; X-$ENV{LD_RUN_PATH} = X- "$ENV{LD_RUN_PATH}:$Config{installsitearch}/auto/libapr:$pwd"; X- X-sub MY::dynamic { X- my $self = shift; X- my $string = $self->MM::dynamic; X- $string =~ s/(Makefile\s+).*/$1/g; X- $string; X-} X- X-sub MY::top_targets { X- my $self = shift; X- my $string = $self->MM::top_targets; X- my $libapreq = <<"EOF"; X-LD_RUN_PATH = $ENV{LD_RUN_PATH} X-EOF X- X- my $so = "\n".'$(DLBASE).$(DLEXT): $(INST_DYNAMIC)'."\n"; X- X- $string =~ s/(pure_all\s+::\s+)(.*)/$1 static $2/; X- return $libapreq . $so . $string; X-} X X sub MY::post_initialize { X my $self = shift; END-of-files/patch-aa echo x - files/patch-ab sed 's/^X//' >files/patch-ab << 'END-of-files/patch-ab' X--- Cookie/Makefile.PL.orig Sat May 1 14:44:28 1999 X+++ Cookie/Makefile.PL Sun Apr 23 21:43:43 2000 X@@ -15,9 +15,9 @@ X xsubpp("Cookie"); X } X else { X- require Apache::src; X- my $src = Apache::src->new; X use File::Path 'mkpath'; X+ my $inc1 = `apxs -q INCLUDEDIR`; X+ my $inc2 = $inc1."/modules/perl"; X my $root = "../blib/arch/auto/libapreq"; X mkpath $root, 1, 0755 unless -d $root; X X@@ -25,8 +25,7 @@ X system "touch $root/libapreq.a"; X WriteMakefile( X @mm_args, X- 'INC' => "-I../c ". $src->inc, X- 'TYPEMAPS' => $src->typemaps, X+ 'INC' => "-I../c -I$inc1 -I$inc2", X 'LIBS' => "-L$root -lapreq", X ); X unlink "$root/libapreq.a"; END-of-files/patch-ab echo x - files/patch-ac sed 's/^X//' >files/patch-ac << 'END-of-files/patch-ac' X--- Request/Makefile.PL.orig Sat May 1 14:44:28 1999 X+++ Request/Makefile.PL Sun Apr 23 21:43:43 2000 X@@ -15,8 +15,8 @@ X xsubpp("Request"); X } X else { X- require Apache::src; X- my $src = Apache::src->new; X+ my $inc1 = `apxs -q INCLUDEDIR`; X+ my $inc2 = $inc1 ."/modules/perl"; X use File::Path 'mkpath'; X my $root = "../blib/arch/auto/libapreq"; X mkpath $root, 1, 0755 unless -d $root; X@@ -25,8 +25,7 @@ X system "touch $root/libapreq.a"; X WriteMakefile( X @mm_args, X- 'INC' => "-I../c ". $src->inc, X- 'TYPEMAPS' => $src->typemaps, X+ 'INC' => "-I../c -I$inc1 -I$inc2", X 'LIBS' => "-L$root -lapreq", X ); X unlink "$root/libapreq.a"; END-of-files/patch-ac exit >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103141937.f2EJbxx31851>