From 097741e3200c9845d5731e35770132fd0e5f6298 Mon Sep 17 00:00:00 2001 From: Sergey Skvortsov Date: Fri, 8 Aug 2003 09:28:56 +0000 Subject: [PATCH] 1. Unbreak port building 2. Minor style cleanup --- www/p5-Apache-Filter/Makefile | 7 +++---- www/p5-Apache-Filter/files/patch-Makefile.PL | 18 ++++++------------ www/p5-Apache-Filter/pkg-descr | 2 +- www/p5-Apache-Filter/pkg-plist | 14 +++++++------- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile index fa30e1274fea..ea3e4505a325 100644 --- a/www/p5-Apache-Filter/Makefile +++ b/www/p5-Apache-Filter/Makefile @@ -15,15 +15,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= ports@freebsd.org COMMENT= Perl module to alter the output of previous handlers -BROKEN= Does not build - -BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl +BUILD_DEPENDS= ${RUN_DEPENDS} \ + ${SITE_PERL}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test PERL_CONFIGURE= yes INSTALL_TARGET= pure_install MAN3= Apache::Filter.3 Apache::PerlRunFilter.3 \ Apache::RegistryFilter.3 -MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .include diff --git a/www/p5-Apache-Filter/files/patch-Makefile.PL b/www/p5-Apache-Filter/files/patch-Makefile.PL index 6a0ec59dfcdd..e3353b21988d 100644 --- a/www/p5-Apache-Filter/files/patch-Makefile.PL +++ b/www/p5-Apache-Filter/files/patch-Makefile.PL @@ -1,26 +1,20 @@ ---- Makefile.PL.orig Fri Jan 31 20:36:41 2003 -+++ Makefile.PL Sat Feb 1 13:07:44 2003 -@@ -1,13 +1,13 @@ +--- Makefile.PL.orig Fri Jan 31 22:36:41 2003 ++++ Makefile.PL Fri Aug 8 13:16:29 2003 +@@ -1,13 +1,5 @@ use strict; use ExtUtils::MakeMaker; -use lib 't/lib'; # distributed here until changes are incorporated into the real version -+#use lib 't/lib'; # distributed here until changes are incorporated into the real version - use Apache::test qw(have_httpd); - +-use Apache::test qw(have_httpd); +- -my %params = Apache::test->get_test_params(); -Apache::test->write_httpd_conf - (%params, - include => do {local $/; open FH, 't/config.incl'; }); -*MY::test = sub { Apache::test->MM_test(%params) } if have_httpd(); -+#my %params = Apache::test->get_test_params(); -+#Apache::test->write_httpd_conf -+# (%params, -+# include => do {local $/; open FH, 't/config.incl'; }); -+#*MY::test = sub { Apache::test->MM_test(%params) } if have_httpd(); my $module = 'Apache::Filter'; my ($name, $dir); -@@ -27,7 +27,4 @@ +@@ -27,7 +19,4 @@ }, 'PL_FILES' => {}, 'clean' => {FILES => "t/httpd t/httpd.conf t/error_log"}, diff --git a/www/p5-Apache-Filter/pkg-descr b/www/p5-Apache-Filter/pkg-descr index 99c071ef15db..a98d55539199 100644 --- a/www/p5-Apache-Filter/pkg-descr +++ b/www/p5-Apache-Filter/pkg-descr @@ -17,6 +17,6 @@ From README: HTML::Mason Apache::SimpleReplace -WWW: WWW: http://search.cpan.org/dist/Apache-Filter/ +WWW: http://search.cpan.org/dist/Apache-Filter/ -- Alex Kapranoff diff --git a/www/p5-Apache-Filter/pkg-plist b/www/p5-Apache-Filter/pkg-plist index b39412856f38..0a8849bfe148 100644 --- a/www/p5-Apache-Filter/pkg-plist +++ b/www/p5-Apache-Filter/pkg-plist @@ -1,7 +1,7 @@ -lib/perl5/site_perl/%%PERL_VER%%/Apache/PerlRunFilter.pm -lib/perl5/site_perl/%%PERL_VER%%/Apache/Filter.pm -lib/perl5/site_perl/%%PERL_VER%%/Apache/RegistryFilter.pm -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true -lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Filter/.packlist -@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Filter -@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +%%SITE_PERL%%/Apache/PerlRunFilter.pm +%%SITE_PERL%%/Apache/Filter.pm +%%SITE_PERL%%/Apache/RegistryFilter.pm +@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Filter/.packlist +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Filter +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true